5 files changed, 14 insertions, 9 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 921966f..b8bb053 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -224,6 +224,9 @@ function interfaces_optional_configure() {
 		/* restart dnsmasq */
 		services_dnsmasq_configure();
 
+		/* reload captive portal */
+		captiveportal_configure();
+
 		/* set the reload filter dity flag */
 		touch("{$g['tmp_path']}/filter_dirty");				
 	}
@@ -869,6 +872,9 @@ function interfaces_wan_configure() {
 
 		/* restart dnsmasq */
 		services_dnsmasq_configure();
+		
+		/* reload captive portal */
+		captiveportal_configure();
 	}
 
 	mwexec("/sbin/ifconfig {$wancfg['if']} up");
@@ -1501,4 +1507,4 @@ function discover_bridge($interface1, $interface2) {
 	return "-1";
 }
 
-?>
+?>
+\ No newline at end of file
diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index 9c96c63..4bf5e2e 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -268,7 +268,7 @@ if ($_POST) {
 
 		$retval = 0;
 
-		touch("/tmp/reload_interfaces");
+		interfaces_opt_configure();
 
 		$savemsg = get_std_save_message($retval);
 	}
diff --git a/usr/local/www/interfaces_lan.php b/usr/local/www/interfaces_lan.php
index 119ff9e..9a32a17 100755
--- a/usr/local/www/interfaces_lan.php
+++ b/usr/local/www/interfaces_lan.php
@@ -83,7 +83,6 @@ if ($_POST) {
 	
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
 
-
 	if (($_POST['ipaddr'] && !is_ipaddr($_POST['ipaddr']))) {
 		$input_errors[] = "A valid IP address must be specified.";
 	}
@@ -128,14 +127,15 @@ if ($_POST) {
 		touch($d_landirty_path);
 
 		if ($_POST['apply'] <> "") {
+			interfaces_opt_configure();
+			
 			unlink($d_landirty_path);
+			
 			$savemsg = "The changes have been applied.  You may need to correct the web browsers ip address.";
 		}
-
 	}
 }
 
-
 $pgtitle = "Interfaces: LAN";
 include("head.inc");
 
@@ -256,9 +256,8 @@ function enable_change(enable_over) {
 
 if ($_POST['apply'] <> "") {
 
-	touch("/tmp/reload_interfaces");
 	if(file_exists($d_landirty_path))
-	unlink($d_landirty_path);
+		unlink($d_landirty_path);
 	
 }
 
diff --git a/usr/local/www/interfaces_opt.php b/usr/local/www/interfaces_opt.php
index 7934224..3ebd9ac 100755
--- a/usr/local/www/interfaces_opt.php
+++ b/usr/local/www/interfaces_opt.php
@@ -197,7 +197,7 @@ if ($_POST) {
 
 		write_config();
 		
-		touch("/tmp/reload_interfaces");
+		interfaces_opt_configure();
 		
 		/* sync filter configuration */
 		filter_configure();
diff --git a/usr/local/www/interfaces_wan.php b/usr/local/www/interfaces_wan.php
index 9c96c63..4bf5e2e 100755
--- a/usr/local/www/interfaces_wan.php
+++ b/usr/local/www/interfaces_wan.php
@@ -268,7 +268,7 @@ if ($_POST) {
 
 		$retval = 0;
 
-		touch("/tmp/reload_interfaces");
+		interfaces_opt_configure();
 
 		$savemsg = get_std_save_message($retval);
 	}