diff options
| author | Renato Botelho <renato@netgate.com> | 2016-12-26 12:32:16 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-12-26 12:32:16 -0200 |
| commit | bebb4b8a128e04bfb4abe18d0e62b1b948f4afe2 (patch) | |
| tree | 62ec683853ed5355d0a50ae83a55c089246f6560 | |
| parent | a3f671ec611a69193ca726b2fa48c8198e907e79 (diff) | |
| parent | d08f68e2b2f9032cca9968a225cd8868320ed50b (diff) | |
| download | pfsense-bebb4b8a128e04bfb4abe18d0e62b1b948f4afe2.zip pfsense-bebb4b8a128e04bfb4abe18d0e62b1b948f4afe2.tar.gz | |
Merge pull request #3310 from plumbeo/hide-mac-column
| -rw-r--r-- | src/usr/local/www/status_captiveportal.php | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/src/usr/local/www/status_captiveportal.php b/src/usr/local/www/status_captiveportal.php index cd4a702..9e2e177 100644 --- a/src/usr/local/www/status_captiveportal.php +++ b/src/usr/local/www/status_captiveportal.php @@ -127,7 +127,13 @@ if (!empty($cpzone)): ?> <thead> <tr> <th><?=gettext("IP address")?></th> +<?php + if (!isset($config['captiveportal'][$cpzone]['nomacfilter'])): +?> <th><?=gettext("MAC address")?></th> +<?php + endif; +?> <th><?=gettext("Username")?></th> <th><?=gettext("Session start")?></th> <?php @@ -146,18 +152,24 @@ if (!empty($cpzone)): ?> foreach ($cpdb as $cpent): ?> <tr> <td><?= htmlspecialchars($cpent[2]);?></td> +<?php + if (!isset($config['captiveportal'][$cpzone]['nomacfilter'])) { +?> <td> <?php - $mac=trim($cpent[3]); - if (!empty($mac)) { - $mac_hi = strtoupper($mac[0] . $mac[1] . $mac[3] . $mac[4] . $mac[6] . $mac[7]); - print htmlentities($mac); - if (isset($mac_man[$mac_hi])) { - print "<br /><font size=\"-2\"><i>" . htmlspecialchars($mac_man[$mac_hi]) . "</i></font>"; + $mac=trim($cpent[3]); + if (!empty($mac)) { + $mac_hi = strtoupper($mac[0] . $mac[1] . $mac[3] . $mac[4] . $mac[6] . $mac[7]); + print htmlentities($mac); + if (isset($mac_man[$mac_hi])) { + print "<br /><font size=\"-2\"><i>" . htmlspecialchars($mac_man[$mac_hi]) . "</i></font>"; + } } - } ?> </td> +<?php + } +?> <td><?=htmlspecialchars($cpent[4])?></td> <?php if ($_GET['showact']): |
