summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2017-01-12 12:22:45 -0200
committerRenato Botelho <renato@netgate.com>2017-01-12 12:22:45 -0200
commit1bb5457002a83217f84fa5298a1867aff1127410 (patch)
tree6b896d98e4d6213e563f169b57d060b80f31bae1 /src
parentcc82c3288dd551a0e34ed827d8b3523ba2bdf07f (diff)
parent6e3e95a538c4dda9c9f14b2ab78435eec0debf46 (diff)
downloadpfsense-1bb5457002a83217f84fa5298a1867aff1127410.zip
pfsense-1bb5457002a83217f84fa5298a1867aff1127410.tar.gz
Merge pull request #3372 from phil-davis/dhcp_client_id
Diffstat (limited to 'src')
-rw-r--r--src/usr/local/www/services_dhcp.php27
1 files changed, 27 insertions, 0 deletions
diff --git a/src/usr/local/www/services_dhcp.php b/src/usr/local/www/services_dhcp.php
index ddb2420..b62cd5d 100644
--- a/src/usr/local/www/services_dhcp.php
+++ b/src/usr/local/www/services_dhcp.php
@@ -1371,6 +1371,17 @@ print($form);
// DHCP Static Mappings table
if (!is_numeric($pool) && !($act == "newpool")) {
+
+ // Decide whether display of the Client Id column is needed.
+ $got_cid = false;
+ if (is_array($a_maps)) {
+ foreach ($a_maps as $map) {
+ if (!empty($map['cid'])) {
+ $got_cid = true;
+ break;
+ }
+ }
+ }
?>
<div class="panel panel-default">
@@ -1381,6 +1392,13 @@ if (!is_numeric($pool) && !($act == "newpool")) {
<tr>
<th><?=gettext("Static ARP")?></th>
<th><?=gettext("MAC address")?></th>
+<?php
+ if ($got_cid):
+?>
+ <th><?=gettext("Client Id")?></th>
+<?php
+ endif;
+?>
<th><?=gettext("IP address")?></th>
<th><?=gettext("Hostname")?></th>
<th><?=gettext("Description")?></th>
@@ -1404,6 +1422,15 @@ if (!is_numeric($pool) && !($act == "newpool")) {
<td ondblclick="document.location='services_dhcp_edit.php?if=<?=htmlspecialchars($if)?>&amp;id=<?=$i?>';">
<?=htmlspecialchars($mapent['mac'])?>
</td>
+<?php
+ if ($got_cid):
+?>
+ <td ondblclick="document.location='services_dhcp_edit.php?if=<?=htmlspecialchars($if)?>&amp;id=<?=$i?>';">
+ <?=htmlspecialchars($mapent['cid'])?>
+ </td>
+<?php
+ endif;
+?>
<td ondblclick="document.location='services_dhcp_edit.php?if=<?=htmlspecialchars($if)?>&amp;id=<?=$i?>';">
<?=htmlspecialchars($mapent['ipaddr'])?>
</td>
OpenPOWER on IntegriCloud