Resolves #713. Take in conisderation the suggestion of not setting m1 parameter to 0b.

1 files changed, 1 insertions, 33 deletions

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 2c7a284..759ae61 100644
--- a/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc
@@ -545,14 +545,12 @@ function apply_all_choosen_items() {
 				$tmpcf['bandwidth'] = floatval($config['ezshaper']['step2']["conndownload"]);
 				$tmpcf['bandwidthtype'] = $config['ezshaper']['step2']["conndownloadspeed"];
 			} else if ($sched == "HFSC") {
-				$tmpcf['linkshare1'] = $tmpcf['linkshare3'] = 
+				$tmpcf['linkshare3'] = 
 					floatval($config['ezshaper']['step2']["conndownload"]) . $config['ezshaper']['step2']["conndownloadspeed"];
 				$tmpcf['upperlimit'] = "on";
 				$tmpcf['upperlimit3'] = 
 					floatval($config['ezshaper']['step2']["conndownload"]) . $config['ezshaper']['step2']["conndownloadspeed"];
 
-				$tmpcf['linkshare2'] = 100;
-				//$tmpcf['linkshare1'] = "0b";
 				$tmpcf['linkshare'] = "on";
 				$tmpcf['bandwidth'] =  floatval($config['ezshaper']['step2']["conndownload"]);
 				$tmpcf['bandwidthtype'] = $config['ezshaper']['step2']["conndownloadspeed"];
@@ -587,8 +585,6 @@ function apply_all_choosen_items() {
 		else if ($sched == "HFSC") {
 			$lkbw = 0.20 * $remainbw;
 			$tmpcf['linkshare3'] = "{$lkbw}%";
-		 	$tmpcf['linkshare2'] = 100;
-			$tmpcf['linkshare1'] = "0b";	
 			$tmpcf['linkshare'] = "on";
 			$tmpcf['bandwidth'] = $lkbw; 
 			$tmpcf['bandwidthtype'] = "%";
@@ -650,8 +646,6 @@ function apply_all_choosen_items() {
 						$tmpcf['bandwidthtype'] = $p2pcatchbwunit;
 					} else if ($sched == "HFSC") {
 						$tmpcf['linkshare'] = "on";
-						$tmpcf['linkshare1'] = "{$p2pcatchbw}{$p2pcatchbwunit}";
-						$tmpcf['linkshare2'] = 300;
 						$tmpcf['linkshare3'] = "{$p2pcatchbw}{$p2pcatchbwunit}";
 						$tmpcf['upperlimit'] = "on";
 						$tmpcf['upperlimit3'] = "{$p2pcatchbw}{$p2pcatchbwunit}";
@@ -668,8 +662,6 @@ function apply_all_choosen_items() {
 				} else if ($sched == "HFSC") {
 					$tmpbw = $remainbw * 0.05; /* 5% bandwidth */
 					$tmpcf['linkshare'] = "on";
-                                               $tmpcf['linkshare1'] = "{$tmpbw}%";
-                                               $tmpcf['linkshare2'] = 300;
                                                $tmpcf['linkshare3'] = "{$tmpbw}%";
                                                $tmpcf['upperlimit'] = "on";
                                                $tmpcf['upperlimit3'] = "{$tmpbw}%";
@@ -714,9 +706,7 @@ function apply_all_choosen_items() {
 					$tmpcf['realtime3'] = "{$voipbw}%";
 				}
 				$tmpcf['realtime'] = "on";
-				$tmpcf['realtime2'] = "10";
 				$tmpcf['bandwidth'] = 32;
-				$tmpcf['realtime1'] = "0b";
 				$tmpcf['bandwidthtype'] = "Kb";
 			}
 			array_push($tmppath, "qVoIP");
@@ -746,8 +736,6 @@ function apply_all_choosen_items() {
 			} else if ($sched == "HFSC") {
                                        $gamesbw = $remainbw * 0.2; /* 20% bandwidth */
 				$tmpcf['linkshare'] = "on";
-                                      	$tmpcf['linkshare1'] = "0b";
-                                       $tmpcf['linkshare2'] = "50";
                                        $tmpcf['linkshare3'] = "{$gamesbw}%";
 				$tmpcf['bandwidth'] = "{$gamesbw}";
 				$tmpcf['bandwidthtype'] = "%";
@@ -779,8 +767,6 @@ function apply_all_choosen_items() {
 			} else if ($sched == "HFSC") {
 				$tmpcf['linkshare'] = "on";
 				$otherbw = $remainbw * 0.1; /* 10% bandwidth */
-				$tmpcf['linkshare1'] = "0b";
-				$tmpcf['linkshare2'] = 200;
 				$tmpcf['linkshare3'] = "{$otherbw}%";
 				$tmpcf['bandwidth'] = $otherbw;
 				$tmpcf['bandwidthtype'] = "%";
@@ -814,18 +800,15 @@ function apply_all_choosen_items() {
 			} else if ($sched == "HFSC") {
 				if ($penalty) {
 					$tmpcf['linkshare3'] = "{$penaltybw}{$penaltybwunit}";
-					$tmpcf['linkshare1'] = "{$penaltybw}{$penaltybwunit}";
 					$tmpcf['bandwidth'] = $penaltybw;
 					$tmpcf['bandwidthtype'] = $penaltybwunit;
 				} else {
 					$lsbw = $remainbw * 0.05;
-					$tmpcf['linkshare1'] = "{$lsbw}%"; /* 5% bandwidth */
 					$tmpcf['linkshare3'] = "{$lsbw}%"; /* 5% bandwidth */
 					$tmpcf['bandwidth'] = $lsbw;
                                                $tmpcf['bandwidthtype'] = "%";
 				}
 				$tmpcf['linkshare'] = "on";
-				$tmpcf['linkshare2'] = 500;
 			}
 			array_push($tmppath, "qOthersLow");
 			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);
@@ -958,8 +941,6 @@ function apply_all_choosen_items() {
 		else if ($sched == "HFSC") {
 			$lkbw = 0.20 * $remainbw;
 			$tmpcf['linkshare3'] = "{$lkbw}%";
-		 	$tmpcf['linkshare2'] = 100;
-			$tmpcf['linkshare1'] = "0b";	
 			$tmpcf['linkshare'] = "on";
 			$tmpcf['bandwidth'] = $lkbw; 
 			$tmpcf['bandwidthtype'] = "%";
@@ -1022,8 +1003,6 @@ function apply_all_choosen_items() {
 					$tmpcf['bandwidthtype'] = $p2pcatchbwunit;
 				} else if ($sched == "HFSC") {
 					$tmpcf['linkshare'] = "on";
-					$tmpcf['linkshare1'] = "{$p2pcatchbw}{$p2pcatchbwunit}";
-					$tmpcf['linkshare2'] = 300;
 					$tmpcf['linkshare3'] = "{$p2pcatchbw}{$p2pcatchbwunit}";
 					$tmpcf['upperlimit'] = "on";
 					$tmpcf['upperlimit3'] = "{$p2pcatchbw}{$p2pcatchbwunit}";
@@ -1040,8 +1019,6 @@ function apply_all_choosen_items() {
 				} else if ($sched == "HFSC") {
 					$tmpbw = $remainbw * 0.05; /* 5% bandwidth */
 					$tmpcf['linkshare'] = "on";
-					$tmpcf['linkshare1'] = "{$tmpbw}%";
-					$tmpcf['linkshare2'] = 300;
 					$tmpcf['linkshare3'] = "{$tmpbw}%";
 					$tmpcf['upperlimit'] = "on";
 					$tmpcf['upperlimit3'] = "{$tmpbw}%";
@@ -1086,9 +1063,7 @@ function apply_all_choosen_items() {
 					$tmpcf['realtime3'] = "{$voipbw}%";
 				}
 				$tmpcf['realtime'] = "on";
-				$tmpcf['realtime2'] = "10";
 				$tmpcf['bandwidth'] = 32;
-				$tmpcf['realtime1'] = "0b";
 				$tmpcf['bandwidthtype'] = "Kb";
 			}
 			array_push($tmppath, "qVoIP");
@@ -1118,8 +1093,6 @@ function apply_all_choosen_items() {
 			} else if ($sched == "HFSC") {
                                        $gamesbw = $remainbw * 0.2; /* 20% bandwidth */
 				$tmpcf['linkshare'] = "on";
-                                      	$tmpcf['linkshare1'] = "0b";
-                                       $tmpcf['linkshare2'] = "50";
                                        $tmpcf['linkshare3'] = "{$gamesbw}%";
 				$tmpcf['bandwidth'] = "{$gamesbw}";
 				$tmpcf['bandwidthtype'] = "%";
@@ -1151,8 +1124,6 @@ function apply_all_choosen_items() {
 			} else if ($sched == "HFSC") {
 				$tmpcf['linkshare'] = "on";
 				$otherbw = $remainbw * 0.1; /* 10% bandwidth */
-				$tmpcf['linkshare1'] = "0b";
-				$tmpcf['linkshare2'] = 200;
 				$tmpcf['linkshare3'] = "{$otherbw}%";
 				$tmpcf['bandwidth'] = $otherbw;
 				$tmpcf['bandwidthtype'] = "%";
@@ -1186,18 +1157,15 @@ function apply_all_choosen_items() {
 			} else if ($sched == "HFSC") {
 				if ($penalty) {
 					$tmpcf['linkshare3'] = "{$penaltybw}{$penaltybwunit}";
-					$tmpcf['linkshare1'] = "{$penaltybw}{$penaltybwunit}";
 					$tmpcf['bandwidth'] = $penaltybw;
 					$tmpcf['bandwidthtype'] = $penaltybwunit;
 				} else {
 					$lsbw = $remainbw * 0.05;
-					$tmpcf['linkshare1'] = "{$lsbw}%"; /* 5% bandwidth */
 					$tmpcf['linkshare3'] = "{$lsbw}%"; /* 5% bandwidth */
 					$tmpcf['bandwidth'] = $lsbw;
                                                $tmpcf['bandwidthtype'] = "%";
 				}
 				$tmpcf['linkshare'] = "on";
-				$tmpcf['linkshare2'] = 500;
 			}
 			array_push($tmppath, "qOthersLow");
 			$qtmp =& $altq->add_queue($q, &$tmpcf, &$tmppath, $input_errors);