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

1 files changed, 2 insertions, 36 deletions

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 38b53e4..99a68ea 100755
--- a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
+++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
@@ -769,15 +769,13 @@ function apply_all_choosen_items() {
                                 $tmpcf['bandwidthtype'] = $config['ezshaper']['step2']["conn{$i}uploadspeed"];
                         }
                         else if ($sched == "HFSC") {
-                               $tmpcf['linkshare1'] = $tmpcf['linkshare3'] =
+                               $tmpcf['linkshare3'] =
                                         floatval($config['ezshaper']['step2']["conn{$i}upload"]) . $config['ezshaper']['step2']["conn{$i}uploadspeed"];
 				$tmpcf['upperlimit3'] = 
                                         floatval($config['ezshaper']['step2']["conn{$i}upload"]) . $config['ezshaper']['step2']["conn{$i}uploadspeed"];
 				$tmpcf['upperlimit'] = "on";
 
 
-                                $tmpcf['linkshare2'] = 100;
-                                //$tmpcf['linkshare1'] = "0b";
                                 $tmpcf['linkshare'] = "on";
                                 $tmpcf['bandwidth'] =  floatval($config['ezshaper']['step2']["conn{$i}upload"]);
                                 $tmpcf['bandwidthtype'] = $config['ezshaper']['step2']["conn{$i}uploadspeed"];
@@ -810,8 +808,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'] = "%";
@@ -873,8 +869,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}";
@@ -891,8 +885,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}%";
@@ -937,9 +929,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");
@@ -969,8 +959,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'] = "%";
@@ -1002,8 +990,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'] = "%";
@@ -1039,18 +1025,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);
@@ -1184,11 +1167,9 @@ function apply_all_choosen_items() {
                                 $tmpcf['bandwidthtype'] = "Kb";
                         }
                         else if ($sched == "HFSC") {
-                                $tmpcf['linkshare1'] = $tmpcf['linkshare3'] = $lanbw/1000 . "Kb";
+                                $tmpcf['linkshare3'] = $lanbw/1000 . "Kb";
 				$tmpcf['upperlimit3'] = $lanbw/1000 . "Kb";
 				$tmpcf['upperlimit'] = "on";
-                                $tmpcf['linkshare2'] = 100;
-                                //$tmpcf['linkshare1'] = "0b";
                                 $tmpcf['linkshare'] = "on";
                                 $tmpcf['bandwidth'] =  $lanbw/1000;
                                 $tmpcf['bandwidthtype'] = "Kb";
@@ -1221,8 +1202,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'] = "%";
@@ -1284,8 +1263,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}";
@@ -1302,8 +1279,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}%";
@@ -1348,9 +1323,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");
@@ -1380,8 +1353,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'] = "%";
@@ -1413,8 +1384,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'] = "%";
@@ -1450,18 +1419,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);