From ac87dbbf244d2415dbe72cc4746e2722004cf42c Mon Sep 17 00:00:00 2001 From: Ermal Date: Wed, 20 Oct 2010 15:13:47 +0000 Subject: [PATCH] Traffic shaper wizards remove redirection before final step. This seems a forgotten item. --- .../www/wizards/traffic_shaper_wizard.inc | 3 -- .../traffic_shaper_wizard_dedicated.inc | 3 -- .../traffic_shaper_wizard_multi_all.inc | 28 +++++++++---------- .../traffic_shaper_wizard_multi_lan.inc | 3 -- 4 files changed, 13 insertions(+), 24 deletions(-) diff --git a/usr/local/www/wizards/traffic_shaper_wizard.inc b/usr/local/www/wizards/traffic_shaper_wizard.inc index 78344cf0da..e42de1e52b 100644 --- a/usr/local/www/wizards/traffic_shaper_wizard.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard.inc @@ -555,9 +555,6 @@ function step8_stepsubmitphpaction() { clear_subsystem_dirty('shaper'); update_filter_reload_status("Initializing"); - - /* Head over and check out the groovy queue stats */ - header("Location: status_filter_reload.php"); } function step9_stepsubmitphpaction() { global $g, $config; diff --git a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc index 9909db7204..78c8990b14 100755 --- a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc @@ -582,9 +582,6 @@ function step8_stepsubmitphpaction() { clear_subsystem_dirty('shaper'); update_filter_reload_status("Initializing"); - - /* Head over and check out the groovy queue stats */ - header("Location: status_filter_reload.php"); } function step9_stepsubmitphpaction() { diff --git a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc index b44a0b880e..63b3b11a41 100755 --- a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc @@ -598,27 +598,25 @@ function step5_stepsubmitphpaction() { } function step8_stepsubmitphpaction() { - global $g, $config; + global $g, $config; - /* save the new configuration */ - apply_all_choosen_items(); + /* save the new configuration */ + apply_all_choosen_items(); - /* reset rrd queues */ - system("rm -f /var/db/rrd/*queuedrops.rrd"); - system("rm -f /var/db/rrd/*queues.rrd"); - enable_rrd_graphing(); + /* reset rrd queues */ + system("rm -f /var/db/rrd/*queuedrops.rrd"); + system("rm -f /var/db/rrd/*queues.rrd"); + enable_rrd_graphing(); - /* apply the new configuration to the system */ - filter_configure(); + /* apply the new configuration to the system */ + filter_configure(); - /* And we're no longer dirty! */ - clear_subsystem_dirty('shaper'); + /* And we're no longer dirty! */ + clear_subsystem_dirty('shaper'); - update_filter_reload_status("Initializing"); - - /* Head over and check out the groovy queue stats */ - header("Location: status_filter_reload.php"); + update_filter_reload_status("Initializing"); } + function step9_stepsubmitphpaction() { global $g, $config; header("status_filter_reload.php"); diff --git a/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc b/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc index 9cdbf46434..e4f5816805 100644 --- a/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc @@ -397,9 +397,6 @@ function step8_stepsubmitphpaction() { clear_subsystem_dirty('shaper'); update_filter_reload_status("Initializing"); - - /* Head over and check out the groovy queue stats */ - header("Location: status_filter_reload.php"); } function step9_stepsubmitphpaction() {