diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2005-12-01 02:02:06 +0000 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2005-12-01 02:02:06 +0000 |
commit | 75d5cf4f69e23aee7059a7ec8e99fb22ddbfd115 (patch) | |
tree | 7d84dbe98f74707214ae3c8914c2b9ba6916ab6e /usr/local | |
parent | dd4c094acb885d30524e430dfaa14ddf7bc2c42d (diff) | |
download | pfsense-75d5cf4f69e23aee7059a7ec8e99fb22ddbfd115.zip pfsense-75d5cf4f69e23aee7059a7ec8e99fb22ddbfd115.tar.gz |
Allow editing for queues and rules when items are already defined and the shaper is disabled
Diffstat (limited to 'usr/local')
-rwxr-xr-x | usr/local/www/firewall_shaper_edit.php | 5 | ||||
-rwxr-xr-x | usr/local/www/firewall_shaper_queues.php | 6 | ||||
-rwxr-xr-x | usr/local/www/firewall_shaper_queues_edit.php | 5 |
3 files changed, 9 insertions, 7 deletions
diff --git a/usr/local/www/firewall_shaper_edit.php b/usr/local/www/firewall_shaper_edit.php index 52cfca6..28aa9b1 100755 --- a/usr/local/www/firewall_shaper_edit.php +++ b/usr/local/www/firewall_shaper_edit.php @@ -39,9 +39,10 @@ $a_shaper = &$config['shaper']['rule']; /* redirect to wizard if shaper isn't already configured */ if(isset($config['shaper']['enable'])) { - $pconfig['enable'] = TRUE; + $pconfig['enable'] = TRUE; } else { - Header("Location: wizard.php?xml=traffic_shaper_wizard.xml"); + if(!is_array($config['shaper']['queue'])) + Header("Location: wizard.php?xml=traffic_shaper_wizard.xml"); } $specialsrcdst = explode(" ", "any lan pptp"); diff --git a/usr/local/www/firewall_shaper_queues.php b/usr/local/www/firewall_shaper_queues.php index cc2c86f..7fc23ab 100755 --- a/usr/local/www/firewall_shaper_queues.php +++ b/usr/local/www/firewall_shaper_queues.php @@ -46,12 +46,12 @@ $a_queues = &$config['shaper']['queue']; /* redirect to wizard if shaper isn't already configured */ if(isset($config['shaper']['enable'])) { - $pconfig['enable'] = TRUE; + $pconfig['enable'] = TRUE; } else { - Header("Location: wizard.php?xml=traffic_shaper_wizard.xml"); + if(!is_array($config['shaper']['queue'])) + 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 dbfd452..5da1947 100755 --- a/usr/local/www/firewall_shaper_queues_edit.php +++ b/usr/local/www/firewall_shaper_queues_edit.php @@ -38,9 +38,10 @@ $a_queues = &$config['shaper']['queue']; /* redirect to wizard if shaper isn't already configured */ if(isset($config['shaper']['enable'])) { - $pconfig['enable'] = TRUE; + $pconfig['enable'] = TRUE; } else { - Header("Location: wizard.php?xml=traffic_shaper_wizard.xml"); + if(!is_array($config['shaper']['queue'])) + Header("Location: wizard.php?xml=traffic_shaper_wizard.xml"); } $id = $_GET['id']; |