Remove call-time pass by reference from traffic shaper files, it should fix #2565

8 files changed, 72 insertions, 72 deletions

diff --git a/usr/local/www/firewall_shaper.php b/usr/local/www/firewall_shaper.php
index fe181e9..53f4d64 100755
--- a/usr/local/www/firewall_shaper.php
+++ b/usr/local/www/firewall_shaper.php
@@ -225,11 +225,11 @@ if ($_GET) {
 			} 
 		$altq->SetAvailableBandwidth($altq->GetBandwidth() * $factor);
 		$altq->ReadConfig($_POST);
-		$altq->validate_input($_POST, &$input_errors);
+		$altq->validate_input($_POST, $input_errors);
 		if (!$input_errors) {
 			unset($tmppath);
 			$tmppath[] = $altq->GetInterface();
-			$altq->SetLink(&$tmppath);	
+			$altq->SetLink($tmppath);	
 			$altq->wconfig();
 			if (write_config())
 				mark_subsystem_dirty('shaper');
@@ -244,7 +244,7 @@ if ($_GET) {
 		if ($qtmp) {
 			$tmppath =& $qtmp->GetLink();
 			array_push($tmppath, $qname);
-			$tmp =& $qtmp->add_queue($interface, $_POST, $tmppath, &$input_errors);
+			$tmp =& $qtmp->add_queue($interface, $_POST, $tmppath, $input_errors);
 			if (!$input_errors) {
 				array_pop($tmppath);
 				$tmp->wconfig();
@@ -298,7 +298,7 @@ if ($_GET) {
 			}
 
 	} else if ($queue) {
-                $queue->validate_input($_POST, &$input_errors);
+                $queue->validate_input($_POST, $input_errors);
                 if (!$input_errors) {
                             $queue->update_altq_queue_data($_POST);
                             $queue->wconfig();
diff --git a/usr/local/www/firewall_shaper_layer7.php b/usr/local/www/firewall_shaper_layer7.php
index fe37735..b1cfc7a 100755
--- a/usr/local/www/firewall_shaper_layer7.php
+++ b/usr/local/www/firewall_shaper_layer7.php
@@ -137,7 +137,7 @@ else if ($_POST) {
 			$_POST['l7rules'][$i]['structure'] = $_POST['structure'][$i];
 			$_POST['l7rules'][$i]['behaviour'] = $_POST['behaviour'][$i];
 		}
-		$l7r->validate_input($_POST,&$input_errors);
+		$l7r->validate_input($_POST,$input_errors);
 		$l7r->ReadConfig($_POST['container'], $_POST);
 		//Before writing the results, we need to test for repeated protocols
 		$non_dupes = array();
diff --git a/usr/local/www/firewall_shaper_queues.php b/usr/local/www/firewall_shaper_queues.php
index c21d7e3..f8ee5b6 100755
--- a/usr/local/www/firewall_shaper_queues.php
+++ b/usr/local/www/firewall_shaper_queues.php
@@ -96,7 +96,7 @@ if ($_GET) {
                                 $qtmp =& $altq->find_queue("", $qname);
                                 if ($qtmp) {
                                         $copycfg = array();
-                                        $qtmp->copy_queue($interface, &$copycfg);
+                                        $qtmp->copy_queue($interface, $copycfg);
                                         $aq =& $altq_list_queues[$interface];
 					if ($qname == $qtmp->GetInterface()) {
                                                 $config['shaper']['queue'][] = $copycfg;
diff --git a/usr/local/www/firewall_shaper_vinterface.php b/usr/local/www/firewall_shaper_vinterface.php
index 7757505..d2d9037 100644
--- a/usr/local/www/firewall_shaper_vinterface.php
+++ b/usr/local/www/firewall_shaper_vinterface.php
@@ -207,13 +207,13 @@ if ($_GET) {
 			$dnpipe =& new dnpipe_class();
 			
 			$dnpipe->ReadConfig($_POST);
-			$dnpipe->validate_input($_POST, &$input_errors);
+			$dnpipe->validate_input($_POST, $input_errors);
 			if (!$input_errors) {
 				$number = dnpipe_find_nextnumber();
 				$dnpipe->SetNumber($number);
 				unset($tmppath);
 				$tmppath[] = $dnpipe->GetQname();
-				$dnpipe->SetLink(&$tmppath);	
+				$dnpipe->SetLink($tmppath);	
 				$dnpipe->wconfig();
 				if (write_config())
 					mark_subsystem_dirty('shaper');
@@ -231,7 +231,7 @@ if ($_GET) {
 		else if ($dnpipe) {
 			$tmppath =& $dnpipe->GetLink();
 			array_push($tmppath, $qname);
-			$tmp =& $dnpipe->add_queue($pipe, $_POST, $tmppath, &$input_errors);
+			$tmp =& $dnpipe->add_queue($pipe, $_POST, $tmppath, $input_errors);
 			if (!$input_errors) {
 				array_pop($tmppath);
 				$tmp->wconfig();
@@ -272,7 +272,7 @@ if ($_GET) {
 			}
 
 	} else if ($queue) {
-                $queue->validate_input($_POST, &$input_errors);
+                $queue->validate_input($_POST, $input_errors);
                 if (!$input_errors) {
 			$queue->update_dn_data($_POST);
 			$queue->wconfig();
diff --git a/usr/local/www/wizards/traffic_shaper_wizard.inc b/usr/local/www/wizards/traffic_shaper_wizard.inc
index 3b411c0..3520508 100644
--- a/usr/local/www/wizards/traffic_shaper_wizard.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard.inc
@@ -721,7 +721,7 @@ function apply_all_choosen_items() {
 				$tmpcf['bandwidthtype'] = "%";
 			}
 			array_push($tmppath, "qACK");
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qACK <br />";
 			//var_dump($input_errors);
@@ -752,7 +752,7 @@ function apply_all_choosen_items() {
 				$tmpcf['bandwidthtype'] = "%";
 			}
 			array_push($tmppath, $tmpcf['name']);
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qDefault <br />";
 			//var_dump($input_errors);
@@ -801,7 +801,7 @@ function apply_all_choosen_items() {
 					}
 				}
 				array_push($tmppath, "qP2P");
-				$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+				$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 				array_pop($tmppath);
 				//echo "qP2P <br />";
 				//var_dump($input_errors);
@@ -841,7 +841,7 @@ function apply_all_choosen_items() {
 					$tmpcf['bandwidthtype'] = "Kb";
 				}
 				array_push($tmppath, "qVoIP");
-				$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+				$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 				array_pop($tmppath);
 				//echo "qVoIP <br />";
 				//var_dump($input_errors);
@@ -872,7 +872,7 @@ function apply_all_choosen_items() {
 					$tmpcf['bandwidthtype'] = "%";
 				}
 				array_push($tmppath, "qGames");
-				$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+				$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 				array_pop($tmppath);
 				//echo "qGames <br />";
 				//var_dump($input_errors);
@@ -903,7 +903,7 @@ function apply_all_choosen_items() {
 					$tmpcf['bandwidthtype'] = "%";
 				}
 				array_push($tmppath, "qOthersHigh");
-				$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+				$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 				array_pop($tmppath);
 				//echo "qHigh <br />";
 				//var_dump($input_errors);
@@ -942,7 +942,7 @@ function apply_all_choosen_items() {
 					$tmpcf['linkshare'] = "on";
 				}
 				array_push($tmppath, "qOthersLow");
-				$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+				$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 				array_pop($tmppath);
 				//echo "qLow <br />";
 				//var_dump($input_errors);
@@ -1068,7 +1068,7 @@ function apply_all_choosen_items() {
 				$tmpcf['bandwidthtype'] = "%";
 			}
 			array_push($tmppath, $tmpcf['name']);
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qDefault <br />";
 			//var_dump($input_errors);
@@ -1098,7 +1098,7 @@ function apply_all_choosen_items() {
 				$tmpcf['bandwidthtype'] = "Kb";
 			}
 			array_push($tmppath, "qInternet");
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			//array_pop($tmppath);
 			//echo "qInternet <br />";
 			//var_dump($input_errors);
@@ -1129,7 +1129,7 @@ function apply_all_choosen_items() {
 			$tmpcf['bandwidthtype'] = "%";
 		}
 		array_push($tmppath, "qACK");
-		$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+		$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 		array_pop($tmppath);
 		//echo "qACK <br />";
 		//var_dump($input_errors);
@@ -1177,7 +1177,7 @@ function apply_all_choosen_items() {
 				}
 			}
 			array_push($tmppath, "qP2P");
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qP2P <br />";
 			//var_dump($input_errors);
@@ -1217,7 +1217,7 @@ function apply_all_choosen_items() {
 				$tmpcf['bandwidthtype'] = "Kb";
 			}
 			array_push($tmppath, "qVoIP");
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qVoIP <br />";
 			//var_dump($input_errors);
@@ -1248,7 +1248,7 @@ function apply_all_choosen_items() {
 				$tmpcf['bandwidthtype'] = "%";
 			}
 			array_push($tmppath, "qGames");
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qGames <br />";
 			//var_dump($input_errors);
@@ -1279,7 +1279,7 @@ function apply_all_choosen_items() {
 				$tmpcf['bandwidthtype'] = "%";
 			}
 			array_push($tmppath, "qOthersHigh");
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qHigh <br />";
 			//var_dump($input_errors);
@@ -1317,7 +1317,7 @@ function apply_all_choosen_items() {
 				$tmpcf['linkshare'] = "on";
 			}
 			array_push($tmppath, "qOthersLow");
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qLow <br />";
 			//var_dump($input_errors);
diff --git a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
index b6bb470..875d0bb 100755
--- a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
@@ -750,7 +750,7 @@ function apply_all_choosen_items() {
                                 $tmpcf['bandwidthtype'] = $config['ezshaper']['step2']["conn{$i}uploadspeed"];
                         }
                         array_push($tmppath, "qInternet");
-                        $qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+                        $qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
                         //array_pop($tmppath);
                         //echo "qInternet <br />";
                         //var_dump($input_errors);
@@ -782,7 +782,7 @@ function apply_all_choosen_items() {
 				$tmpcf['bandwidthtype'] = "%";
 			}
 			array_push($tmppath, "qACK");
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qACK <br />";
 			//var_dump($input_errors);
@@ -813,7 +813,7 @@ function apply_all_choosen_items() {
 				$tmpcf['bandwidthtype'] = "%";
 			}
 			array_push($tmppath, $tmpcf['name']);
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qDefault <br />";
 			//var_dump($input_errors);
@@ -862,7 +862,7 @@ function apply_all_choosen_items() {
 					}
 				}
 				array_push($tmppath, "qP2P");
-				$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+				$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 				array_pop($tmppath);
 				//echo "qP2P <br />";
 				//var_dump($input_errors);
@@ -902,7 +902,7 @@ function apply_all_choosen_items() {
 					$tmpcf['bandwidthtype'] = "Kb";
 				}
 				array_push($tmppath, "qVoIP");
-				$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+				$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 				array_pop($tmppath);
 				//echo "qVoIP <br />";
 				//var_dump($input_errors);
@@ -933,7 +933,7 @@ function apply_all_choosen_items() {
 					$tmpcf['bandwidthtype'] = "%";
 				}
 				array_push($tmppath, "qGames");
-				$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+				$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 				array_pop($tmppath);
 				//echo "qGames <br />";
 				//var_dump($input_errors);
@@ -964,7 +964,7 @@ function apply_all_choosen_items() {
 					$tmpcf['bandwidthtype'] = "%";
 				}
 				array_push($tmppath, "qOthersHigh");
-				$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+				$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 				array_pop($tmppath);
 				//echo "qHigh <br />";
 				//var_dump($input_errors);
@@ -1005,7 +1005,7 @@ function apply_all_choosen_items() {
 					$tmpcf['linkshare'] = "on";
 				}
 				array_push($tmppath, "qOthersLow");
-				$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+				$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 				array_pop($tmppath);
 				//echo "qLow <br />";
 				//var_dump($input_errors);
@@ -1133,7 +1133,7 @@ function apply_all_choosen_items() {
 				$tmpcf['bandwidthtype'] = "%";
 			}
 			array_push($tmppath, $tmpcf['name']);
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qDefault <br />";
 			//var_dump($input_errors);
@@ -1163,7 +1163,7 @@ function apply_all_choosen_items() {
                                 $tmpcf['bandwidthtype'] = $config['ezshaper']['step2']["conn{$i}downloadspeed"];
                         }
                         array_push($tmppath, "qInternet");
-                        $qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+                        $qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
                         //array_pop($tmppath);
                         //echo "qInternet <br />";
                         //var_dump($input_errors);
@@ -1194,7 +1194,7 @@ function apply_all_choosen_items() {
 			$tmpcf['bandwidthtype'] = "%";
 		}
 		array_push($tmppath, "qACK");
-		$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+		$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 		array_pop($tmppath);
 		//echo "qACK $remainbw <br />";
 		//var_dump($input_errors);
@@ -1243,7 +1243,7 @@ function apply_all_choosen_items() {
 				}
 			}
 			array_push($tmppath, "qP2P");
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qP2P <br />";
 			//var_dump($input_errors);
@@ -1283,7 +1283,7 @@ function apply_all_choosen_items() {
 				$tmpcf['bandwidthtype'] = "Kb";
 			}
 			array_push($tmppath, "qVoIP");
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qVoIP <br />";
 			//var_dump($input_errors);
@@ -1314,7 +1314,7 @@ function apply_all_choosen_items() {
 				$tmpcf['bandwidthtype'] = "%";
 			}
 			array_push($tmppath, "qGames");
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qGames <br />";
 			//var_dump($input_errors);
@@ -1345,7 +1345,7 @@ function apply_all_choosen_items() {
 				$tmpcf['bandwidthtype'] = "%";
 			}
 			array_push($tmppath, "qOthersHigh");
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qHigh <br />";
 			//var_dump($input_errors);
@@ -1385,7 +1385,7 @@ function apply_all_choosen_items() {
 				$tmpcf['linkshare'] = "on";
 			}
 			array_push($tmppath, "qOthersLow");
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qLow <br />";
 			//var_dump($input_errors);
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 f87ba4c..977c2dd 100755
--- a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
@@ -789,7 +789,7 @@ function apply_all_choosen_items() {
                                 $tmpcf['bandwidthtype'] = $config['ezshaper']['step2']["conn{$i}uploadspeed"];
                         }
                         array_push($tmppath, "qInternet");
-                        $qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+                        $qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
                         //array_pop($tmppath);
                         //echo "qInternet <br />";
                         //var_dump($input_errors);
@@ -821,7 +821,7 @@ function apply_all_choosen_items() {
 				$tmpcf['bandwidthtype'] = "%";
 			}
 			array_push($tmppath, "qACK");
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qACK <br />";
 			//var_dump($input_errors);
@@ -852,7 +852,7 @@ function apply_all_choosen_items() {
 				$tmpcf['bandwidthtype'] = "%";
 			}
 			array_push($tmppath, $tmpcf['name']);
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qDefault <br />";
 			//var_dump($input_errors);
@@ -901,7 +901,7 @@ function apply_all_choosen_items() {
 					}
 				}
 				array_push($tmppath, "qP2P");
-				$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+				$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 				array_pop($tmppath);
 				//echo "qP2P <br />";
 				//var_dump($input_errors);
@@ -941,7 +941,7 @@ function apply_all_choosen_items() {
 					$tmpcf['bandwidthtype'] = "Kb";
 				}
 				array_push($tmppath, "qVoIP");
-				$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+				$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 				array_pop($tmppath);
 				//echo "qVoIP <br />";
 				//var_dump($input_errors);
@@ -972,7 +972,7 @@ function apply_all_choosen_items() {
 					$tmpcf['bandwidthtype'] = "%";
 				}
 				array_push($tmppath, "qGames");
-				$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+				$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 				array_pop($tmppath);
 				//echo "qGames <br />";
 				//var_dump($input_errors);
@@ -1003,7 +1003,7 @@ function apply_all_choosen_items() {
 					$tmpcf['bandwidthtype'] = "%";
 				}
 				array_push($tmppath, "qOthersHigh");
-				$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+				$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 				array_pop($tmppath);
 				//echo "qHigh <br />";
 				//var_dump($input_errors);
@@ -1044,7 +1044,7 @@ function apply_all_choosen_items() {
 					$tmpcf['linkshare'] = "on";
 				}
 				array_push($tmppath, "qOthersLow");
-				$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+				$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 				array_pop($tmppath);
 				//echo "qLow <br />";
 				//var_dump($input_errors);
@@ -1183,7 +1183,7 @@ function apply_all_choosen_items() {
 				$tmpcf['bandwidthtype'] = "%";
 			}
 			array_push($tmppath, $tmpcf['name']);
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qDefault <br />";
 			//var_dump($input_errors);
@@ -1213,7 +1213,7 @@ function apply_all_choosen_items() {
                                 $tmpcf['bandwidthtype'] = "Kb";
                         }
                         array_push($tmppath, "qInternet");
-                        $qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+                        $qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
                         //array_pop($tmppath);
                         //echo "qInternet <br />";
                         //var_dump($input_errors);
@@ -1245,7 +1245,7 @@ function apply_all_choosen_items() {
 				$tmpcf['bandwidthtype'] = "%";
 			}
 			array_push($tmppath, "qACK");
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qACK <br />";
 			//var_dump($input_errors);
@@ -1294,7 +1294,7 @@ function apply_all_choosen_items() {
 					}
 				}
 				array_push($tmppath, "qP2P");
-				$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+				$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 				array_pop($tmppath);
 				//echo "qP2P <br />";
 				//var_dump($input_errors);
@@ -1334,7 +1334,7 @@ function apply_all_choosen_items() {
 					$tmpcf['bandwidthtype'] = "Kb";
 				}
 				array_push($tmppath, "qVoIP");
-				$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+				$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 				array_pop($tmppath);
 				//echo "qVoIP <br />";
 				//var_dump($input_errors);
@@ -1365,7 +1365,7 @@ function apply_all_choosen_items() {
 					$tmpcf['bandwidthtype'] = "%";
 				}
 				array_push($tmppath, "qGames");
-				$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+				$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 				array_pop($tmppath);
 				//echo "qGames <br />";
 				//var_dump($input_errors);
@@ -1396,7 +1396,7 @@ function apply_all_choosen_items() {
 					$tmpcf['bandwidthtype'] = "%";
 				}
 				array_push($tmppath, "qOthersHigh");
-				$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+				$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 				array_pop($tmppath);
 				//echo "qHigh <br />";
 				//var_dump($input_errors);
@@ -1437,7 +1437,7 @@ function apply_all_choosen_items() {
 					$tmpcf['linkshare'] = "on";
 				}
 				array_push($tmppath, "qOthersLow");
-				$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+				$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 				array_pop($tmppath);
 				//echo "qLow <br />";
 				//var_dump($input_errors);
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 a8e7ec9..3d379b3 100644
--- a/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc
@@ -569,7 +569,7 @@ function apply_all_choosen_items() {
 				$tmpcf['bandwidthtype'] = "%";
 			}
 			array_push($tmppath, $tmpcf['name']);
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qDefault <br />";
 			//var_dump($input_errors);
@@ -601,7 +601,7 @@ function apply_all_choosen_items() {
 				$tmpcf['bandwidthtype'] = $config['ezshaper']['step2']["conndownloadspeed"];
 			}
 			array_push($tmppath, "qInternet");
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			//array_pop($tmppath);
 			//echo "qInternet <br />";
 			//var_dump($input_errors);
@@ -634,7 +634,7 @@ function apply_all_choosen_items() {
 			$tmpcf['bandwidthtype'] = "%";
 		}
 		array_push($tmppath, "qACK");
-		$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+		$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 		array_pop($tmppath);
 		//echo "qACK <br />";
 		//var_dump($input_errors);
@@ -683,7 +683,7 @@ function apply_all_choosen_items() {
 				}
 			}
 			array_push($tmppath, "qP2P");
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qP2P <br />";
 			//var_dump($input_errors);
@@ -723,7 +723,7 @@ function apply_all_choosen_items() {
 				$tmpcf['bandwidthtype'] = "Kb";
 			}
 			array_push($tmppath, "qVoIP");
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qVoIP <br />";
 			//var_dump($input_errors);
@@ -754,7 +754,7 @@ function apply_all_choosen_items() {
 				$tmpcf['bandwidthtype'] = "%";
 			}
 			array_push($tmppath, "qGames");
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qGames <br />";
 			//var_dump($input_errors);
@@ -785,7 +785,7 @@ function apply_all_choosen_items() {
 				$tmpcf['bandwidthtype'] = "%";
 			}
 			array_push($tmppath, "qOthersHigh");
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qHigh <br />";
 			//var_dump($input_errors);
@@ -824,7 +824,7 @@ function apply_all_choosen_items() {
 				$tmpcf['linkshare'] = "on";
 			}
 			array_push($tmppath, "qOthersLow");
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qLow <br />";
 			//var_dump($input_errors);
@@ -959,7 +959,7 @@ function apply_all_choosen_items() {
 			$tmpcf['bandwidthtype'] = "%";
 		}
 		array_push($tmppath, "qACK");
-		$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+		$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 		array_pop($tmppath);
 		//echo "$lkbw $remainbw qACK <br />";
 		//var_dump($input_errors);
@@ -991,7 +991,7 @@ function apply_all_choosen_items() {
 			$tmpcf['bandwidthtype'] = "%";
 		}
 		array_push($tmppath, $tmpcf['name']);
-		$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+		$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 		array_pop($tmppath);
 		//echo "qDefault <br />";
 		//var_dump($input_errors);
@@ -1040,7 +1040,7 @@ function apply_all_choosen_items() {
 				}
 			}
 			array_push($tmppath, "qP2P");
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qP2P <br />";
 			//var_dump($input_errors);
@@ -1080,7 +1080,7 @@ function apply_all_choosen_items() {
 				$tmpcf['bandwidthtype'] = "Kb";
 			}
 			array_push($tmppath, "qVoIP");
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qVoIP <br />";
 			//var_dump($input_errors);
@@ -1111,7 +1111,7 @@ function apply_all_choosen_items() {
 				$tmpcf['bandwidthtype'] = "%";
 			}
 			array_push($tmppath, "qGames");
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qGames <br />";
 			//var_dump($input_errors);
@@ -1142,7 +1142,7 @@ function apply_all_choosen_items() {
 				$tmpcf['bandwidthtype'] = "%";
 			}
 			array_push($tmppath, "qOthersHigh");
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qHigh <br />";
 			//var_dump($input_errors);
@@ -1181,7 +1181,7 @@ function apply_all_choosen_items() {
 				$tmpcf['linkshare'] = "on";
 			}
 			array_push($tmppath, "qOthersLow");
-			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
+			$qtmp =& $altq->add_queue($q, $tmpcf, $tmppath, $input_errors);
 			array_pop($tmppath);
 			//echo "qLow <br />";
 			//var_dump($input_errors);