Do not attempt to populate from array if user picks <> "Generic"

1 files changed, 43 insertions, 41 deletions

diff --git a/usr/local/www/wizards/traffic_shaper_wizard.xml b/usr/local/www/wizards/traffic_shaper_wizard.xml
index 42c6d57..4d4afd6 100644
--- a/usr/local/www/wizards/traffic_shaper_wizard.xml
+++ b/usr/local/www/wizards/traffic_shaper_wizard.xml
@@ -381,50 +381,52 @@
 			    $rule['destination']['network'] = 'lan';
 			    $rule['iptos'] = "lowdelay";
 			    $config['shaper']['rule'][] = $rule;
-			}
-			
-			$voiplist[] = array();
-	
-			/* setup vonage rule */
-			if( $_POST['provider'] == "Vonage") 
-			    $voiplist[] = array('Vonage','udp','5060-5069','5060-5069','both');
+			} else {
 			
-			/* asterisk server / same as vonage somewhat */
-			if( $_POST['provider'] == "Asterisk") 
-			    $voiplist[] = array('Vonage','udp','5060-5069','5060-5069','both');
-	
-			/* Set up/down games as higher weight */
-			/* loop through voiplist[] */
-			foreach ($voiplist as $voip) {
-			    foreach (array('source','destination') as $srcdest) {
-				    $rule = array();
-				    if ($srcdest == 'source') {
-					    $destsrc = 'destination';
-					    $rule['outqueue'] = 'qVOIPUp';
-					    $rule['inqueue'] = 'qVOIPDown';
-					    $rule['interface'] = 'lan';
-					    $rule['source']['network'] = 'lan';
-					    $rule['destination']['any'] = TRUE;
-					    $rule['descr'] = "m_voip {$voip[0]} outbound";
-				    } else {
-					    $destsrc = 'source';
-					    $rule['outqueue'] = 'qVOIPDown';
-					    $rule['inqueue'] = 'qVOIPUp';
-					    $rule['interface'] = 'wan';
-					    $rule['source']['any'] = TRUE;
-					    $rule['destination']['network'] = 'lan';
-					    $rule['descr'] = "m_voip {$voip[0]} inbound";
-				    }
+			    $voiplist[] = array();
 	    
-				    $rule['destination']['port'] = $voip[2]."-".$voip[3];
-				    if($voip[1] != '')
-					    $rule['protocol'] = $voip[1];
+			    /* setup vonage rule */
+			    if( $_POST['provider'] == "Vonage") 
+				$voiplist[] = array('Vonage','udp','5060-5069','5060-5069','both');
+			    
+			    /* asterisk server / same as vonage somewhat */
+			    if( $_POST['provider'] == "Asterisk") 
+				$voiplist[] = array('Vonage','udp','5060-5069','5060-5069','both');
 	    
-				    $config['shaper']['rule'][] = $rule;
-	
-			    }
-			}                
-
+			    /* Set up/down games as higher weight */
+			    /* loop through voiplist[] */
+			    foreach ($voiplist as $voip) {
+				foreach (array('source','destination') as $srcdest) {
+					$rule = array();
+					if ($srcdest == 'source') {
+						$destsrc = 'destination';
+						$rule['outqueue'] = 'qVOIPUp';
+						$rule['inqueue'] = 'qVOIPDown';
+						$rule['interface'] = 'lan';
+						$rule['source']['network'] = 'lan';
+						$rule['destination']['any'] = TRUE;
+						$rule['descr'] = "m_voip {$voip[0]} outbound";
+					} else {
+						$destsrc = 'source';
+						$rule['outqueue'] = 'qVOIPDown';
+						$rule['inqueue'] = 'qVOIPUp';
+						$rule['interface'] = 'wan';
+						$rule['source']['any'] = TRUE;
+						$rule['destination']['network'] = 'lan';
+						$rule['descr'] = "m_voip {$voip[0]} inbound";
+					}
+					
+					if($voip[2]) {
+					    $rule['destination']['port'] = $voip[2]."-".$voip[3];
+					    if($voip[1] != '')
+						    $rule['protocol'] = $voip[1];
+					}
+		
+					$config['shaper']['rule'][] = $rule;
+	    
+				}
+			    }                
+			}
 		}
                 
 	</stepsubmitphpaction>