Improve it even for queues.

1 files changed, 35 insertions, 25 deletions

diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc
index 2f1391f..22ee4bc 100644
--- a/etc/inc/shaper.inc
+++ b/etc/inc/shaper.inc
@@ -2912,31 +2912,6 @@ class dnqueue_class extends dummynet_class {
 		$form .= "<input type=\"text\" id=\"name\" name=\"name\" value=\"";
 		$form .= $this->GetQname()."\">";
 		$form .= "</td></tr>";
-	      	$form .= "<tr><td valign=\"top\" class=\"vncellreq\">Weight</td>";
-		$form .= "<td valign=\"top\" class=\"vncellreq\">";
-		$form .= "<input name=\"weight\" type=\"text\" id=\"weight\" size=\"5\" value=\"";
-		$form .= $this->GetWeight() . "\">";
-		$form .= "&nbsp;ms<br> <span class=\"vexpl\">Hint: For queues under the same parent"; 
-		$form .= "this specifies the share that a queue gets(values range from 1 to 100, you can leave it blank otherwise)</span>";
-		$form .= "</td></tr>";
-      		$form .= "<tr><td valign=\"top\" class=\"vncellreq\">Packet loss rate</td>";
-		$form .= "<td valign=\"top\" class=\"vncellreq\">";
-		$form .= "<input name=\"plr\" type=\"text\" id=\"plr\" size=\"5\" value=\"";
-		$form .= $this->GetPlr() . "\">";
-		$form .= "&nbsp;ms<br> <span class=\"vexpl\">Hint: in most cases, you"; 
-        	$form .= "should specify 0 here (or leave the field empty).";
-		$form .= "A value of 0.001 means one packet in 1000 gets dropped</span>";
-		$form .= "</td></tr>";
-		$form .= "<tr><td valign=\"top\" class=\"vncellreq\">Queue Size</td>";
-		$form .= "<td class=\"vncellreq\">";
-		$form .= "<input type=\"text\" id=\"qlimit\" name=\"qlimit\" value=\"";
-		$form .= $this->GetQlimit() . "\">";
-		$form .= "&nbsp;slots<br>";
-		$form .= "<span class=\"vexpl\">Hint: in most cases, you ";
-		$form .= "should leave the field empty. All packets in this pipe are placed into a fixed-size queue first,";
-        $form .= "then they are delayed by value specified in the Delay field, and then they ";
-		$form .= "are delivered to their destination.</span>";
-		$form .= "</td></tr>";
 		$form .= "<tr><td valign=\"top\" class=\"vncellreq\">Mask</td>";
 		$form .= "<td class=\"vncellreq\">";
 		$form .= "<select name=\"mask\" class=\"formselect\">";
@@ -2969,6 +2944,41 @@ class dnqueue_class extends dummynet_class {
 		$form .= "You may enter a description here ";
 		$form .= "for your reference (not parsed).</span>";
 		$form .= "</td></tr>";
+		$form .= "<tr id=\"sprtable4\" name=\"sprtable4\">";
+		$form .= "<td></td>";
+                $form .= "<td><div id=\"showadvancedboxspr\">";
+                $form .= "<p><input type=\"button\" onClick=\"show_source_port_range()\"";
+		$form .= " value=\"Show\"></input> - Show source port range</a>";
+                $form .= "</div></td></tr>";
+		$form .= "<tr style=\"display:none\" id=\"sprtable\" name=\"sprtable\">";
+		$form .= "<td valign=\"top\" class=\"vncellreq\">Weight</td>";
+		$form .= "<td valign=\"top\" class=\"vncellreq\">";
+		$form .= "<input name=\"weight\" type=\"text\" id=\"weight\" size=\"5\" value=\"";
+		$form .= $this->GetWeight() . "\">";
+		$form .= "&nbsp;ms<br> <span class=\"vexpl\">Hint: For queues under the same parent"; 
+		$form .= "this specifies the share that a queue gets(values range from 1 to 100, you can leave it blank otherwise)</span>";
+		$form .= "</td></tr>";
+		$form .= "<tr style=\"display:none\" id=\"sprtable1\" name=\"sprtable1\">";
+		$form .= "<td valign=\"top\" class=\"vncellreq\">Packet loss rate</td>";
+		$form .= "<td valign=\"top\" class=\"vncellreq\">";
+		$form .= "<input name=\"plr\" type=\"text\" id=\"plr\" size=\"5\" value=\"";
+		$form .= $this->GetPlr() . "\">";
+		$form .= "&nbsp;ms<br> <span class=\"vexpl\">Hint: in most cases, you"; 
+        	$form .= "should specify 0 here (or leave the field empty).";
+		$form .= "A value of 0.001 means one packet in 1000 gets dropped</span>";
+		$form .= "</td></tr>";
+		$form .= "<tr style=\"display:none\" id=\"sprtable2\" name=\"sprtable2\">";
+		$form .= "<td valign=\"top\" class=\"vncellreq\">Queue Size</td>";
+		$form .= "<td class=\"vncellreq\">";
+		$form .= "<input type=\"text\" id=\"qlimit\" name=\"qlimit\" value=\"";
+		$form .= $this->GetQlimit() . "\">";
+		$form .= "&nbsp;slots<br>";
+		$form .= "<span class=\"vexpl\">Hint: in most cases, you ";
+		$form .= "should leave the field empty. All packets in this pipe are placed into a fixed-size queue first,";
+        $form .= "then they are delayed by value specified in the Delay field, and then they ";
+		$form .= "are delivered to their destination.</span>";
+		$form .= "</td></tr>";
+		
 		$form .= "<input type=\"hidden\" id=\"pipe\" name=\"pipe\"";
 		$form .= " value=\"" . $this->GetPipe() . "\">";