diff options
| author | Ermal <eri@pfsense.org> | 2012-06-11 07:00:48 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2012-06-11 07:00:48 +0000 |
| commit | 805b9ab69b868f385cb95742e3b9b53068ffb7f0 (patch) | |
| tree | 363a7595537f4694692db39eeb8991fa6c644b7e /etc/inc/util.inc | |
| parent | e0ad13cdf6fc1f61727c84a0db8f59f28fb8a79c (diff) | |
| download | pfsense-805b9ab69b868f385cb95742e3b9b53068ffb7f0.zip pfsense-805b9ab69b868f385cb95742e3b9b53068ffb7f0.tar.gz | |
Revert "Make mac_format aware of multiple Captiveportal instances"
This reverts commit 54df925b9ea447bdd10f88a886e2ef11d44c3059.
Diffstat (limited to 'etc/inc/util.inc')
| -rw-r--r-- | etc/inc/util.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/etc/inc/util.inc b/etc/inc/util.inc index 88cce91..6146d7c 100644 --- a/etc/inc/util.inc +++ b/etc/inc/util.inc @@ -1205,12 +1205,11 @@ function xml_safe_fieldname($fieldname) { return strtolower(str_replace($replace, "", $fieldname)); } -function mac_format($clientmac, $zone = false) { +function mac_format($clientmac) { global $config; $mac = explode(":", $clientmac); - if ($zone) - $mac_format = $zone ? $config['captiveportal'][$zone]['radmac_format'] : false; + $mac_format = $config['captiveportal']['radmac_format'] ? $config['captiveportal']['radmac_format'] : false; switch($mac_format) { case 'singledash': |
