Merge branch 'master' of https://github.com/bsdperimeter/pfsense-packages

3 files changed, 37 insertions, 1 deletions

diff --git a/config/freeradius2/freeradius.inc b/config/freeradius2/freeradius.inc
index 60ccbdf4..38093780 100644
--- a/config/freeradius2/freeradius.inc
+++ b/config/freeradius2/freeradius.inc
@@ -432,6 +432,13 @@ if (is_array($arrusers) && !empty($arrusers)) {
 	$varusersmaxbandwidthdown = ($users['varusersmaxbandwidthdown']?$users['varusersmaxbandwidthdown']:'');
 	$varusersmaxbandwidthdown = $varusersmaxbandwidthdown * 1024;
 	
+	// Accounting-Interim-Interval - Must not be smaller than 60 and should be bigger than 600s
+	if (($users['varusersacctinteriminterval'] >= '0') && ($users['varusersacctinteriminterval'] < '60')) {
+		$varusersacctinteriminterval = 60;
+	} else {
+		$varusersacctinteriminterval = $users['varusersacctinteriminterval'];
+	}
+	
 	// Clear variables for next user foreach additional options TOP
 	$varuserstopadditionaloptions = '';
 	$varusersadditionaloptionstop = '';
@@ -542,6 +549,10 @@ if (is_array($arrusers) && !empty($arrusers)) {
 		if ($varusersreplyitem != '') { $varusersreplyitem .=","; }
 		$varusersreplyitem .= "\n\tWISPr-Bandwidth-Max-Down := $varusersmaxbandwidthdown";
 	}
+	if ($varusersacctinteriminterval != '') {
+		if ($varusersreplyitem != '') { $varusersreplyitem .=","; }
+		$varusersreplyitem .= "\n\tAcct-Interim-Interval := $varusersacctinteriminterval";
+	}
 	if ($varuserswisprredirectionurl != '') {
 		if ($varusersreplyitem != '') { $varusersreplyitem .=","; }
 		$varusersreplyitem .= "\n\tWISPr-Redirection-URL := $varuserswisprredirectionurl";
@@ -629,6 +640,15 @@ if (is_array($arrmacs) && !empty($arrmacs)) {
 	$varmacsmaxbandwidthdown = ($macs['varmacsmaxbandwidthdown']?$macs['varmacsmaxbandwidthdown']:'');
 	$varmacsmaxbandwidthdown = $varmacsmaxbandwidthdown * 1024;
 	
+		
+	// Accounting-Interim-Interval
+	if (($users['varmacsacctinteriminterval'] >= '0') && ($users['varmacsacctinteriminterval'] < '60')) {
+		$varmacsacctinteriminterval = 60;
+	} else {
+		$varmacsacctinteriminterval = $users['varmacsacctinteriminterval'];
+	}
+	
+	
 	// Clear variables for next mac foreach additional options TOP
 	$varmacstopadditionaloptions = '';
 	$varmacsadditionaloptionstop = '';
@@ -723,6 +743,10 @@ if (is_array($arrmacs) && !empty($arrmacs)) {
 		if ($varmacsreplyitem != '') { $varmacsreplyitem .=","; }
 		$varmacsreplyitem .= "\n\tWISPr-Bandwidth-Max-Down := $varmacsmaxbandwidthdown";
 	}
+	if ($varmacsacctinteriminterval != '') {
+		if ($varmacsreplyitem != '') { $varmacsreplyitem .=","; }
+		$varmacsreplyitem .= "\n\tAcct-Interim-Interval := $varmacsacctinteriminterval";
+	}
 	if ($varmacswisprredirectionurl != '') {
 		if ($varmacsreplyitem != '') { $varmacsreplyitem .=","; }
 		$varmacsreplyitem .= "\n\tWISPr-Redirection-URL := $varmacsswisprredirectionurl";
diff --git a/config/freeradius2/freeradius.xml b/config/freeradius2/freeradius.xml
index 5f8226c7..fdadab89 100644
--- a/config/freeradius2/freeradius.xml
+++ b/config/freeradius2/freeradius.xml
@@ -419,6 +419,12 @@
 			<type>input</type>
 		</field>
 		<field>
+			<fielddescr>Accounting Interim Interval</fielddescr>
+			<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)]]></description>
+			<type>input</type>
+		</field>
+		<field>
 			<name>ADVANCED CONFIGURATION</name>
 			<type>listtopic</type>
 		</field>
diff --git a/config/freeradius2/freeradiusauthorizedmacs.xml b/config/freeradius2/freeradiusauthorizedmacs.xml
index 1903c375..173f8f00 100644
--- a/config/freeradius2/freeradiusauthorizedmacs.xml
+++ b/config/freeradius2/freeradiusauthorizedmacs.xml
@@ -366,6 +366,12 @@
 			<type>input</type>
 		</field>
 		<field>
+			<fielddescr>Accounting Interim Interval</fielddescr>
+			<fieldname>varmacsacctinteriminterval</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)]]></description>
+			<type>input</type>
+		</field>
+		<field>
 			<name>ADVANCED CONFIGURATION</name>
 			<type>listtopic</type>
 		</field>		
@@ -415,4 +421,4 @@
 	<custom_php_resync_config_command>
 		freeradius_authorizedmacs_resync();
 	</custom_php_resync_config_command>
-</packagegui>
\ No newline at end of file
+</packagegui>