diff options
author | gnhb <gnoahb@gmail.com> | 2010-03-29 20:03:55 +0700 |
---|---|---|
committer | gnhb <gnoahb@gmail.com> | 2010-03-29 20:03:55 +0700 |
commit | c90f247117ace2af4e072e7004e1750875e568ff (patch) | |
tree | 9ffc5d18ff5358ff09854d6170474f8dcb836d86 /usr/local/www | |
parent | a216a03a00166350c22162f1e0da03927e23af10 (diff) | |
download | pfsense-c90f247117ace2af4e072e7004e1750875e568ff.zip pfsense-c90f247117ace2af4e072e7004e1750875e568ff.tar.gz |
Changes to make PPP work again. mpd5 fails to establish a ppp link without
*some* username and password, so defaults are set if user enters nothing.
Removed interface_ppp_configure call from interfaces_ppp_edit.php. It was
useless there with the new structure, and it caused all PPP links to attempt
to connect when user presses "Save" even before they are assigned to LAN/WAN, etc.
Also, fix up pfsense-utils.inc and status_interfaces.php
to display more info on status_interfaces.php.
Changed util.inc to allow cua* interfaces to be recognized as real interfaces as
pfSense got "interface mismatch" at boot and forced user to reassign. Maybe someone
else has a better way to do this.
Diffstat (limited to 'usr/local/www')
-rw-r--r-- | usr/local/www/interfaces_ppp_edit.php | 8 | ||||
-rwxr-xr-x | usr/local/www/status_interfaces.php | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/usr/local/www/interfaces_ppp_edit.php b/usr/local/www/interfaces_ppp_edit.php index 9657466..f3aae99 100644 --- a/usr/local/www/interfaces_ppp_edit.php +++ b/usr/local/www/interfaces_ppp_edit.php @@ -137,12 +137,10 @@ if ($_POST) { $ppp['descr'] = $_POST['descr']; - $iflist = get_configured_interface_list(); - foreach ($iflist as $if) { - if ($config['interfaces'][$if]['if'] == basename($a_ppps[$id]['port'])) { + $iflist = get_configured_interface_list(); + foreach ($iflist as $if) { + if ($config['interfaces'][$if]['if'] == basename($a_ppps[$id]['port'])) $config['interfaces'][$if]['if'] = basename($ppp['port']); - interface_ppp_configure($if); - } } if (isset($id) && $a_ppps[$id]) diff --git a/usr/local/www/status_interfaces.php b/usr/local/www/status_interfaces.php index 5ebde3d..eaa968b 100755 --- a/usr/local/www/status_interfaces.php +++ b/usr/local/www/status_interfaces.php @@ -138,12 +138,12 @@ include("head.inc"); <tr> <td width="22%" class="vncellt">PPP</td> <td width="78%" class="listr"> - <?=htmlspecialchars($ifinfo['ppplink']);?> - <?php if ($ifinfo['status'] == "up"): ?> + <?=htmlspecialchars($ifinfo['pppinfo']);?> + <?php if ($ifinfo['ppplink'] == "up"): ?> <a href="status_interfaces.php?action=Disconnect&if=<?php echo $ifdescr; ?>"> <input type="button" name="<?php echo $ifdescr; ?>" value="Disconnect" class="formbtns"> <?php else: ?> - <?php if (!$ifinfo['missing_device']): ?> + <?php if (!$ifinfo['nodevice']): ?> <a href="status_interfaces.php?action=Connect&if=<?php echo $ifdescr; ?>"> <input type="button" name="<?php echo $ifdescr; ?>" value="Connect" class="formbtns"> <?php endif; ?> |