diff options
| author | Ermal LUÇI <eri@pfsense.org> | 2014-12-22 12:03:13 +0100 |
|---|---|---|
| committer | Ermal LUÇI <eri@pfsense.org> | 2014-12-22 12:03:13 +0100 |
| commit | ce90c89a308f6d3ceaf9193a570eb10911903f87 (patch) | |
| tree | d3f7bd0d920921ae580a4dbb840aabd12234c491 /etc | |
| parent | 5b4ed0e1dbef72c42c0760e9c2bc02575b4d57ad (diff) | |
| download | pfsense-ce90c89a308f6d3ceaf9193a570eb10911903f87.zip pfsense-ce90c89a308f6d3ceaf9193a570eb10911903f87.tar.gz | |
Do not apply bw limits if the setting is not enabled in CP. Though still respect radius attributes for now with this setting. Resolves #4127
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/captiveportal.inc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index cf529f9..cf97f2b 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -1783,8 +1783,11 @@ function portal_mac_radius($clientmac,$clientip) { function captiveportal_reapply_attributes($cpentry, $attributes) { global $config, $cpzone, $g; - $dwfaultbw_up = isset($config['captiveportal'][$cpzone]['bwdefaultup']) ? $config['captiveportal'][$cpzone]['bwdefaultup'] : 0; - $dwfaultbw_down = isset($config['captiveportal'][$cpzone]['bwdefaultdn']) ? $config['captiveportal'][$cpzone]['bwdefaultdn'] : 0; + if (isset($config['captiveportal'][$cpzone]['peruserbw'])) { + $dwfaultbw_up = isset($config['captiveportal'][$cpzone]['bwdefaultup']) ? $config['captiveportal'][$cpzone]['bwdefaultup'] : 0; + $dwfaultbw_down = isset($config['captiveportal'][$cpzone]['bwdefaultdn']) ? $config['captiveportal'][$cpzone]['bwdefaultdn'] : 0; + } else + $dwfaultbw_up = $dwfaultbw_down = 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 = $cpentry[1]; @@ -1961,8 +1964,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; + if (isset($config['captiveportal'][$cpzone]['peruserbw'])) { + $dwfaultbw_up = isset($config['captiveportal'][$cpzone]['bwdefaultup']) ? $config['captiveportal'][$cpzone]['bwdefaultup'] : 0; + $dwfaultbw_down = isset($config['captiveportal'][$cpzone]['bwdefaultdn']) ? $config['captiveportal'][$cpzone]['bwdefaultdn'] : 0; + } else + $dwfaultbw_up = $dwfaultbw_down = 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; |
