diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-11-25 19:51:42 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-11-25 19:51:42 +0000 |
| commit | d2580d1da525ce5c32a87706506ef1406b96f39d (patch) | |
| tree | 4132647d9de9af5c2362e684fe71941572856248 /usr/local | |
| parent | ef773bd634a3dfa1bdce90e99bda6de249588ac2 (diff) | |
| download | pfsense-d2580d1da525ce5c32a87706506ef1406b96f39d.zip pfsense-d2580d1da525ce5c32a87706506ef1406b96f39d.tar.gz | |
MFC 7986
Make all VOIP providers increment $itemsshaped Remove unneeded code
Diffstat (limited to 'usr/local')
| -rw-r--r-- | usr/local/www/wizards/traffic_shaper_wizard.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/local/www/wizards/traffic_shaper_wizard.xml b/usr/local/www/wizards/traffic_shaper_wizard.xml index 80c33ed..8a04002 100644 --- a/usr/local/www/wizards/traffic_shaper_wizard.xml +++ b/usr/local/www/wizards/traffic_shaper_wizard.xml @@ -420,6 +420,8 @@ $queue['attachtoqueue'] = "{$downq}Root"; $config['shaper']['queue'][] = $queue; + $config['shaper']['itemsshaped']++; + if( $_POST['provider'] == "Generic") { /* create VOIP rules */ $rule = array(); @@ -473,7 +475,6 @@ foreach ($voiplist as $voip) { foreach (array('source', 'destination') as $srcdest) { $rule = array(); - $config['shaper']['itemsshaped']++; if ($srcdest == 'source') { $destsrc = 'destination'; $rule['outqueue'] = 'qVOIPUp'; @@ -1918,12 +1919,11 @@ */ unset($config['shaper']['queue']); unset($config['shaper']['rule']); + unset($config['shaper']); $config['shaper']['enable'] = FALSE; - $config['shaper']['itemsshaped'] = "0"; $message = "No items have been selected to shape. Exiting traffic shaper wizard."; write_config("No shaper items picked, unsetting shaper configuration"); header("Location: /wizard.php?xml=traffic_shaper_wizard.xml&stepid=7&message={$message}"); - filter_configure(); exit; } </stepbeforeformdisplay> |
