Take out all code that assumes to use DHCP for local ip if local ip is left blank.

Also, check for blank local IPs and error out if they occur.

1 files changed, 1 insertions, 8 deletions

diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index da0616a..4d6283b 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -151,10 +151,6 @@ if ($wancfg['if'] == $a_ppps[$pppid]['if']) {
 		$pconfig['pptp_username'] = $a_ppps[$pppid]['username'];
 		$pconfig['pptp_password'] = base64_decode($a_ppps[$pppid]['password']);
 		$pconfig['pptp_local'] = explode(",",$a_ppps[$pppid]['localip']);
-		foreach ($pconfig['pptp_local'] as $key => $value){
-			if ($value == "dhcp")
-				$pconfig['pptp_local'][$key] = "";	
-		}
 		$pconfig['pptp_subnet'] = explode(",",$a_ppps[$pppid]['subnet']);
 		$pconfig['pptp_remote'] = explode(",",$a_ppps[$pppid]['gateway']);
 		$pconfig['pptp_dialondemand'] = isset($a_ppps[$pppid]['ondemand']);
@@ -615,10 +611,7 @@ if ($_POST) {
 					$a_ppps[$pppid]['ports'] = $wancfg['if'];
 				$a_ppps[$pppid]['username'] = $_POST['pptp_username'];
 				$a_ppps[$pppid]['password'] = base64_encode($_POST['pptp_password']);
-				if($_POST['pptp_local'] == "")
-					$a_ppps[$pppid]['localip'] = "dhcp";
-				else
-					$a_ppps[$pppid]['localip'] = $_POST['pptp_local'];
+				$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;