Move reload pieces to end of page, call filter_configure() afterwards

4 files changed, 46 insertions, 10 deletions

diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index 4bf5e2e..7f70ab0 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -268,8 +268,6 @@ if ($_POST) {
 
 		$retval = 0;
 
-		interfaces_opt_configure();
-
 		$savemsg = get_std_save_message($retval);
 	}
 }
@@ -693,3 +691,18 @@ type_change();
 <?php include("fend.inc"); ?>
 </body>
 </html>
+
+
+<?php
+
+if ($_POST) {
+
+	if (!$input_errors) {
+		interfaces_wan_configure();
+		
+		/* sync filter configuration */
+		filter_configure();
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/usr/local/www/interfaces_lan.php b/usr/local/www/interfaces_lan.php
index 6a9ad88..4209752 100755
--- a/usr/local/www/interfaces_lan.php
+++ b/usr/local/www/interfaces_lan.php
@@ -257,7 +257,10 @@ function enable_change(enable_over) {
 if ($_POST['apply'] <> "") {
 
 	interfaces_lan_configure();
-
+	
+	/* sync filter configuration */
+	filter_configure();
+	
 	if(file_exists($d_landirty_path))
 		unlink($d_landirty_path);
 	
diff --git a/usr/local/www/interfaces_opt.php b/usr/local/www/interfaces_opt.php
index 85baf10..b100a27 100755
--- a/usr/local/www/interfaces_opt.php
+++ b/usr/local/www/interfaces_opt.php
@@ -197,11 +197,6 @@ if ($_POST) {
 
 		write_config();
 		
-		interfaces_optional_configure_if($index);
-		
-		/* sync filter configuration */
-		filter_configure();
-
 		$savemsg = get_std_save_message($retval);
 	}
 }
@@ -422,3 +417,15 @@ enable_change(false);
 <?php include("fend.inc"); ?>
 </body>
 </html>
+
+<?php
+if ($_POST) {
+
+	if (!$input_errors) {
+		interfaces_optional_configure_if($index);
+		
+		/* sync filter configuration */
+		filter_configure();
+	}
+}
+?>
\ No newline at end of file
diff --git a/usr/local/www/interfaces_wan.php b/usr/local/www/interfaces_wan.php
index 4bf5e2e..7f70ab0 100755
--- a/usr/local/www/interfaces_wan.php
+++ b/usr/local/www/interfaces_wan.php
@@ -268,8 +268,6 @@ if ($_POST) {
 
 		$retval = 0;
 
-		interfaces_opt_configure();
-
 		$savemsg = get_std_save_message($retval);
 	}
 }
@@ -693,3 +691,18 @@ type_change();
 <?php include("fend.inc"); ?>
 </body>
 </html>
+
+
+<?php
+
+if ($_POST) {
+
+	if (!$input_errors) {
+		interfaces_wan_configure();
+		
+		/* sync filter configuration */
+		filter_configure();
+	}
+}
+
+?>
\ No newline at end of file