diff options
author | Ermal <eri@pfsense.org> | 2010-12-07 20:08:36 +0000 |
---|---|---|
committer | Ermal <eri@pfsense.org> | 2010-12-07 20:08:36 +0000 |
commit | afa966a582ac1ebcd5a3ed77eb540a93f3660cf4 (patch) | |
tree | d1d6998b2fc888c8b571f96f548ca6e9e53f6cf1 | |
parent | c5901d2853b9a06a77b32c900c651fef790143f8 (diff) | |
download | pfsense-afa966a582ac1ebcd5a3ed77eb540a93f3660cf4.zip pfsense-afa966a582ac1ebcd5a3ed77eb540a93f3660cf4.tar.gz |
Ticket #1081. Fix header() function to do correct redirection. Also remove bogus step9 in the wizards.
8 files changed, 4 insertions, 67 deletions
diff --git a/usr/local/www/wizards/traffic_shaper_wizard.inc b/usr/local/www/wizards/traffic_shaper_wizard.inc index 5a39e90..c85d54d 100644 --- a/usr/local/www/wizards/traffic_shaper_wizard.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard.inc @@ -555,10 +555,7 @@ function step8_stepsubmitphpaction() { clear_subsystem_dirty('shaper'); update_filter_reload_status("Initializing"); -} -function step9_stepsubmitphpaction() { - global $g, $config; - header("status_filter_reload.php"); + header("Location: status_filter_reload.php"); exit; } diff --git a/usr/local/www/wizards/traffic_shaper_wizard.xml b/usr/local/www/wizards/traffic_shaper_wizard.xml index ce2b04c..4c2f2a3 100644 --- a/usr/local/www/wizards/traffic_shaper_wizard.xml +++ b/usr/local/www/wizards/traffic_shaper_wizard.xml @@ -1215,16 +1215,4 @@ <stepsubmitphpaction>step8_stepsubmitphpaction();</stepsubmitphpaction> <includefile>/usr/local/www/wizards/traffic_shaper_wizard.inc</includefile> </step> - <step> - <id>9</id> - <title>pfSense Traffic Shaper Wizard</title> - <fields> - <field> - <name>Finish</name> - <type>submit</type> - </field> - </fields> - <includefile>/usr/local/www/wizards/traffic_shaper_wizard.inc</includefile> - <stepsubmitphpaction>step9_stepsubmitphpaction();</stepsubmitphpaction> - </step> </pfsensewizard> diff --git a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc index 4811181..5c540cd 100755 --- a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc @@ -582,11 +582,7 @@ function step8_stepsubmitphpaction() { clear_subsystem_dirty('shaper'); update_filter_reload_status("Initializing"); -} - -function step9_stepsubmitphpaction() { - global $g, $config; - header("status_filter_reload.php"); + header("Location: status_filter_reload.php"); exit; } diff --git a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.xml b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.xml index 5d83553..ecdb508 100755 --- a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.xml +++ b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.xml @@ -1220,16 +1220,4 @@ <stepsubmitphpaction>step8_stepsubmitphpaction();</stepsubmitphpaction> <includefile>/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc</includefile> </step> - <step> - <id>9</id> - <title>pfSense Traffic Shaper Wizard</title> - <fields> - <field> - <name>Finish</name> - <type>submit</type> - </field> - </fields> - <includefile>/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc</includefile> - <stepsubmitphpaction>step9_stepsubmitphpaction();</stepsubmitphpaction> - </step> </pfsensewizard> 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 d1a1122..e01cf00 100755 --- a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc @@ -615,11 +615,7 @@ function step8_stepsubmitphpaction() { clear_subsystem_dirty('shaper'); update_filter_reload_status("Initializing"); -} - -function step9_stepsubmitphpaction() { - global $g, $config; - header("status_filter_reload.php"); + header("Location: status_filter_reload.php"); exit; } diff --git a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.xml b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.xml index 9fca078..050f493 100755 --- a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.xml +++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.xml @@ -1228,16 +1228,4 @@ <stepsubmitphpaction>step8_stepsubmitphpaction();</stepsubmitphpaction> <includefile>/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc</includefile> </step> - <step> - <id>9</id> - <title>pfSense Traffic Shaper Wizard</title> - <fields> - <field> - <name>Finish</name> - <type>submit</type> - </field> - </fields> - <includefile>/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc</includefile> - <stepsubmitphpaction>step9_stepsubmitphpaction();</stepsubmitphpaction> - </step> </pfsensewizard> 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 5186aa3..7410299 100644 --- a/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc +++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc @@ -397,11 +397,7 @@ function step8_stepsubmitphpaction() { clear_subsystem_dirty('shaper'); update_filter_reload_status("Initializing"); -} - -function step9_stepsubmitphpaction() { - global $g, $config; - header("status_filter_reload.php"); + header("Location: status_filter_reload.php"); exit; } diff --git a/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.xml b/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.xml index 9ed7c44..ae5a139 100644 --- a/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.xml +++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.xml @@ -1277,16 +1277,4 @@ <stepsubmitphpaction>step8_stepsubmitphpaction();</stepsubmitphpaction> <includefile>/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc</includefile> </step> - <step> - <id>9</id> - <title>pfSense Traffic Shaper Wizard</title> - <fields> - <field> - <name>Finish</name> - <type>submit</type> - </field> - </fields> - <includefile>/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc</includefile> - <stepsubmitphpaction>step9_stepsubmitphpaction();</stepsubmitphpaction> - </step> </pfsensewizard> |