diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2005-10-23 18:56:37 +0000 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2005-10-23 18:56:37 +0000 |
commit | b3e7dc67ede432b344538544eb2fa0f1d4174dba (patch) | |
tree | 6fe4f5db881ea7e02f4756b12f5faf64279c6a93 /usr/local | |
parent | c2b6723a3ad65a7e07d7bc9da4c78f952fba789c (diff) | |
download | pfsense-b3e7dc67ede432b344538544eb2fa0f1d4174dba.zip pfsense-b3e7dc67ede432b344538544eb2fa0f1d4174dba.tar.gz |
MFC 7079
Force users to use wizard if shaper isn't enabled as wizard is currently the ONLY supported path to use the shaper.
Diffstat (limited to 'usr/local')
-rwxr-xr-x | usr/local/www/firewall_shaper.php | 7 | ||||
-rwxr-xr-x | usr/local/www/firewall_shaper_edit.php | 7 | ||||
-rwxr-xr-x | usr/local/www/firewall_shaper_queues.php | 8 | ||||
-rwxr-xr-x | usr/local/www/firewall_shaper_queues_edit.php | 7 |
4 files changed, 28 insertions, 1 deletions
diff --git a/usr/local/www/firewall_shaper.php b/usr/local/www/firewall_shaper.php index 40133fd..b1e397a 100755 --- a/usr/local/www/firewall_shaper.php +++ b/usr/local/www/firewall_shaper.php @@ -43,7 +43,12 @@ if (!is_array($config['shaper']['queue'])) { $a_shaper = &$config['shaper']['rule']; $a_queue = &$config['shaper']['queue']; -$pconfig['enable'] = isset($config['shaper']['enable']); +/* redirect to wizard if shaper isn't already configured */ +if(isset($config['shaper']['enable'])) { + $pconfig['enable'] = TRUE; +} else { + Header("Location: wizard.php?xml=traffic_shaper_wizard.xml"); +} function wipe_magic () { global $config; diff --git a/usr/local/www/firewall_shaper_edit.php b/usr/local/www/firewall_shaper_edit.php index f547369..52cfca6 100755 --- a/usr/local/www/firewall_shaper_edit.php +++ b/usr/local/www/firewall_shaper_edit.php @@ -37,6 +37,13 @@ if (!is_array($config['shaper']['rule'])) { } $a_shaper = &$config['shaper']['rule']; +/* redirect to wizard if shaper isn't already configured */ +if(isset($config['shaper']['enable'])) { + $pconfig['enable'] = TRUE; +} else { + Header("Location: wizard.php?xml=traffic_shaper_wizard.xml"); +} + $specialsrcdst = explode(" ", "any lan pptp"); $id = $_GET['id']; diff --git a/usr/local/www/firewall_shaper_queues.php b/usr/local/www/firewall_shaper_queues.php index a07538c..cc2c86f 100755 --- a/usr/local/www/firewall_shaper_queues.php +++ b/usr/local/www/firewall_shaper_queues.php @@ -44,6 +44,14 @@ if (!is_array($config['shaper']['queue'])) { } $a_queues = &$config['shaper']['queue']; +/* redirect to wizard if shaper isn't already configured */ +if(isset($config['shaper']['enable'])) { + $pconfig['enable'] = TRUE; +} else { + Header("Location: wizard.php?xml=traffic_shaper_wizard.xml"); +} + + $iflist = array("lan" => "LAN", "wan" => "WAN"); for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) { diff --git a/usr/local/www/firewall_shaper_queues_edit.php b/usr/local/www/firewall_shaper_queues_edit.php index 9ab2fe5..dbfd452 100755 --- a/usr/local/www/firewall_shaper_queues_edit.php +++ b/usr/local/www/firewall_shaper_queues_edit.php @@ -36,6 +36,13 @@ require("guiconfig.inc"); $a_queues = &$config['shaper']['queue']; +/* redirect to wizard if shaper isn't already configured */ +if(isset($config['shaper']['enable'])) { + $pconfig['enable'] = TRUE; +} else { + Header("Location: wizard.php?xml=traffic_shaper_wizard.xml"); +} + $id = $_GET['id']; if (isset($_POST['id'])) $id = $_POST['id']; |