freeradius code style and other fixes

net/pfSense-pkg-freeradius2/Makefile

@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pfSense-pkg-freeradius2
-PORTVERSION=	1.7.5
-PORTREVISION=	1
+PORTVERSION=	1.7.6
 CATEGORIES=	net
 MASTER_SITES=	# empty
 DISTFILES=	# empty

net/pfSense-pkg-freeradius2/files/usr/local/pkg/freeradius.xml

@@ -8,7 +8,7 @@
  * freeradius.xml
  *
  * part of pfSense (https://www.pfsense.org)
- * Copyright (c) 2015 Rubicon Communications, LLC (Netgate)
+ * Copyright (c) 2015-2017 Rubicon Communications, LLC (Netgate)
  * Copyright (c) 2013 Alexander Wilke <nachtfalkeaw@web.de>
  * All rights reserved.
  *
@@ -154,7 +154,8 @@
 			<fieldname>varusersusername</fieldname>
 			<description>
 				<![CDATA[
-				Enter the username. Whitespace is possible. If you do not want to use username/password but custom options then leave this field empty.
+				Enter the username. Whitespace is possible.
+				If you do not want to use username/password but custom options, leave this field empty.
 				]]>
 			</description>
 			<type>input</type>
@@ -164,7 +165,8 @@
 			<fieldname>varuserspassword</fieldname>
 			<description>
 				<![CDATA[
-				Enter the password for this username. If you do not  want to use username/password but custom options then leave this field empty.
+				Enter the password for this username.
+				If you do not want to use username/password but custom options, leave this field empty.
 				]]>
 			</description>
 			<type>password</type>
@@ -190,8 +192,10 @@
 			<description>Enable One-Time-Password for this user</description>
 			<sethelp>
 				<![CDATA[
-				This enables the possibility to authenticate against an username and an one-time-password. The client to generate OTP can be installed on various mobile device plattforms like Android and more.<br/><br/>
-				<b>IMPORTANT:</b> You need to enabled mOTP first in FreeRADIUS => Settings (Default: unchecked)
+				This enables the possibility to authenticate against an username and an one-time-password.<br/>
+				The client to generate OTP can be installed on various mobile device platforms like Android and more.<br/>
+				<strong><span class="text-danger">IMPORTANT: </span>You need to enable mOTP first in 'FreeRADIUS > Settings'.</strong><br/>
+				(Default: unchecked)
 				]]>
 			</sethelp>
 			<type>checkbox</type>
@@ -222,10 +226,14 @@
 			<fieldname>varusersmotpoffset</fieldname>
 			<description>
 				<![CDATA[
-				If the client is not in the correct time zone or is not changing time zone automatically than you have to calculate the offset and enter it here. To calculate it do the following:<br/><br/>
+				If the client is not in the correct time zone or is not changing time zone automatically,
+				you have to calculate the offset and enter it here. Click Info for details. (Default: 0)
+				<div class="infoblock">
+				To calculate it do the following:<br/><br/>
 				1. Write down the first 9 digits of the Epoch-Time on the client.<br/>
 				2. Check with <b>date +%s</b> the Epoch-Time on your FreeRADIUS server and write down the first 9 digits.<br/>
-				3. Subtract both values, multiply the result with 10 and enter the value in this field. Example: 30 or -180 (Default: 0)
+				3. Subtract both values, multiply the result with 10 and enter the value in this field. Example: 30 or -180
+				</div>
 				]]>
 			</description>
 			<type>input</type>
@@ -240,8 +248,8 @@
 			<fieldname>varuserssimultaneousconnect</fieldname>
 			<description>
 				<![CDATA[
-				The maximum of simultaneous connections with this username. If you leave this field empty than there is no limit. If you are using FreeRADIUS with Captive Portal you should leave this empty.
-				Read the documentation!
+				The maximum of simultaneous connections with this username. If you leave this field empty than there is no limit.
+				If you are using FreeRADIUS with Captive Portal you should leave this empty. Read the documentation!
 				]]>
 			</description>
 			<type>input</type>
@@ -278,7 +286,8 @@
 				<b>Framed-IP-Address</b> must be supported by NAS.<br/><br/>
 				If you want this user 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.
+				<strong><span class="text-danger">IMPORTANT: </span></strong>
+				You must enter an IP address here if you checked 'RADIUS issued IP' on PPPoE VPN configuration.
 				]]>
 			</description>
 			<type>input</type>
@@ -296,7 +305,11 @@
 		<field>
 			<fielddescr>Gateway</fielddescr>
 			<fieldname>varusersframedroute</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>
+			<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>
@@ -305,11 +318,13 @@
 			<description>
 				<![CDATA[
 				Enter the VLAN ID (integer from 1-4095) or the VLAN name that this username should be assigned to.<br/>
-				Must be supported by the NAS.<br/>
+				Must be supported by the NAS. Click Info for details.
+				<div class="infoblock">
 				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>"
+				</div>
 				]]>
 			</description>
 			<type>input</type>
@@ -323,15 +338,21 @@
 			<fieldname>varusersexpiration</fieldname>
 			<description>
 				<![CDATA[
-				Enter the date when this account should expire. Format is: Mmm dd yyyy (e.g. Jan 01 2012).
+				Enter the date when this account should expire.<br/>
+				<strong><span class="text-danger">IMPORTANT: </span></strong>
+				Format is: Mmm dd yyyy (e.g. Jan 01 2018).
 				]]>
 			</description>
 			<type>input</type>
 		</field>
 		<field>
 			<fielddescr>Session Timeout</fielddescr>
 			<fieldname>varuserssessiontimeout</fieldname>
-			<description><![CDATA[Enter the time this user has until relogin in seconds.]]></description>
+			<description>
+				<![CDATA[
+				Enter the time this user has until relogin in seconds.
+				]]>
+			</description>
 			<type>input</type>
 		</field>
 		<field>
@@ -340,10 +361,14 @@
 			<description>
 				<![CDATA[
 				Enter the time when this user 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/>
-				All weekdays plus weekend which means all days from monday till sunday is (Al).<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.
+				Click Info for details.
+				<div class="infoblock">
+				Every time string contains a day (Mo,Tu,We,Th,Fr,Sa,Su) or 'Wk' for all weekdays which is from Monday till Friday.<br/>
+				All weekdays plus weekend which means all days from Monday till Sunday is defined as 'Al'.<br/><br/>
+				<strong><span class="text-info">Example: </span></strong>
+				<b>Wk0855-2305,Sa,Su2230-0230</b><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.
+				</div>
 				]]>
 			</description>
 			<type>input</type>
@@ -432,7 +457,8 @@
 			<fieldname>varusersacctinteriminterval</fieldname>
 			<description>
 				<![CDATA[
-				Enter the seconds which should be between every interim-update. It MUST be more than 60s and SHOULD NOT be less than 600s. (Default: 600)
+				Enter the seconds which should be between every interim-update. It MUST be more than 60s and SHOULD NOT be less than 600s.
+				(Default: 600)
 				]]>
 			</description>
 			<type>input</type>
@@ -446,46 +472,61 @@
 			<fieldname>varuserstopadditionaloptions</fieldname>
 			<description>
 				<![CDATA[
-				This is for experts only and should be treat with care!<br/>
+				This is for experts only and should be treated with care! Click Info for details.
+				<div class="infoblock">
 				You may append custom RADIUS options to this user 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 users file (View config -> users).
+				<strong>
+				<span class="text-danger">IMPORTANT: </span>
+				If you don't format this field correctly FreeRADIUS will not start because of syntax errors.
+				</strong><br/>
+				Verify your changes by checking users file (View config > Users).
+				</div>
 				]]>
 			</description>
 			<type>textarea</type>
 			<rows>4</rows>
 			<cols>75</cols>
 		</field>
 		<field>
-			<fielddescr>Additional RADIUS Attributes (CHECK-ITEM).</fielddescr>
+			<fielddescr>Additional RADIUS Attributes (CHECK-ITEM)</fielddescr>
 			<fieldname>varuserscheckitemsadditionaloptions</fieldname>
 			<description>
 				<![CDATA[
-				This is for experts only and should be treat with care!<br/>
+				This is for experts only and should be treated with care! Click Info for details.
+				<div class="infoblock">
 				You may append custom RADIUS options to this user 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 users file (View config -> users).
+				<strong>
+				<span class="text-danger">IMPORTANT: </span>
+				If you don't format this field correctly FreeRADIUS will not start because of syntax errors.
+				</strong><br/>
+				Verify your changes by checking users file (View config > Users).
+				</div>
 				]]>
 			</description>
 			<type>textarea</type>
 			<rows>4</rows>
 			<cols>75</cols>
 		</field>
 		<field>
-			<fielddescr>Additional RADIUS Attributes (REPLY-ITEM).</fielddescr>
+			<fielddescr>Additional RADIUS Attributes (REPLY-ITEM)</fielddescr>
 			<fieldname>varusersreplyitemsadditionaloptions</fieldname>
 			<description>
 				<![CDATA[
-				This is for experts only and should be treat with care!<br/>
+				This is for experts only and should be treated with care! Click Info for details.
+				<div class="infoblock">
 				You may append custom RADIUS options to this user 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 users file (View config -> users).
+				<strong>
+				<span class="text-danger">IMPORTANT: </span>
+				If you don't format this field correctly FreeRADIUS will not start because of syntax errors.
+				</strong><br/>
+				Verify your changes by checking users file (View config > Users).
+				</div>
 				]]>
 			</description>
 			<type>textarea</type>
@@ -498,7 +539,6 @@
 	</custom_delete_php_command>
 	<custom_php_resync_config_command>
 		freeradius_settings_resync(false);
-		sleep(1);
 		freeradius_users_resync();
 	</custom_php_resync_config_command>
 	<custom_php_install_command>