Merge pull request #200 from Nachtfalkeaw/master

freeradius2 updates pkg v1.5.3

1 files changed, 213 insertions, 4 deletions

diff --git a/config/freeradius2/freeradiusauthorizedmacs.xml b/config/freeradius2/freeradiusauthorizedmacs.xml
index 021f8772..7abd26f5 100644
--- a/config/freeradius2/freeradiusauthorizedmacs.xml
+++ b/config/freeradius2/freeradiusauthorizedmacs.xml
@@ -166,7 +166,31 @@
 	<adddeleteeditpagefields>
 		<columnitem>
 			<fielddescr>MAC Address</fielddescr>
-			<fieldname>varmacaddress</fieldname>
+			<fieldname>varmacsaddress</fieldname>
+		</columnitem>
+		<columnitem>
+			<fielddescr>Simult. Connections</fielddescr>
+			<fieldname>varmacssimultaneousconnect</fieldname>
+		</columnitem>
+		<columnitem>
+			<fielddescr>IP Address</fielddescr>
+			<fieldname>varmacsframedipaddress</fieldname>
+		</columnitem>
+		<columnitem>
+			<fielddescr>Expiration Date</fielddescr>
+			<fieldname>varmacsexpiration</fieldname>
+		</columnitem>
+		<columnitem>
+			<fielddescr>Session Timeout</fielddescr>
+			<fieldname>varmacssessiontimeout</fieldname>
+		</columnitem>
+		<columnitem>
+			<fielddescr>Possible Login Times</fielddescr>
+			<fieldname>varmacslogintime</fieldname>
+		</columnitem>
+		<columnitem>
+			<fielddescr>VLAN ID</fielddescr>
+			<fieldname>varmacsvlanid</fieldname>
 		</columnitem>
 		<columnitem>
 			<fielddescr>Description</fielddescr>
@@ -180,17 +204,202 @@
 		</field>	
 		<field>
 			<fielddescr>MAC Address</fielddescr>
-			<fieldname>varmacaddress</fieldname>
-			<description><![CDATA[Enther the MAC Address of the host. Format is:  00-11-22-33-44-55]]></description>
+			<fieldname>varmacsaddress</fieldname>
+			<description><![CDATA[Enter the MAC address. Format must be: 0a-1b-2c-4d-5f-fa]]></description>
 			<type>input</type>
 			<required/>
 		</field>
 		<field>
+			<fielddescr>Number of simultaneous connections</fielddescr>
+			<fieldname>varmacssimultaneousconnect</fieldname>
+			<description><![CDATA[The maximum of simultaneous connections with this MAC address.]]></description>
+			<default_value></default_value>
+			<type>input</type>
+		</field>		
+		<field>
+			<name>NETWORK CONFIGURATION</name>
+			<type>listtopic</type>
+		</field>
+		<field>
+			<fielddescr>IP Address</fielddescr>
+			<fieldname>varmacsframedipaddress</fieldname>
+			<description><![CDATA[<b>Framed-IP-Address</b> must be supported by NAS.<br><br>
+							If you want this MAC address to be assigned a specific IP address from radius, enter the IP address here.<br>
+							Continuous IP address is available with "+" suffix (e.g. 192.168.1.5+). Could be useful for simultaneous connections.<br><br>
+							<b>IMPORTANT:</b> You must enter an IP address here if you checked "RADIUS issued IP" on VPN PPTP or VPN PPPoE configuration.]]></description>
+			<type>input</type>
+		</field>
+		<field>
+			<fielddescr>Subnet Mask</fielddescr>
+			<fieldname>varmacsframedipnetmask</fieldname>			
+			<description><![CDATA[<b>Framed-IP-Netmask</b> must be supported by NAS. (e.g. 255.255.255.0)]]></description>
+			<type>input</type>
+		</field>
+		<field>
+			<fielddescr>Gateway</fielddescr>
+			<fieldname>varmacsframedroute</fieldname>			
+			<description><![CDATA[<b>Framed-Route</b> must be supported by NAS. Format is: Subnet Gateway Metric (e.g. 192.168.10.0 192.168.10.1 1).]]></description>
+			<type>input</type>
+		</field>
+		<field>
+			<fielddescr>VLAN ID</fielddescr>
+			<fieldname>varmacsvlanid</fieldname>			
+			<description><![CDATA[Enter the VLAN ID (integer from 1-4095) or the VLAN name that this MAC address should be assigned to.<br>
+								Must be supported by the NAS.<br>
+								This setting can be used for a NAS that supports the following RADIUS parameters:<br><br>
+								
+								Tunnel-Type = VLAN<br>
+								Tunnel-Medium-Type = IEEE-802<br>
+								Tunnel-Private-Group-ID = "<b>THIS IS YOUR INPUT</b>"]]></description>
+			<type>input</type>
+		</field>		
+		<field>
+			<name>TIME CONFIGURATION</name>
+			<type>listtopic</type>
+		</field>
+		<field>
+			<fielddescr>Expiration Date</fielddescr>
+			<fieldname>varmacsexpiration</fieldname>			
+			<description><![CDATA[Enter the date when this account should expire. Format is: Mmm dd yyyy (e.g. Jan 01 2012).]]></description>
+			<type>input</type>
+		</field>
+		<field>
+			<fielddescr>Session Timeout</fielddescr>
+			<fieldname>varmacssessiontimeout</fieldname>			
+			<description><![CDATA[Enter the time this MAC address has until relogin in seconds.]]></description>
+			<type>input</type>
+		</field>
+		<field>
+			<fielddescr>Possible Login Times</fielddescr>
+			<fieldname>varmacslogintime</fieldname>			
+			<description><![CDATA[Enter the time when this MAC address should have access. If no time is entered it means "always".<br>
+							Every time string contains a day (Mo,Tu,We,Th,Fr,Sa,Su) or all weekdays which is from monday till friday (Wk).<br><br>
+							<b>Wk0855-2305,Sa,Su2230-0230</b><br><br>
+							This means weekdays after 8:55 AM and before 11:05 PM | any time on saturday | sunday after 10:30 PM and before 02:30 AM.]]></description>
+			<type>input</type>
+		</field>
+		<field>
+			<fielddescr>Amount of Time</fielddescr>
+			<fieldname>varmacsamountoftime</fieldname>			
+			<description><![CDATA[Enter the amount of time for this MAC address in seconds.]]></description>
+			<type>input</type>
+		</field>
+		<field>
+			<fielddescr>Time Period</fielddescr>
+			<fieldname>varmacspointoftime</fieldname>			
+			<description><![CDATA[Select the time period for the amount of time.]]></description>
+			<type>select</type>
+			<default_value>daily</default_value>
+				<options>
+					<option><name>Daily</name><value>Daily</value></option>
+					<option><name>Weekly</name><value>Weekly</value></option>
+					<option><name>Monthly</name><value>Monthly</value></option>
+					<option><name>Forever</name><value>Forever</value></option>
+				</options>
+		</field>
+		<field>
+			<name>TRAFFIC AND BANDWIDTH</name>
+			<type>listtopic</type>
+		</field>
+		<field>
+			<fielddescr>Amount of Upload Traffic</fielddescr>
+			<fieldname>varmacsamountofbytesinput</fieldname>			
+			<description><![CDATA[Enter the amount of upload traffic for this MAC address in <b>bytes</b>. There is a bug in CaptivePortal which counts the traffic six times faster than in reality. So if a MAC address should have 1MB of traffic you must calculate 6+1MB and enter here: 6000000.]]></description>
+			<type>input</type>
+		</field>
+		<field>
+			<fielddescr>Time Period</fielddescr>
+			<fieldname>varmacspointoftimebytesinput</fieldname>			
+			<description><![CDATA[Select the time period for the amount of upload traffic.]]></description>
+			<type>select</type>
+			<default_value>daily</default_value>
+				<options>
+					<option><name>Daily</name><value>Daily</value></option>
+					<option><name>Weekly</name><value>Weekly</value></option>
+					<option><name>Monthly</name><value>Monthly</value></option>
+					<option><name>Forever</name><value>Forever</value></option>
+				</options>
+		</field>
+		<field>
+			<fielddescr>Amount of Download Traffic</fielddescr>
+			<fieldname>varmacsamountofbytesoutput</fieldname>			
+			<description><![CDATA[Enter the amount of download traffic for this MAC address in <b>bytes</b>. There is a bug in CaptivePortal which counts the traffic six times faster than in reality. So if a MAC address should have 1MB of traffic you must calculate 6+1MB and enter here: 6000000.]]></description>
+			<type>input</type>
+		</field>
+		<field>
+			<fielddescr>Time Period</fielddescr>
+			<fieldname>varmacspointoftimebytesoutput</fieldname>			
+			<description><![CDATA[Select the time period for the amount of download limit.]]></description>
+			<type>select</type>
+			<default_value>daily</default_value>
+				<options>
+					<option><name>Daily</name><value>Daily</value></option>
+					<option><name>Weekly</name><value>Weekly</value></option>
+					<option><name>Monthly</name><value>Monthly</value></option>
+					<option><name>Forever</name><value>Forever</value></option>
+				</options>
+		</field>
+		<field>
+			<fielddescr>Maximum Download Bandwidth</fielddescr>
+			<fieldname>varmacsmaxbandwidthdown</fieldname>			
+			<description><![CDATA[Enter the maximum bandwidth for download in bps (<b>bits</b> per second).]]></description>
+			<type>input</type>
+		</field>
+		<field>
+			<fielddescr>Maximum Upload Bandwidth</fielddescr>
+			<fieldname>varmacsmaxbandwidthup</fieldname>			
+			<description><![CDATA[Enter the maximum bandwidth for upload in bps (<b>bits</b> per second).]]></description>
+			<type>input</type>
+		</field>
+		<field>
+			<name>MISCELLANEOUS CONFIGURATION</name>
+			<type>listtopic</type>
+		</field>		
+		<field>
 			<fielddescr>Description</fielddescr>
 			<fieldname>description</fieldname>			
-			<description><![CDATA[Enter any description for this MAC you like.]]></description>
+			<description><![CDATA[Enter any description for this MAC address you like.]]></description>
 			<type>input</type>
 		</field>
+		<field>
+			<fielddescr>Additional RADIUS Attributes on the TOP of this entry</fielddescr>
+			<fieldname>varmacstopadditionaloptions</fieldname>			
+			<description><![CDATA[This is for experts only and should be treat with care!<br>
+								You may append custom RADIUS options to this MAC address account. If the syntax needs it, you have to set quotes and commas.<br>
+								To put a command in a new line use a vertical bar (|).<br><br>
+								Example: DEFAULT Auth-Type = System<br><br>
+								<b>IMPORTANT:</b> If you don't format this field correctly freeRADIUS will not start because of syntax errors.<br>
+								Verify your changes by checking authorized_macs file (View config -> macs).]]></description>
+			<type>textarea</type>
+			<rows>4</rows>
+			<cols>75</cols>
+		</field>
+		<field>
+			<fielddescr>Additional RADIUS Attributes (CHECK-ITEM).</fielddescr>
+			<fieldname>varmacscheckitemsadditionaloptions</fieldname>			
+			<description><![CDATA[This is for experts only and should be treat with care!<br>
+								You may append custom RADIUS options to this MAC address account. If the syntax needs it, you have to set quotes and commas.<br>
+								To put a command in a new line use a vertical bar (|).<br><br>
+								Example: Max-Daily-Session := 36000<br><br>
+								<b>IMPORTANT:</b> If you don't format this field correctly freeRADIUS will not start because of syntax errors.<br>
+								Verify your changes by checking authorized_macs file (View config -> macs).]]></description>
+			<type>textarea</type>
+			<rows>4</rows>
+			<cols>75</cols>
+		</field>
+		<field>
+			<fielddescr>Additional RADIUS Attributes (REPLY-ITEM).</fielddescr>
+			<fieldname>varmacsreplyitemsadditionaloptions</fieldname>			
+			<description><![CDATA[This is for experts only and should be treat with care!<br>
+								You may append custom RADIUS options to this MAC address account. If the syntax needs it, you have to set quotes and commas.<br>
+								To put a command in a new line use a vertical bar (|).<br><br>
+								Example: Service-Type == Login-User,|Login-Service == Telnet,|Login-IP-Host == 192.168.1.2<br><br>
+								<b>IMPORTANT:</b> If you don't format this field correctly freeRADIUS will not start because of syntax errors.<br>
+								Verify your changes by checking authorized_macs file (View config -> macs).]]></description>
+			<type>textarea</type>
+			<rows>4</rows>
+			<cols>75</cols>
+		</field>
 	</fields>
 	<custom_delete_php_command>
 		freeradius_authorizedmacs_resync();