From 701e4ce4a098c4939b10fb233c20c7d04990a528 Mon Sep 17 00:00:00 2001 From: Alexander Wilke Date: Fri, 3 Feb 2012 23:39:31 +0100 Subject: Update config/freeradius2/freeradius.inc --- config/freeradius2/freeradius.inc | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/config/freeradius2/freeradius.inc b/config/freeradius2/freeradius.inc index 7d24ed2e..4a4fee14 100644 --- a/config/freeradius2/freeradius.inc +++ b/config/freeradius2/freeradius.inc @@ -398,6 +398,7 @@ if (is_array($arrusers) && !empty($arrusers)) { $varusersusername = $users['varusersusername']; $varuserspassword = $users['varuserspassword']; $varuserssimultaneousconnect = ($users['varuserssimultaneousconnect']?$users['varuserssimultaneousconnect']:''); + $varuserswisprredirectionurl = $users['varuserswisprredirectionurl']; $varusersframedipaddress = $users['varusersframedipaddress']; $varusersframedipnetmask = $users['varusersframedipnetmask']; $varusersframedroute = $users['varusersframedroute']; @@ -514,6 +515,10 @@ if (is_array($arrusers) && !empty($arrusers)) { if ($varusersreplyitem != '') { $varusersreplyitem .=","; } $varusersreplyitem .= "\n\tWISPr-Bandwidth-Max-Down := $varusersmaxbandwidthdown"; } + if ($varuserswisprredirectionurl != '') { + if ($varusersreplyitem != '') { $varusersreplyitem .=","; } + $varusersreplyitem .= "\n\tWISPr-Redirection-URL := $varuserswisprredirectionurl"; + } if ($varusersadditionaloptionsreplyitems != '') { if ($varusersreplyitem != '') { $varusersreplyitem .=","; } $varusersreplyitem .= "\n\t$varusersadditionaloptionsreplyitems"; @@ -555,8 +560,9 @@ if (is_array($arrmacs) && !empty($arrmacs)) { $varmacsaddress = $macs['varmacsaddress']; // We don't need a password but we need this field to make syntac correct for CHECK-ITEMS $varmacspassword = $macs['varmacsaddress']; - + $varmacssimultaneousconnect = ($macs['varmacssimultaneousconnect']?$macs['varmacssimultaneousconnect']:''); + $varmacsswisprredirectionurl = $macs['varmacsswisprredirectionurl']; $varmacsframedipaddress = $macs['varmacsframedipaddress']; $varmacsframedipnetmask = $macs['varmacsframedipnetmask']; $varmacsframedroute = $macs['varmacsframedroute']; @@ -673,6 +679,10 @@ if (is_array($arrmacs) && !empty($arrmacs)) { if ($varmacsreplyitem != '') { $varmacsreplyitem .=","; } $varmacsreplyitem .= "\n\tWISPr-Bandwidth-Max-Down := $varmacsmaxbandwidthdown"; } + if ($varmacsswisprredirectionurl != '') { + if ($varmacsreplyitem != '') { $varmacsreplyitem .=","; } + $varmacsreplyitem .= "\n\tWISPr-Redirection-URL := $varmacsswisprredirectionurl"; + } if ($varmacsadditionaloptionsreplyitems != '') { if ($varmacsreplyitem != '') { $varmacsreplyitem .=","; } $varmacsreplyitem .= "\n\t$varmacsadditionaloptionsreplyitems"; @@ -1324,7 +1334,7 @@ function freeradius_serverdefault_resync() { // Disable acct_unique in preacct section $varsettings = $config['installedpackages']['freeradiussettings']['config'][0]; - + if ($varsettings['varsettingsenableacctunique'] == 'on') { $varsettingsacctuniqueenabled = '##### DISABLE acct_unique DISABLE #####'; } -- cgit v1.2.3