Some tweaking to handle when switching off dhcpv6.

1 files changed, 8 insertions, 5 deletions

diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index 8927d5b..83fc745 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -71,6 +71,9 @@ define("CRON_WEEKLY_PATTERN", "0 0 * * 0");
 define("CRON_DAILY_PATTERN", "0 0 * * *");
 define("CRON_HOURLY_PATTERN", "0 * * * *");
 
+if (!is_array($pconfig))
+	$pconfig = array();
+
 if (!is_array($config['ppps']['ppp']))
 	$config['ppps']['ppp'] = array();
 
@@ -785,16 +788,16 @@ if ($_POST['apply']) {
 			if (in_array($wancfg['ipaddr'], array("ppp", "pppoe", "pptp", "l2tp"))) {
 				$wancfg['if'] = $a_ppps[$pppid]['ports'];
 				unset($a_ppps[$pppid]);
-			} else if ($wancfg['ipaddrv6'] == "dhcp6") {
-				$pid = find_dhcp6c_process($wancfg['if']);
-				if($pid)
-					posix_kill($pid, SIGTERM);
 			} else if ($wancfg['ipaddr'] == "dhcp") {
 				$pid = find_dhclient_process($wancfg['if']);
 				if($pid)
 					posix_kill($pid, SIGTERM);
 			}
-
+			if ($wancfg['ipaddrv6'] == "dhcp6") {
+				$pid = find_dhcp6c_process($wancfg['if']);
+				if($pid)
+					posix_kill($pid, SIGTERM);
+			}
 		}
 		$ppp = array();
 		if ($wancfg['ipaddr'] != "ppp")