During traffic shaper wizard rewire the logo to remove shaper rules to basically abort the incremental shaper process

2 files changed, 6 insertions, 1 deletions

diff --git a/usr/local/www/firewall_shaper.php b/usr/local/www/firewall_shaper.php
index 5ee634e..6c14c8f 100755
--- a/usr/local/www/firewall_shaper.php
+++ b/usr/local/www/firewall_shaper.php
@@ -62,7 +62,7 @@ function wipe_magic () {
   filter_configure();
 }
 
-if ($_POST['remove']) {
+if ($_POST['remove'] or $_GET['remove']) {
   wipe_magic();
   $savemsg = '<p><span class="red"><strong>Note: The traffic shaper has been disabled.</strong></span><strong><br>';
   touch($d_shaperconfdirty_path);
diff --git a/usr/local/www/wizard.php b/usr/local/www/wizard.php
index 50e8154..ebfb02a 100755
--- a/usr/local/www/wizard.php
+++ b/usr/local/www/wizard.php
@@ -209,6 +209,11 @@ function enablechange() {
 	else
 		$ip = "/";
 
+if($_GET['xml'] == "traffic_shaper_wizard.xml" or
+   $_POST['xml'] == "traffic_shaper_wizard.xml") {
+	$ip .= "firewall_shaper.php?remove=true";
+}
+
 ?>
 
 <a href="<?php echo $ip; ?>"><img border="0" src="./themes/<?= $g['theme']; ?>/images/logo.gif"></a>