diff options
| author | Ermal <eri@pfsense.org> | 2012-06-11 07:03:13 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2012-06-11 07:03:13 +0000 |
| commit | 8b2e2f12e6fd7b21d543c47d4f8aa13077b4e8aa (patch) | |
| tree | 9491ebec0fec4d884597234e22625ee3209398d4 /etc/inc/util.inc | |
| parent | 805b9ab69b868f385cb95742e3b9b53068ffb7f0 (diff) | |
| download | pfsense-8b2e2f12e6fd7b21d543c47d4f8aa13077b4e8aa.zip pfsense-8b2e2f12e6fd7b21d543c47d4f8aa13077b4e8aa.tar.gz | |
Make mac_format aware of cpzone but also friendly to previous code!
Diffstat (limited to 'etc/inc/util.inc')
| -rw-r--r-- | etc/inc/util.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/util.inc b/etc/inc/util.inc index 6146d7c..7737ad1 100644 --- a/etc/inc/util.inc +++ b/etc/inc/util.inc @@ -1206,10 +1206,10 @@ function xml_safe_fieldname($fieldname) { } function mac_format($clientmac) { - global $config; + global $config, $cpzone; $mac = explode(":", $clientmac); - $mac_format = $config['captiveportal']['radmac_format'] ? $config['captiveportal']['radmac_format'] : false; + $mac_format = $cpzone ? $config['captiveportal'][$cpzone]['radmac_format'] : false; switch($mac_format) { case 'singledash': |
