Merge branch 'master-br' of https://github.com/ayvis/pfsense into ayvis-master-br

7 files changed, 60 insertions, 60 deletions

diff --git a/etc/inc/auth.inc b/etc/inc/auth.inc
index ddd20e7..4a0c794 100644
--- a/etc/inc/auth.inc
+++ b/etc/inc/auth.inc
@@ -104,7 +104,7 @@ if (function_exists("display_error_form") && !isset($config['system']['webgui'][
 
 	if($found_host == false) {
 		if(!security_checks_disabled()) {
-			display_error_form("501", gettext("Potential DNS Rebind attack detected, see http://en.wikipedia.org/wiki/DNS_rebinding<br/>Try accessing the router by IP address instead of by hostname."));
+			display_error_form("501", gettext("Potential DNS Rebind attack detected, see http://en.wikipedia.org/wiki/DNS_rebinding<br />Try accessing the router by IP address instead of by hostname."));
 			exit;
 		}
 		$security_passed = false;
@@ -1206,7 +1206,7 @@ function radius_backed($username, $passwd, $authcfg, &$attributes = array()) {
 		$retvalue['auth_val'] = 1;
 		$retvalue['error'] = $rauth->getError();
 		if ($debug)
-			printf(gettext("Radius start: %s<br>\n"), $retvalue['error']);
+			printf(gettext("Radius start: %s<br />\n"), $retvalue['error']);
 	}
 
 	// XXX - billm - somewhere in here we need to handle securid challenge/response
@@ -1217,18 +1217,18 @@ function radius_backed($username, $passwd, $authcfg, &$attributes = array()) {
 		$retvalue['auth_val'] = 1;
 		$retvalue['error'] = $result->getMessage();
 		if ($debug)
-			printf(gettext("Radius send failed: %s<br>\n"), $retvalue['error']);
+			printf(gettext("Radius send failed: %s<br />\n"), $retvalue['error']);
 	} else if ($result === true) {
 		if ($rauth->getAttributes())
 			$attributes = $rauth->listAttributes();
 		$retvalue['auth_val'] = 2;
 		if ($debug)
-			printf(gettext("Radius Auth succeeded")."<br>\n");
+			printf(gettext("Radius Auth succeeded")."<br />\n");
 		$ret = true;
 	} else {
 		$retvalue['auth_val'] = 3;
 		if ($debug)
-			printf(gettext("Radius Auth rejected")."<br>\n");
+			printf(gettext("Radius Auth rejected")."<br />\n");
 	}
 
 	// close OO RADIUS_AUTHENTICATION
diff --git a/etc/inc/authgui.inc b/etc/inc/authgui.inc
index fe9d2ca..93c9484 100644
--- a/etc/inc/authgui.inc
+++ b/etc/inc/authgui.inc
@@ -260,7 +260,7 @@ $have_cookies = isset($_COOKIE["cookie_test"]);
 			<?php 
 				if(is_ipaddr($http_host) && !$local_ip && !isset($config['system']['webgui']['nohttpreferercheck'])) {
 					$nifty_background = "#999";
-					print_info_box(gettext("You are accessing this router by an IP address not configured locally, which may be forwarded by NAT or other means. <br/><br/>If you did not setup this forwarding, you may be the target of a man-in-the-middle attack.")); 
+					print_info_box(gettext("You are accessing this router by an IP address not configured locally, which may be forwarded by NAT or other means. <br /><br />If you did not setup this forwarding, you may be the target of a man-in-the-middle attack.")); 
 				}
 				$noautocomplete = isset($config['system']['webgui']['noautocomplete']) ? 'autocomplete="off"' : '';
 			?>
@@ -287,7 +287,7 @@ $have_cookies = isset($_COOKIE["cookie_test"]);
 					</span>
 
 					<?php if (!$have_cookies && isset($_POST['login'])): ?>
-					<br/><br/>
+					<br /><br />
 					<span style="text-align:center; font-weight: normal ; font-style: italic; color: #ff0000">
 						<?= gettext("Your browser must support cookies to login."); ?>
 					</span>
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc
index 57d37df..1837798 100644
--- a/etc/inc/captiveportal.inc
+++ b/etc/inc/captiveportal.inc
@@ -91,7 +91,7 @@ function get_default_captive_portal_html() {
 									</b>
 									</font>
 								</div>
-								<br/>
+								<br />
 								<div id='loginbox'>
 								<table>
 									<tr><td colspan="2"><center>Welcome to the {$g['product_name']} Captive Portal!</td></tr>
diff --git a/etc/inc/functions.inc b/etc/inc/functions.inc
index c59d275..e434228 100644
--- a/etc/inc/functions.inc
+++ b/etc/inc/functions.inc
@@ -107,7 +107,7 @@ if(!function_exists("get_menu_messages")) {
 						}
 					$notice_msgs .="</table>";
 						
-					$domtt= "onclick=\"domTT_activate(this, event, 'caption', '{$notice}','content', '<br>{$notice_msgs}', 'trail', false, 'delay', 0, 'fade', 'both', 'fadeMax', 93, 'styleClass', 'niceTitle','width','{$domtt_width}','y',5,'type', 'sticky');\"";					
+					$domtt= "onclick=\"domTT_activate(this, event, 'caption', '{$notice}','content', '<br />{$notice_msgs}', 'trail', false, 'delay', 0, 'fade', 'both', 'fadeMax', 93, 'styleClass', 'niceTitle','width','{$domtt_width}','y',5,'type', 'sticky');\"";					
                     $menu_messages="<div id='alerts' ; >\n";
                     if(count($notices)==1)
                     	$msg= sprintf("%1$02d",count($notices))." ".gettext("unread notice");
diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc
index f1fb302..7e16414 100644
--- a/etc/inc/pkg-utils.inc
+++ b/etc/inc/pkg-utils.inc
@@ -626,7 +626,7 @@ function install_package($package, $pkg_info = "", $force_install = false) {
 			else {
 				$static_output .= gettext("failed!\n\nInstallation aborted.\n");
 				update_output_window($static_output);
-				echo "<br>Show <a href=\"pkg_mgr_install.php?showlog=true\">install log</a></center>";
+				echo "<br />Show <a href=\"pkg_mgr_install.php?showlog=true\">install log</a></center>";
 			}
 			conf_mount_ro();
 			return -1;
diff --git a/etc/inc/radius.inc b/etc/inc/radius.inc
index 51a3bae..a2ffb4b 100644
--- a/etc/inc/radius.inc
+++ b/etc/inc/radius.inc
@@ -255,7 +255,7 @@ class Auth_RADIUS extends PEAR {
     function dumpAttributes()
     {
         foreach ($this->attributes as $name => $data) {
-            echo "$name:$data<br>\n";
+            echo "$name:$data<br />\n";
         }
     }
 
diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc
index 9e06ab9..83ab9ee 100644
--- a/etc/inc/shaper.inc
+++ b/etc/inc/shaper.inc
@@ -633,15 +633,15 @@ class altq_root_queue {
 	 * to the user like the traffic wizard does.
 	 */
 	function build_form() {
-		$form = "<tr><td valign=\"middle\" class=\"vncellreq\"><br/>";
+		$form = "<tr><td valign=\"middle\" class=\"vncellreq\"><br />";
 		$form .= gettext("Enable/Disable");
-		$form .= "<br/></td><td class=\"vncellreq\">";
+		$form .= "<br /></td><td class=\"vncellreq\">";
 		$form .= " <input type=\"checkbox\" id=\"enabled\" name=\"enabled\" value=\"on\"";
 		if ($this->GetEnabled() == "on")
 			$form .=  " checked=\"checked\"";
 		$form .= " /><span class=\"vexpl\"> " . gettext("Enable/disable discipline and its children") . "</span>";
 		$form .= "</td></tr>";
-		$form .= "<tr><td valign=\"middle\" class=\"vncellreq\"><br/><span class=\"vexpl\">" . gettext("Name") . "</span></td>";
+		$form .= "<tr><td valign=\"middle\" class=\"vncellreq\"><br /><span class=\"vexpl\">" . gettext("Name") . "</span></td>";
 		$form .= "<td class=\"vncellreq\">";
 		$form .= "<strong>".$this->GetQname()."</strong>";
 		$form .= "</td></tr>";
@@ -670,7 +670,7 @@ class altq_root_queue {
 			$form .= " selected=\"selected\"";
 		$form .= ">PRIQ</option>";
 		$form .= "</select>";
-		$form .= "<br/> <span class=\"vexpl\">";
+		$form .= "<br /> <span class=\"vexpl\">";
 		$form .= gettext("NOTE: Changing this changes all child queues!");
 		$form .= gettext(" Beware you can lose information.");
 		$form .= "</span>";
@@ -709,7 +709,7 @@ class altq_root_queue {
 		$form .= "<br /><input type=\"text\" id=\"tbrconfig\" name=\"tbrconfig\" value=\"";
 		$form .= $this->GetTbrConfig();
 		$form .= "\" />";
-		$form .= "<br/> <span class=\"vexpl\">";
+		$form .= "<br /> <span class=\"vexpl\">";
 		$form .= gettext("Adjusts the size, in bytes, of the token bucket regulator. "
 		      .  "If not specified, heuristics based on the interface "
 		      .  "bandwidth are used to determine the size.");
@@ -1161,9 +1161,9 @@ class priq_queue {
 	 * need to update it.
 	 */
 	function build_form() {
-		$form = "<tr><td valign=\"middle\" class=\"vncellreq\"><br/>";
+		$form = "<tr><td valign=\"middle\" class=\"vncellreq\"><br />";
 		$form .= gettext("Enable/Disable");
-		$form .= "<br/></td><td class=\"vncellreq\">";
+		$form .= "<br /></td><td class=\"vncellreq\">";
 		$form .= " <input type=\"checkbox\" id=\"enabled\" name=\"enabled\" value=\"on\"";
 		if ($this->GetEnabled() == "on")
 			$form .=  " checked=\"checked\"";
@@ -1185,14 +1185,14 @@ class priq_queue {
 		$form .= "<td width=\"78%\" class=\"vtable\"> <input name=\"priority\" type=\"text\" id=\"priority\" size=\"5\" value=\"";
 		$form .= htmlspecialchars($this->GetQpriority());
 		$form .= "\" />";
-		$form .= "<br/> <span class=\"vexpl\">" . gettext("For hfsc, the range is 0 to 7. The default is 1.  Hfsc queues with a higher priority are preferred in the case of overload.") . "</span></td>";
+		$form .= "<br /> <span class=\"vexpl\">" . gettext("For hfsc, the range is 0 to 7. The default is 1.  Hfsc queues with a higher priority are preferred in the case of overload.") . "</span></td>";
 		$form .= "</tr>";
 		$form .= "<tr>";
 		$form .= "<td width=\"22%\" valign=\"middle\" class=\"vncellreq\">" . gettext("Queue limit") . "</td>";
 		$form .= "<td width=\"78%\" class=\"vtable\"> <input name=\"qlimit\" type=\"text\" id=\"qlimit\" size=\"8\" value=\"";
 		$form .= htmlspecialchars($this->GetQlimit());
 		$form .= "\" />";
-		$form .= "<br/> <span class=\"vexpl\">" . gettext("Queue limit in packets.");
+		$form .= "<br /> <span class=\"vexpl\">" . gettext("Queue limit in packets.");
 		$form .= "</span></td></tr>";
 		$form .= "<tr>";
 		$form .= "<td width=\"22%\" valign=\"middle\" class=\"vncell\">" . gettext("Scheduler options") . "</td>";
@@ -1200,33 +1200,33 @@ class priq_queue {
 		if (empty($this->subqueues)) {
 			if ($this->GetDefault()) {
 				$form .= "<input type=\"checkbox\" id=\"default\" checked=\"checked\" name=\"default\" value=\"default\"";
-				$form .= " /> " . gettext("Default queue") . "<br/>";
+				$form .= " /> " . gettext("Default queue") . "<br />";
 			} else {
 				$form .= "<input type=\"checkbox\" id=\"default\" name=\"default\" value=\"default\"";
-				$form .= " /> " . gettext("Default queue") . "<br/>";
+				$form .= " /> " . gettext("Default queue") . "<br />";
 			}
 		}
 		$form .= "<input type=\"checkbox\" id=\"red\" name=\"red\" value=\"red\" ";
 		$tmpvalue = $this->GetRed();
 		if(!empty($tmpvalue))
 			$form .=  " checked=\"checked\"";
-		$form .= " /> <a target=\"_new\" href=\"http://www.openbsd.org/faq/pf/queueing.html#red\">" . gettext("Random Early Detection") . "</a><br/>";
+		$form .= " /> <a target=\"_new\" href=\"http://www.openbsd.org/faq/pf/queueing.html#red\">" . gettext("Random Early Detection") . "</a><br />";
 		$form .= "<input type=\"checkbox\" id=\"rio\" name=\"rio\" value=\"rio\"";
 		$tmpvalue = $this->GetRio();
 		if(!empty($tmpvalue))
 			$form .=  " checked=\"checked\"";
-		$form .= " /> <a target=\"_new\" href=\"http://www.openbsd.org/faq/pf/queueing.html#rio\">" . gettext("Random Early Detection In and Out") . "</a><br/>";
+		$form .= " /> <a target=\"_new\" href=\"http://www.openbsd.org/faq/pf/queueing.html#rio\">" . gettext("Random Early Detection In and Out") . "</a><br />";
 		$form .= "<input type=\"checkbox\" id=\"ecn\" name=\"ecn\" value=\"ecn\"";
 		$tmpvalue = $this->GetEcn();
 		if(!empty($tmpvalue))
 			$form .=  " checked=\"checked\"";
-		$form .= " /> <a target=\"_new\" href=\"http://www.openbsd.org/faq/pf/queueing.html#ecn\">" . gettext("Explicit Congestion Notification") . "</a><br/>";
+		$form .= " /> <a target=\"_new\" href=\"http://www.openbsd.org/faq/pf/queueing.html#ecn\">" . gettext("Explicit Congestion Notification") . "</a><br />";
 		$form .= "<input type=\"checkbox\" id=\"codel\" name=\"codel\" value=\"codel\"";
 		$tmpvalue = $this->GetCodel();
 		if(!empty($tmpvalue))
 			$form .=  " checked=\"checked\"";
-		$form .= " /> <a target=\"_new\" href=\"http://www.bufferbloat.net/projects/codel/wiki\">" . gettext("Codel Active Queue") . "</a><br/>";
-		$form .= "<span class=\"vexpl\"><br/>" . gettext("Select options for this queue");
+		$form .= " /> <a target=\"_new\" href=\"http://www.bufferbloat.net/projects/codel/wiki\">" . gettext("Codel Active Queue") . "</a><br />";
+		$form .= "<span class=\"vexpl\"><br />" . gettext("Select options for this queue");
 		$form .= "</span></td></tr><tr>";
 		$form .= "<td width=\"22%\" class=\"vncellreq\">" . gettext("Description") . "</td>";
 		$form .= "<td width=\"78%\" class=\"vtable\">";
@@ -1934,7 +1934,7 @@ class hfsc_queue extends priq_queue {
 		if ($this->GetBwscale() == "%")
 			$form .= " selected=\"selected\"";
 		$form .= ">%</option>";
-		$form .= "</select> <br/>";
+		$form .= "</select> <br />";
 		$form .= "<span class=\"vexpl\">" . gettext("Choose the amount of bandwidth for this queue");
 		$form .= "</span></td></tr>";
 		$form .= "<tr>";
@@ -1999,7 +1999,7 @@ class hfsc_queue extends priq_queue {
 		if ($this->GetLinkshare() == "")
 			$form .= " disabled=\"disabled\"";
 		$form .= " /></td><td>" . gettext("The bandwidth share of a backlogged queue - this overrides priority.") . "</td></tr>";
-		$form .= "</table><br/>";
+		$form .= "</table><br />";
 		$form .= gettext("The format for service curve specifications is (m1, d, m2).  m2 controls "
 		      .  "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 "
@@ -2420,14 +2420,14 @@ class cbq_queue extends priq_queue {
 		if ($this->GetBwscale() == "%")
 			$form .= " selected=\"selected\"";
 		$form .= ">%</option>";
-		$form .= "</select> <br/>";
+		$form .= "</select> <br />";
 		$form .= "<span class=\"vexpl\">" . gettext("Choose the amount of bandwidth for this queue");
 		$form .= "</span></td></tr>";
 		$form .= "<tr><td class=\"vncellreq\">" . gettext("Scheduler specific options") . "</td>";
 		$form .= "<td class=\"vtable\"><input type=\"checkbox\" id=\"borrow\" name=\"borrow\"";
 		if($this->GetBorrow() == "on")
 			$form .=  " checked=\"checked\" ";
-		$form .= " /> " . gettext("Borrow from other queues when available") . "<br/></td></tr>";
+		$form .= " /> " . gettext("Borrow from other queues when available") . "<br /></td></tr>";
 
 		return $form;
 	}
@@ -2694,7 +2694,7 @@ class fairq_queue extends priq_queue {
 		if ($this->GetBwscale() == "%")
 			$form .= " selected=\"selected\"";
 		$form .= ">%</option>";
-		$form .= "</select> <br/>";
+		$form .= "</select> <br />";
 		$form .= "<span class=\"vexpl\">" . gettext("Choose the amount of bandwidth for this queue");
 		$form .= "</span></td></tr>";
 		$form .= "<tr><td class=\"vncellreq\">" . gettext("Scheduler specific options") . "</td>";
@@ -2703,12 +2703,12 @@ class fairq_queue extends priq_queue {
 		$tmpvalue = trim($this->GetBuckets());
 		if(!empty($tmpvalue))
 			$form .=  $this->GetBuckets();
-		$form .= "\" /> " . gettext("Number of buckets available.") . "<br/></td></tr>";
+		$form .= "\" /> " . gettext("Number of buckets available.") . "<br /></td></tr>";
 		$form .= "<tr><td class=\"vtable\"><input id=\"hogs\" name=\"hogs\" value=\"";
 		$tmpvalue = trim($this->GetHogs());
 		if(!empty($tmpvalue))
 			$form .=  $this->GetHogs();
-		$form .= "\" /> " . gettext("Bandwidth limit for hosts to not saturate link.") . "<br/></td></tr>";
+		$form .= "\" /> " . gettext("Bandwidth limit for hosts to not saturate link.") . "<br /></td></tr>";
 		$form .= "</table></td></tr>";
 		return $form;
 	}
@@ -3297,7 +3297,7 @@ EOD;
 			}
 		}
 
-		$form = "<tr><td valign=\"middle\" class=\"vncellreq\"><br/>";
+		$form = "<tr><td valign=\"middle\" class=\"vncellreq\"><br />";
 		$form .= gettext("Enable");
 		$form .= "</td><td class=\"vncellreq\">";
 		$form .= " <input type=\"checkbox\" id=\"enabled\" name=\"enabled\" value=\"on\"";
@@ -3305,7 +3305,7 @@ EOD;
 			$form .=  " checked=\"checked\"";
 		$form .= " /><span class=\"vexpl\"> " . gettext("Enable limiter and its children") . "</span>";
 		$form .= "</td></tr>";
-		$form .= "<tr><td valign=\"middle\" class=\"vncellreq\"><br/><span class=\"vexpl\">" . gettext("Name") . "</span></td>";
+		$form .= "<tr><td valign=\"middle\" class=\"vncellreq\"><br /><span class=\"vexpl\">" . gettext("Name") . "</span></td>";
 		$form .= "<td class=\"vncellreq\">";
 		$form .= "<input type=\"text\" id=\"newname\" name=\"newname\" value=\"";
 		$form .= $this->GetQname()."\" />";
@@ -3359,7 +3359,7 @@ EOD;
 		$form .= "</tbody></table>";
 		$form .= "<a onclick=\"javascript:addBwRowTo('maintable'); return false;\" href='#'>";
 		$form .= "<img border='0' src='/themes/{$g['theme']}/images/icons/icon_plus.gif' alt='add' title='" . gettext("add another schedule") . "' /></a>";
-		$form .= "<br/><span class=\"vexpl\">" . gettext("Bandwidth is a rate (e.g. Mbit/s), burst is a total amount of data that will be transferred at full speed after an idle period.") . "</span><br />";
+		$form .= "<br /><span class=\"vexpl\">" . gettext("Bandwidth is a rate (e.g. Mbit/s), burst is a total amount of data that will be transferred at full speed after an idle period.") . "</span><br />";
 		$form .= "</td></tr>";
 		$form .= "<tr><td valign=\"middle\" class=\"vncellreq\">" . gettext("Mask") . "</td>";
 		$form .= "<td class=\"vncellreq\">";
@@ -3378,7 +3378,7 @@ EOD;
 			$form .= " selected=\"selected\"";
 		$form .= ">" . gettext("Destination addresses") . "</option>";
 		$form .= "</select>";
-		$form .= "&nbsp;<br/>";
+		$form .= "&nbsp;<br />";
 		$form .= "<span class=\"vexpl\">" . gettext("If 'source' or 'destination' slots is chosen, \n"
 		      .  "a dynamic pipe with the bandwidth, delay, packet loss and queue size given above will \n"
 		      .  "be created for each source/destination IP address encountered, \n"
@@ -3391,7 +3391,7 @@ EOD;
 		if ($mask['type'] == "none")
 			$form .= " disabled";
 		$form .= " />";
-		$form .= "&nbsp; IPV4 mask bits (1-32)<br/>";
+		$form .= "&nbsp; IPV4 mask bits (1-32)<br />";
 		$form .= "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/&nbsp;<input type=\"text\" class=\"formfld unknown\" size=\"2\" id=\"maskbitsv6\" name=\"maskbitsv6\" value=\"";
 		if ($mask['type'] <> "none")
 		$form .= $mask['bitsv6'];
@@ -3399,7 +3399,7 @@ EOD;
 		if ($mask['type'] == "none")
 			$form .= " disabled";
 		$form .= " />";
-		$form .= "&nbsp; IPV6 mask bits (1-128)<br/>";
+		$form .= "&nbsp; IPV6 mask bits (1-128)<br />";
 		$form .= "<span class=\"vexpl\">" . gettext("If 'source' or 'destination' slots is chosen, \n"
 		      .  "leaving the mask bits blank will create one pipe per host. Otherwise specify \n"
 		      .  "the number of 'one' bits in the subnet mask used to group multiple hosts \n"
@@ -3410,7 +3410,7 @@ EOD;
 		$form .= "<input type=\"text\" class=\"formfld unknown\" size=\"40\" id=\"description\" name=\"description\" value=\"";
 		$form .= $this->GetDescription();
 		$form .= "\" />";
-		$form .= "<br/> <span class=\"vexpl\">";
+		$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\">";
@@ -3425,15 +3425,15 @@ EOD;
 		$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><br/>";
+		$form .= "&nbsp;ms<br /> <span class=\"vexpl\">" . gettext("Hint: in most cases, you "
+		      .  "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=\"";
 		$form .= $this->GetPlr() . "\" />";
-		$form .= "&nbsp;<br/> <span class=\"vexpl\">" . gettext("Hint: in most cases, you "
+		$form .= "&nbsp;<br /> <span class=\"vexpl\">" . gettext("Hint: in most cases, you "
 		      .  "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>";
@@ -3442,7 +3442,7 @@ EOD;
 		$form .= "<td class=\"vncellreq\">";
 		$form .= "<input type=\"text\" id=\"qlimit\" name=\"qlimit\" value=\"";
 		$form .= $this->GetQlimit() . "\" />";
-		$form .= "&nbsp;slots<br/>";
+		$form .= "&nbsp;slots<br />";
 		$form .= "<span class=\"vexpl\">" . gettext("Hint: in most cases, you "
 		      .  "should leave the field empty. All packets in this pipe are placed into a fixed-size queue first, "
 		      .  "then they are delayed by value specified in the Delay field, and then they "
@@ -3453,7 +3453,7 @@ EOD;
 		$form .= "<td class=\"vncellreq\">";
 		$form .= "<input type=\"text\" id=\"buckets\" name=\"buckets\" value=\"";
 		$form .= $this->GetBuckets() . "\" />";
-		$form .= "&nbsp;slots<br/>";
+		$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 .= "</span></td></tr>";
@@ -3623,7 +3623,7 @@ class dnqueue_class extends dummynet_class {
 
 
 	function build_form() {
-		$form = "<tr><td valign=\"middle\" class=\"vncellreq\"><br/>";
+		$form = "<tr><td valign=\"middle\" class=\"vncellreq\"><br />";
 		$form .= gettext("Enable/Disable");
 		$form .= "</td><td class=\"vncellreq\">";
 		$form .= " <input type=\"checkbox\" id=\"enabled\" name=\"enabled\" value=\"on\"";
@@ -3631,7 +3631,7 @@ class dnqueue_class extends dummynet_class {
 			$form .=  " checked=\"checked\"";
 		$form .= " /><span class=\"vexpl\"> " . gettext("Enable/Disable queue") . "</span>";
 		$form .= "</td></tr>";
-		$form .= "<tr><td valign=\"middle\" class=\"vncellreq\"><br/><span class=\"vexpl\">" . gettext("Name") . "</span></td>";
+		$form .= "<tr><td valign=\"middle\" class=\"vncellreq\"><br /><span class=\"vexpl\">" . gettext("Name") . "</span></td>";
 		$form .= "<td class=\"vncellreq\">";
 		$form .= "<input type=\"text\" id=\"newname\" name=\"newname\" value=\"";
 		$form .= $this->GetQname()."\" />";
@@ -3659,12 +3659,12 @@ class dnqueue_class extends dummynet_class {
 			$form .= " selected=\"selected\"";
 		$form .= ">" . gettext("Destination addresses") . "</option>";
 		$form .= "</select>";
-		$form .= "&nbsp;slots<br/>";
+		$form .= "&nbsp;slots<br />";
 		$form .= "<span class=\"vexpl\">" . gettext("If 'source' or 'destination' slots is chosen, \n"
 			.  "a dynamic pipe with the bandwidth, delay, packet loss and queue size given above will \n"
 			.  "be created for each source/destination IP address encountered, \n"
 			.  "respectively. This makes it possible to easily specify bandwidth \n"
-			.  "limits per host.") . "</span><br/>";
+			.  "limits per host.") . "</span><br />";
 		$form .= "255.255.255.255/&nbsp;<input type=\"text\" class=\"formfld unknown\" size=\"2\" id=\"maskbits\" name=\"maskbits\" value=\"";
 		if ($mask['type'] <> "none")
 			$form .= $mask['bits'];
@@ -3672,7 +3672,7 @@ class dnqueue_class extends dummynet_class {
 		if ($mask['type'] == "none")
 			$form .= " disabled";
 		$form .= " />";
-		$form .= "&nbsp; IPV4 mask bits (1-32)<br/>";
+		$form .= "&nbsp; IPV4 mask bits (1-32)<br />";
 		$form .= "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/&nbsp;<input type=\"text\" class=\"formfld unknown\" size=\"2\" id=\"maskbitsv6\" name=\"maskbitsv6\" value=\"";
 		if ($mask['type'] <> "none")
 			$form .= $mask['bitsv6'];
@@ -3680,7 +3680,7 @@ class dnqueue_class extends dummynet_class {
 		if ($mask['type'] == "none")
 			$form .= " disabled";
 		$form .= " />";
-		$form .= "&nbsp; IPV6 mask bits (1-128)<br/>";
+		$form .= "&nbsp; IPV6 mask bits (1-128)<br />";
 		$form .= "<span class=\"vexpl\">" . gettext("If 'source' or 'destination' slots is chosen, \n"
 			.  "leaving the mask bits blank will create one pipe per host. Otherwise specify \n"
 			.  "the number of 'one' bits in the subnet mask used to group multiple hosts \n"
@@ -3691,7 +3691,7 @@ class dnqueue_class extends dummynet_class {
 		$form .= "<input type=\"text\" id=\"description\" class=\"formfld unknown\" size=\"40\" name=\"description\" value=\"";
 		$form .= $this->GetDescription();
 		$form .= "\" />";
-		$form .= "<br/> <span class=\"vexpl\">";
+		$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\">";
@@ -3705,7 +3705,7 @@ class dnqueue_class extends dummynet_class {
 		$form .= "<td valign=\"middle\" class=\"vncellreq\">";
 		$form .= "<input name=\"weight\" type=\"text\" id=\"weight\" size=\"5\" value=\"";
 		$form .= $this->GetWeight() . "\" />";
-		$form .= "&nbsp;<br/> <span class=\"vexpl\">" . gettext("Hint: For queues under the same parent "
+		$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\">";
@@ -3713,7 +3713,7 @@ class dnqueue_class extends dummynet_class {
 		$form .= "<td valign=\"middle\" class=\"vncellreq\">";
 		$form .= "<input name=\"plr\" type=\"text\" id=\"plr\" size=\"5\" value=\"";
 		$form .= $this->GetPlr() . "\" />";
-		$form .= "&nbsp;<br/> <span class=\"vexpl\">" . gettext("Hint: in most cases, you "
+		$form .= "&nbsp;<br /> <span class=\"vexpl\">" . gettext("Hint: in most cases, you "
 			.  "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>";
@@ -3722,7 +3722,7 @@ class dnqueue_class extends dummynet_class {
 		$form .= "<td class=\"vncellreq\">";
 		$form .= "<input type=\"text\" id=\"qlimit\" name=\"qlimit\" value=\"";
 		$form .= $this->GetQlimit() . "\" />";
-		$form .= "&nbsp;slots<br/>";
+		$form .= "&nbsp;slots<br />";
 		$form .= "<span class=\"vexpl\">" . gettext("Hint: in most cases, you "
 			.  "should leave the field empty. All packets in this pipe are placed into a fixed-size queue first, "
 			.  "then they are delayed by value specified in the Delay field, and then they "
@@ -3733,7 +3733,7 @@ class dnqueue_class extends dummynet_class {
 		$form .= "<td class=\"vncellreq\">";
 		$form .= "<input type=\"text\" id=\"buckets\" name=\"buckets\" value=\"";
 		$form .= $this->GetBuckets() . "\" />";
-		$form .= "&nbsp;" . gettext("slots") . "<br/>";
+		$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 .= "</span></td></tr>";
@@ -3870,7 +3870,7 @@ class layer7 {
 	}
 
 	function build_form() {
-		$form = "<tr><td valign=\"middle\" class=\"vncellreq\"><br/>";
+		$form = "<tr><td valign=\"middle\" class=\"vncellreq\"><br />";
 		$form .= gettext("Enable/Disable");
 		$form .= "</td><td class=\"vncellreq\">";
 		$form .= " <input type=\"checkbox\" id=\"enabled\" name=\"enabled\" value=\"on\" ";
@@ -3879,7 +3879,7 @@ class layer7 {
 		}
 		$form .= " /><span class=\"vexpl\"> " . gettext("Enable/Disable layer7 Container") . "</span>";
 		$form .= "</td></tr>";
-		$form .= "<tr><td valign=\"middle\" class=\"vncellreq\"><br/><span class=\"vexpl\">" . gettext("Name") . "</span></td>";
+		$form .= "<tr><td valign=\"middle\" class=\"vncellreq\"><br /><span class=\"vexpl\">" . gettext("Name") . "</span></td>";
 		$form .= "<td class=\"vncellreq\">";
 		$form .= "<input type=\"text\" id=\"container\" name=\"container\" value=\"";
 		$form .= $this->GetRName()."\" />";
@@ -3889,7 +3889,7 @@ class layer7 {
 		$form .= "<input type=\"text\" class=\"formfld unknown\" size=\"40\" id=\"description\" name=\"description\" value=\"";
 		$form .= $this->GetRDescription();
 		$form .= "\" />";
-		$form .= "<br/> <span class=\"vexpl\">";
+		$form .= "<br /> <span class=\"vexpl\">";
 		$form .= gettext("You may enter a description here for your reference (not parsed).") . "</span>";
 		$form .= "</td></tr>";