summaryrefslogtreecommitdiffstats
path: root/usr/local/www
diff options
context:
space:
mode:
authorgnhb <gnoahb@gmail.com>2010-06-10 21:51:09 +0700
committergnhb <gnoahb@gmail.com>2010-06-10 21:51:09 +0700
commit237212858ebd80898c9429e5b3ba49cb68c8fc36 (patch)
tree66fea01911b3e921c11b3033589b12d41eaf5082 /usr/local/www
parent64b4be44b1d194a1818c596d17f3c948ac32c59c (diff)
downloadpfsense-237212858ebd80898c9429e5b3ba49cb68c8fc36.zip
pfsense-237212858ebd80898c9429e5b3ba49cb68c8fc36.tar.gz
Fix some things in interfaces.inc, attempt to suppress mpd log verbosity.
Fix also localip handling in interfaces.php
Diffstat (limited to 'usr/local/www')
-rwxr-xr-xusr/local/www/interfaces.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index e2c3824..da0616a 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -153,7 +153,7 @@ if ($wancfg['if'] == $a_ppps[$pppid]['if']) {
$pconfig['pptp_local'] = explode(",",$a_ppps[$pppid]['localip']);
foreach ($pconfig['pptp_local'] as $key => $value){
if ($value == "dhcp")
- $pconfig['localip'][$key] = "";
+ $pconfig['pptp_local'][$key] = "";
}
$pconfig['pptp_subnet'] = explode(",",$a_ppps[$pppid]['subnet']);
$pconfig['pptp_remote'] = explode(",",$a_ppps[$pppid]['gateway']);
@@ -615,7 +615,10 @@ if ($_POST) {
$a_ppps[$pppid]['ports'] = $wancfg['if'];
$a_ppps[$pppid]['username'] = $_POST['pptp_username'];
$a_ppps[$pppid]['password'] = base64_encode($_POST['pptp_password']);
- $a_ppps[$pppid]['localip'] = $_POST['pptp_local'];
+ if($_POST['pptp_local'] == "")
+ $a_ppps[$pppid]['localip'] = "dhcp";
+ else
+ $a_ppps[$pppid]['localip'] = $_POST['pptp_local'];
$a_ppps[$pppid]['subnet'] = $_POST['pptp_subnet'];
$a_ppps[$pppid]['gateway'] = $_POST['pptp_remote'];
$a_ppps[$pppid]['ondemand'] = $_POST['pptp_dialondemand'] ? true : false;
@@ -623,7 +626,6 @@ if ($_POST) {
$a_ppps[$pppid]['idletimeout'] = $_POST['pptp_idletimeout'];
else
unset($a_ppps[$pppid]['idletimeout']);
-
$wancfg['if'] = $_POST['type'].$_POST['ptpid'];
$wancfg['ipaddr'] = $_POST['type'];
if($gateway_item) {
OpenPOWER on IntegriCloud