Remove some unneccessary calls to filter_configure() they just give recursivity!

3 files changed, 3 insertions, 6 deletions

diff --git a/usr/local/www/vpn_ipsec.php b/usr/local/www/vpn_ipsec.php
index 8eb81ce..870f048 100755
--- a/usr/local/www/vpn_ipsec.php
+++ b/usr/local/www/vpn_ipsec.php
@@ -91,8 +91,8 @@ if ($_GET['act'] == "delph1")
 		unset($a_phase1[$_GET['p1index']]);
 		vpn_ipsec_refresh_policies();
 		vpn_ipsec_configure();
-		filter_configure();
 		write_config();
+		filter_configure();
 		header("Location: vpn_ipsec.php");
 		exit;
 	}
diff --git a/usr/local/www/vpn_pppoe.php b/usr/local/www/vpn_pppoe.php
index 592ba07..62037e2 100755
--- a/usr/local/www/vpn_pppoe.php
+++ b/usr/local/www/vpn_pppoe.php
@@ -118,7 +118,6 @@ if ($_POST) {
 			}
 		}
 		unset($config['pppoe']);
-		write_config();		
 	}
 	
 	if (!$input_errors) {
@@ -172,7 +171,7 @@ if ($_POST) {
 		write_config();
 		
 		$retval = 0;
-		$retval = vpn_setup();
+		$retval = vpn_pppoe_configure();
 		$savemsg = get_std_save_message($retval);
 	}
 }
diff --git a/usr/local/www/vpn_pptp.php b/usr/local/www/vpn_pptp.php
index 7f9f80a..b2f7e59 100755
--- a/usr/local/www/vpn_pptp.php
+++ b/usr/local/www/vpn_pptp.php
@@ -127,8 +127,6 @@ if ($_POST) {
 			}
 		}
 		unset($config['pptpd']['mode']);
-
-		write_config();
 	}
 
 	if (!$input_errors) {
@@ -188,7 +186,7 @@ if ($_POST) {
 		write_config();
 		
 		$retval = 0;
-		$retval = vpn_setup();
+		$retval = vpn_pptpd_configure();
 		$savemsg = get_std_save_message($retval);
 		
 		filter_configure();