From fbb45bb034aad683b2bd207a497d0cfc0b1b5a1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ermal=20Lu=C3=A7i?= Date: Sat, 21 Jun 2008 17:13:18 +0000 Subject: Continue interface improvements --- usr/local/www/interfaces_ppp.php | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'usr/local/www/interfaces_ppp.php') diff --git a/usr/local/www/interfaces_ppp.php b/usr/local/www/interfaces_ppp.php index d77b66a..c72c771 100644 --- a/usr/local/www/interfaces_ppp.php +++ b/usr/local/www/interfaces_ppp.php @@ -41,13 +41,9 @@ $a_ppps = &$config['ppps']['ppp'] ; function ppp_inuse($num) { global $config, $g; - if ($config['interfaces']['lan']['if'] == "ppp{$num}") - return true; - if ($config['interfaces']['wan']['if'] == "ppp{$num}") - return true; - - for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) { - if ($config['interfaces']['opt' . $i]['if'] == "ppp{$num}") + $iflist = get_configured_interface_list(false, true); + foreach ($iflist as $if) { + if ($config['interfaces'][$if]['if'] == "ppp{$num}") return true; } @@ -72,11 +68,9 @@ if ($_GET['act'] == "del") { } else { unset($a_ppps[$_GET['id']]); - /* renumber all interfaces that use PPP */ - $config['interfaces']['lan']['if'] = renumber_ppp($config['interfaces']['lan']['if'], $_GET['id']); - $config['interfaces']['wan']['if'] = renumber_ppp($config['interfaces']['wan']['if'], $_GET['id']); - for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) - $config['interfaces']['opt' . $i]['if'] = renumber_ppp($config['interfaces']['opt' . $i]['if'], $_GET['id']); + $iflist = get_configured_interface_list(false, true); + foreach ($iflist as $if) + $config['interfaces'][$if]['if'] = renumber_ppp($config['interfaces'][$if]['if'], $_GET['id']); write_config(); -- cgit v1.1