Tidy up "shaper.inc" XHTML

Add missing end TR tag
Add missing end TD tag
Add missing end SPAN tag
Move table row start into the PHP IF statement, so that the IF statement
generates the full table row
Remove duplicate ID in INPUT tag
Size parameter in INPUT tag can only be a whole number
Name parameter is not valid for TR tag
Add missing end P tag

1 files changed, 31 insertions, 32 deletions

diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc
index e27a880..e5e2525 100644
--- a/etc/inc/shaper.inc
+++ b/etc/inc/shaper.inc
@@ -1154,7 +1154,7 @@ class priq_queue {
 		$form .= htmlspecialchars($this->GetQlimit());
 		$form .= "\" />";
 		$form .= "<br/> <span class=\"vexpl\">" . gettext("Queue limit in packets per second."); 
-		$form .= "</span></td>";
+		$form .= "</span></td></tr>";
 		$form .= "<tr>";
 		$form .= "<td width=\"22%\" valign=\"middle\" class=\"vncell\">" . gettext("Scheduler options") . "</td>";
 		$form .= "<td width=\"78%\" class=\"vtable\">";
@@ -1183,10 +1183,10 @@ class priq_queue {
 			$form .=  " checked=\"checked\"";
 		$form .= " /> <a target=\"_new\" href=\"http://www.openbsd.org/faq/pf/queueing.html#ecn\">" . gettext("Explicit Congestion Notification") . "</a><br/>";
 		$form .= "<span class=\"vexpl\"><br/>" . gettext("Select options for this queue");
-		$form .= "</tr><tr>";
+		$form .= "</span></td></tr><tr>";
 		$form .= "<td width=\"22%\" class=\"vncellreq\">" . gettext("Description") . "</td>";
 		$form .= "<td width=\"78%\" class=\"vtable\">";
-		$form .= "<input type=\"text\" name=\"description\" size=\"50%\" class=\"formfld unknown\" value=\"" . $this->GetDescription() . "\" />";
+		$form .= "<input type=\"text\" name=\"description\" size=\"40\" class=\"formfld unknown\" value=\"" . $this->GetDescription() . "\" />";
 		$form .= "</td></tr>";
 		$form .= "<input type=\"hidden\" name=\"interface\" id=\"interface\"";
 		$form .= " value=\"".$this->GetInterface()."\" />";
@@ -1213,10 +1213,9 @@ class priq_queue {
 		$form .= "<td width=\"50%\" class=\"vncellreq\">";
 		$form .= gettext("Bandwidth:") . " " . $this->GetBandwidth().$this->GetBwscale();
 		$form .= "</td><td width=\"50%\"></td></tr>";
-		$form .= "<tr><td width=\"20%\" class=\"vncellreq\">";
 		$tmpvalue = $this->GetQpriority();
 		if (!empty($tmpvalue))
-			$form .= gettext("Priority: on") . " </td></tr>";
+			$form .= "<tr><td width=\"20%\" class=\"vncellreq\">" .gettext("Priority: on") . " </td></tr>";
 		$tmpvalue = $this->GetDefault();
 		if (!empty($tmpvalue))
 			$form .= "<tr><td class=\"vncellreq\">" . gettext("Default: on") . " </td></tr>";
@@ -1927,7 +1926,7 @@ class hfsc_queue extends priq_queue {
 		if ($this->GetRealtime() == "")
 			$form .= " disabled=\"disabled\"";
 		$form .= " /></td><td>" . gettext("The minimum required bandwidth for the queue.") . "</td></tr>";
-		$form .= "<tr><td><input type=\"checkbox\" id=\"linkshare\" id=\"linkshare\" name=\"linkshare\"";
+		$form .= "<tr><td><input type=\"checkbox\" id=\"linkshare\" name=\"linkshare\"";
 		if($this->GetLinkshare() <> "") 
 			$form .=  " checked=\"checked\" ";
 		$form .= "onchange=\"enable_linkshare()\" /> " . gettext("Link share:") . "</td><td><input size=\"6\" value=\"";
@@ -1951,7 +1950,7 @@ class hfsc_queue extends priq_queue {
 		      .  "the bandwidth assigned to the queue.  m1 and d are optional and can be "
 		      .  "used to control the initial bandwidth assignment.  For the first d milliseconds the queue gets the bandwidth given as m1, afterwards the value "
 		      .  "given in m2.");
-		$form .= "</span></td>";
+		$form .= "</td>";
 		$form .= "</tr>";
 
 		return $form;
@@ -3233,28 +3232,28 @@ EOD;
 		$form .= "</td></tr>";
 		$form .= "<tr><td valign=\"middle\" class=\"vncellreq\">" . gettext("Description") . "</td>";
 		$form .= "<td class=\"vncellreq\">";
-		$form .= "<input type=\"text\" class=\"formfld unknown\" size=\"50%\" id=\"description\" name=\"description\" value=\"";
+		$form .= "<input type=\"text\" class=\"formfld unknown\" size=\"40\" id=\"description\" name=\"description\" value=\"";
 		$form .= $this->GetDescription();
 		$form .= "\" />";
 		$form .= "<br/> <span class=\"vexpl\">";
 		$form .= gettext("You may enter a description here for your reference (not parsed).") . "</span>";
 		$form .= "</td></tr>";
-      		$form .= "<tr id=\"sprtable4\" name=\"sprtable4\">";
+      		$form .= "<tr id=\"sprtable4\">";
 		$form .= "<td></td>";
                 $form .= "<td><div id=\"showadvancedboxspr\">";
                 $form .= "<p><input type=\"button\" onclick=\"show_source_port_range()\"";
 		$form .= " value=\"" . gettext("Show advanced options") . "\" />";
-                $form .= "</div></td></tr>";
-                $form .= "<tr style=\"display:none\" id=\"sprtable\" name=\"sprtable\">";
+                $form .= "</p></div></td></tr>";
+                $form .= "<tr style=\"display:none\" id=\"sprtable\">";
 
 		$form .= "<td valign=\"middle\" class=\"vncellreq\">" . gettext("Delay") . "</td>";
 		$form .= "<td valign=\"middle\" class=\"vncellreq\">";
 		$form .= "<input name=\"delay\" type=\"text\" id=\"delay\" size=\"5\" value=\"";
 		$form .= $this->GetDelay() . "\" />";
 		$form .= "&nbsp;ms<br/> <span class=\"vexpl\">" . gettext("Hint: in most cases, you "
-			  .  "should specify 0 here (or leave the field empty)") . "</span>";
-		$form .= "</td></tr><br/>";
-      		$form .= "<tr style=\"display:none\" id=\"sprtable1\" name=\"sprtable1\">";
+			  .  "should specify 0 here (or leave the field empty)") . "</span><br/>";
+		$form .= "</td></tr>";
+      		$form .= "<tr style=\"display:none\" id=\"sprtable1\">";
 		$form .= "<td valign=\"middle\" class=\"vncellreq\">" . gettext("Packet loss rate") . "</td>";
 		$form .= "<td valign=\"middle\" class=\"vncellreq\">";
 		$form .= "<input name=\"plr\" type=\"text\" id=\"plr\" size=\"5\" value=\"";
@@ -3263,7 +3262,7 @@ EOD;
 			  .  "should specify 0 here (or leave the field empty). "
 		      .  "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 .= "<tr style=\"display:none\" id=\"sprtable2\">";
 		$form .= "<td valign=\"middle\" class=\"vncellreq\">" . gettext("Queue Size") . "</td>";
 		$form .= "<td class=\"vncellreq\">";
 		$form .= "<input type=\"text\" id=\"qlimit\" name=\"qlimit\" value=\"";
@@ -3274,7 +3273,7 @@ EOD;
 	              .  "then they are delayed by value specified in the Delay field, and then they "
 		      .  "are delivered to their destination.") . "</span>";
 		$form .= "</td></tr>";
-		$form .= "<tr style=\"display:none\" id=\"sprtable5\" name=\"sprtable5\">";
+		$form .= "<tr style=\"display:none\" id=\"sprtable5\">";
                 $form .= "<td valign=\"middle\" class=\"vncellreq\">" . gettext("Bucket Size") . "</td>";
                 $form .= "<td class=\"vncellreq\">";
                 $form .= "<input type=\"text\" id=\"buckets\" name=\"buckets\" value=\"";
@@ -3282,7 +3281,7 @@ EOD;
                 $form .= "&nbsp;slots<br/>";
                 $form .= "<span class=\"vexpl\">" . gettext("Hint: in most cases, you "
                       .  "should leave the field empty. It increases the hash size set.");
-                $form .= "</td></tr>";
+                $form .= "</span></td></tr>";
 
 		return $form;
 
@@ -3479,21 +3478,21 @@ class dnqueue_class extends dummynet_class {
 		      .  "respectively. This makes it possible to easily specify bandwidth \n"
 		      .  "limits per host.") . "</span>";
 		$form .= "</td></tr>";
-		$form .= "<tr><td valign=\"middle\" class=\"vncellreq\">Description</td>";
+		$form .= "<tr><td valign=\"middle\" class=\"vncellreq\">" . gettext("Description") . "</td>";
 		$form .= "<td class=\"vncellreq\">";
-		$form .= "<input type=\"text\" id=\"description\" class=\"formfld unknown\" size=\"50%\" name=\"description\" value=\"";
+		$form .= "<input type=\"text\" id=\"description\" class=\"formfld unknown\" size=\"40\" name=\"description\" value=\"";
 		$form .= $this->GetDescription();
 		$form .= "\" />";
 		$form .= "<br/> <span class=\"vexpl\">";
 		$form .= gettext("You may enter a description here for your reference (not parsed).") . "</span>";
 		$form .= "</td></tr>";
-		$form .= "<tr id=\"sprtable4\" name=\"sprtable4\">";
+		$form .= "<tr id=\"sprtable4\">";
 		$form .= "<td></td>";
                 $form .= "<td><div id=\"showadvancedboxspr\">";
                 $form .= "<p><input type=\"button\" onclick=\"show_source_port_range()\"";
 		$form .= " value=\"" . gettext("Show advanced options") . "\" />";
                 $form .= "</div></td></tr>";
-		$form .= "<tr style=\"display:none\" id=\"sprtable\" name=\"sprtable\">";
+		$form .= "<tr style=\"display:none\" id=\"sprtable\">";
 		$form .= "<td valign=\"middle\" class=\"vncellreq\">" . gettext("Weight") . "</td>";
 		$form .= "<td valign=\"middle\" class=\"vncellreq\">";
 		$form .= "<input name=\"weight\" type=\"text\" id=\"weight\" size=\"5\" value=\"";
@@ -3501,7 +3500,7 @@ class dnqueue_class extends dummynet_class {
 		$form .= "&nbsp;<br/> <span class=\"vexpl\">" . gettext("Hint: For queues under the same parent "
 		      .  "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 .= "<tr style=\"display:none\" id=\"sprtable1\">";
 		$form .= "<td valign=\"middle\" class=\"vncellreq\">" . gettext("Packet loss rate") . "</td>";
 		$form .= "<td valign=\"middle\" class=\"vncellreq\">";
 		$form .= "<input name=\"plr\" type=\"text\" id=\"plr\" size=\"5\" value=\"";
@@ -3510,7 +3509,7 @@ class dnqueue_class extends dummynet_class {
 			  .  "should specify 0 here (or leave the field empty). "
 			  .  "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 .= "<tr style=\"display:none\" id=\"sprtable2\">";
 		$form .= "<td valign=\"middle\" class=\"vncellreq\">" . gettext("Queue Size") . "</td>";
 		$form .= "<td class=\"vncellreq\">";
 		$form .= "<input type=\"text\" id=\"qlimit\" name=\"qlimit\" value=\"";
@@ -3521,7 +3520,7 @@ class dnqueue_class extends dummynet_class {
 			  .  "then they are delayed by value specified in the Delay field, and then they "
 			  .  "are delivered to their destination.") . "</span>";
 		$form .= "</td></tr>";
-		$form .= "<tr style=\"display:none\" id=\"sprtable5\" name=\"sprtable5\">";
+		$form .= "<tr style=\"display:none\" id=\"sprtable5\">";
                 $form .= "<td valign=\"middle\" class=\"vncellreq\">" . gettext("Bucket Size") . "</td>";
                 $form .= "<td class=\"vncellreq\">";
                 $form .= "<input type=\"text\" id=\"buckets\" name=\"buckets\" value=\"";
@@ -3529,7 +3528,7 @@ class dnqueue_class extends dummynet_class {
                 $form .= "&nbsp;" . gettext("slots") . "<br/>";
                 $form .= "<span class=\"vexpl\">" . gettext("Hint: in most cases, you "
                       .  "should leave the field empty. It increases the hash size set.");
-                $form .= "</td></tr>";
+                $form .= "</span></td></tr>";
 
 		$form .= "<input type=\"hidden\" id=\"pipe\" name=\"pipe\"";
 		$form .= " value=\"" . $this->GetPipe() . "\" />";
@@ -3676,7 +3675,7 @@ class layer7 {
 	$form .= "</td></tr>";
 	$form .= "<tr><td valign=\"middle\" class=\"vncellreq\">" . gettext("Description") . "</td>";
 	$form .= "<td class=\"vncellreq\">";
-	$form .= "<input type=\"text\" class=\"formfld unknown\" size=\"50%\" id=\"description\" name=\"description\" value=\"";
+	$form .= "<input type=\"text\" class=\"formfld unknown\" size=\"40\" id=\"description\" name=\"description\" value=\"";
 	$form .= $this->GetRDescription();
 	$form .= "\" />";
 	$form .= "<br/> <span class=\"vexpl\">";
@@ -4282,18 +4281,18 @@ function build_iface_without_this_queue($iface, $qname) {
 }
 
 
-$default_shaper_msg =	"<tr><td align=\"center\" width=\"80%\" >";
-$default_shaper_msg .= "<span class=\"vexpl\"><strong><p><b>" . sprintf(gettext("Welcome to the %s Traffic Shaper."), $g['product_name']) . "</b><br />";
+$default_shaper_msg =  "<tr><td align=\"center\" width=\"80%\">";
+$default_shaper_msg .= "<span class=\"vexpl\"><strong><b>" . sprintf(gettext("Welcome to the %s Traffic Shaper."), $g['product_name']) . "</b><br />";
 $default_shaper_msg .= gettext("The tree on the left helps you navigate through the queues <br />"
                     .  "buttons at the bottom represent queue actions and are activated accordingly.");
-$default_shaper_msg .= " </p></strong></span>";
+$default_shaper_msg .= "</strong></span>";
 $default_shaper_msg .= "</td></tr>";
 
-$dn_default_shaper_msg =	"<tr><td align=\"center\" width=\"80%\" >";
-$dn_default_shaper_msg .= "<span class=\"vexpl\"><strong><p><b>" . sprintf(gettext("Welcome to the %s Traffic Shaper."), $g['product_name']) . "</b><br />";
+$dn_default_shaper_msg =  "<tr><td align=\"center\" width=\"80%\">";
+$dn_default_shaper_msg .= "<span class=\"vexpl\"><strong><b>" . sprintf(gettext("Welcome to the %s Traffic Shaper."), $g['product_name']) . "</b><br />";
 $dn_default_shaper_msg .= gettext("The tree on the left helps you navigate through the queues <br />"
                        .  "buttons at the bottom represent queue actions and are activated accordingly.");
-$dn_default_shaper_msg .= " </p></strong></span>";
+$dn_default_shaper_msg .= "</strong></span>";
 $dn_default_shaper_msg .= "</td></tr>";
 
 ?>