diff options
| author | Ermal <eri@pfsense.org> | 2012-12-17 12:00:45 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2012-12-17 19:24:33 +0000 |
| commit | 553abb0d841f3937479ad7d02f67c08a244cbfe5 (patch) | |
| tree | 3fb7c920358a9b5b1106ca1897240b996a22bf81 /etc/inc/captiveportal.inc | |
| parent | f90b8b00edd12a50b57448c1a08cf03962305790 (diff) | |
| download | pfsense-553abb0d841f3937479ad7d02f67c08a244cbfe5.zip pfsense-553abb0d841f3937479ad7d02f67c08a244cbfe5.tar.gz | |
Move down a bit of code
Diffstat (limited to 'etc/inc/captiveportal.inc')
| -rw-r--r-- | etc/inc/captiveportal.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index ce3aa29..81816b6 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -1769,11 +1769,6 @@ function portal_allow($clientip,$clientmac,$username,$password = null, $attribut $tod = gettimeofday(); $sessionid = substr(md5(mt_rand() . $tod['sec'] . $tod['usec'] . $clientip . $clientmac), 0, 16); - $dwfaultbw_up = isset($config['captiveportal'][$cpzone]['bwdefaultup']) ? $config['captiveportal'][$cpzone]['bwdefaultup'] : 0; - $dwfaultbw_down = isset($config['captiveportal'][$cpzone]['bwdefaultdn']) ? $config['captiveportal'][$cpzone]['bwdefaultdn'] : 0; - $bw_up = isset($attributes['bw_up']) ? round(intval($attributes['bw_up'])/1000, 2) : $dwfaultbw_up; - $bw_down = isset($attributes['bw_down']) ? round(intval($attributes['bw_down'])/1000, 2) : $dwfaultbw_down; - if ($passthrumac) { $mac = array(); $mac['mac'] = $clientmac; @@ -1810,6 +1805,11 @@ function portal_allow($clientip,$clientmac,$username,$password = null, $attribut return; } + $dwfaultbw_up = isset($config['captiveportal'][$cpzone]['bwdefaultup']) ? $config['captiveportal'][$cpzone]['bwdefaultup'] : 0; + $dwfaultbw_down = isset($config['captiveportal'][$cpzone]['bwdefaultdn']) ? $config['captiveportal'][$cpzone]['bwdefaultdn'] : 0; + $bw_up = isset($attributes['bw_up']) ? round(intval($attributes['bw_up'])/1000, 2) : $dwfaultbw_up; + $bw_down = isset($attributes['bw_down']) ? round(intval($attributes['bw_down'])/1000, 2) : $dwfaultbw_down; + $bw_up_pipeno = $pipeno; $bw_down_pipeno = $pipeno + 1; //$bw_up /= 1000; // Scale to Kbit/s |
