diff options
author | Ermal <eri@pfsense.org> | 2010-03-27 00:05:37 +0000 |
---|---|---|
committer | Ermal <eri@pfsense.org> | 2010-03-27 00:05:37 +0000 |
commit | 611ae8521469576569a8d9c0d306668fe1b20dfe (patch) | |
tree | f16b941d545194ba2db9a794dc66080cc5b4895f /usr/local/www/interfaces_ppp.php | |
parent | 3ad5fd63f0b5a7fa7b1f291b44ba37c0ccf88cd1 (diff) | |
download | pfsense-611ae8521469576569a8d9c0d306668fe1b20dfe.zip pfsense-611ae8521469576569a8d9c0d306668fe1b20dfe.tar.gz |
Redo most of the ppp interface handling to be consistent with the other mpd5 configurations. This way there is no more special handling for ppp around.
Diffstat (limited to 'usr/local/www/interfaces_ppp.php')
-rw-r--r-- | usr/local/www/interfaces_ppp.php | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/usr/local/www/interfaces_ppp.php b/usr/local/www/interfaces_ppp.php index 3b5d339..41d36f9 100644 --- a/usr/local/www/interfaces_ppp.php +++ b/usr/local/www/interfaces_ppp.php @@ -51,10 +51,10 @@ if (!is_array($config['ppps']['ppp'])) $a_ppps = &$config['ppps']['ppp'] ; function ppp_inuse($num) { - global $config, $g; + global $config, $g, $a_ppps; $iflist = get_configured_interface_list(false, true); foreach ($iflist as $if) { - if ($config['interfaces'][$if]['if'] == "ppp{$num}") + if ($config['interfaces'][$if]['if'] == $a_ppps[$num]['port']) return true; } return false; @@ -67,7 +67,6 @@ if ($_GET['act'] == "del") { } else { unset($a_ppps[$_GET['id']]); write_config(); - interface_ppp_configure(-1); header("Location: interfaces_ppp.php"); exit; } @@ -103,15 +102,12 @@ include("head.inc"); <div id="mainarea"> <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> <tr> - <td width="10%" class="listhdrr">PPP Port</td> <td width="20%" class="listhdrr">Serial Port</td> <td width="40%" class="listhdr">Description</td> <td width="10%" class="list"></td> </tr> <?php $i = 0; foreach ($a_ppps as $id => $ppp): ?> <tr ondblclick="document.location='interfaces_ppp_edit.php?id=<?=$i;?>'"> - <td class="listr">ppp<?=htmlspecialchars($ppp['pppid']);?> - </td> <td class="listr"> <?=htmlspecialchars($ppp['port']);?> </td> @@ -123,7 +119,7 @@ include("head.inc"); </tr> <?php $i++; endforeach; ?> <tr> - <td class="list" colspan="3"> </td> + <td class="list" colspan="2"> </td> <td class="list"> <a href="interfaces_ppp_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td> </tr> </table> |