From 25b4e96822a32218b8bffb69ad1528185474fff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ermal=20Lu=C3=A7i?= Date: Wed, 30 Jul 2008 17:06:44 +0000 Subject: Fix tab name displaying that can be obfuscated by stale knobs in the config. --- usr/local/www/services_dhcp.php | 2 +- usr/local/www/services_dhcp_relay.php | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) (limited to 'usr') diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php index d354a7c..89c0a84 100755 --- a/usr/local/www/services_dhcp.php +++ b/usr/local/www/services_dhcp.php @@ -52,7 +52,7 @@ foreach ($ifdescrs as $ifname => $ifdesc) { if (!is_ipaddr($oc['ipaddr']) && $is_olsr_enabled) $singleif_nostaticip = true; - else if ($oc['if'] && (!$oc['bridge'])) + else if ($oc['if']) $iflist[$ifname] = $ifdesc; } diff --git a/usr/local/www/services_dhcp_relay.php b/usr/local/www/services_dhcp_relay.php index a64bbc2..e9bcff2 100755 --- a/usr/local/www/services_dhcp_relay.php +++ b/usr/local/www/services_dhcp_relay.php @@ -63,14 +63,7 @@ $if = $_GET['if']; if ($_POST['if']) $if = $_POST['if']; -$ifdescrs = get_configured_interface_list(); -foreach ($ifdescrs as $ifname) { - $oc = $config['interfaces'][$ifname]; - - if ($oc['if'] && (!$oc['bridge'])) { - $iflist[$ifname] = $oc['descr']; - } -} +$iflist = get_configured_interface_with_descr(); if (!$if || !isset($iflist[$if])) $if = "lan"; -- cgit v1.1