Merge remote-tracking branch 'mainline/master' into inc

Conflicts:
	etc/inc/auth.inc
	etc/inc/config.lib.inc
	etc/inc/filter.inc
	etc/inc/pfsense-utils.inc
	etc/inc/pkg-utils.inc
	etc/inc/priv.defs.inc
	etc/inc/services.inc
	etc/inc/shaper.inc
	etc/inc/voucher.inc
	etc/inc/vpn.inc
	usr/local/www/fbegin.inc

1 files changed, 35 insertions, 12 deletions

diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc
index bc4a0c2..c410495 100644
--- a/etc/inc/shaper.inc
+++ b/etc/inc/shaper.inc
@@ -560,16 +560,16 @@ class altq_root_queue {
 	function build_javascript() {
 		$javascript = "<script type=\"text/javascript\">";
 		$javascript .= "function mySuspend() {";
-		$javascript .= "if (document.layers && document.layers['shaperarea'] != null);";
-		$javascript .= "document.layers['shaperarea'].visibility = 'hidden';";
+		$javascript .= "if (document.layers && document.layers['shaperarea'] != null) ";
+		$javascript .= "document.layers['shaperarea'].visibility = 'hidden'; ";
 		$javascript .= "else if (document.all)";
 		$javascript .= "document.all['shaperarea'].style.visibility = 'hidden';";
 		$javascript .= "}";
 
 		$javascript .= "function myResume() {";
-		$javascript .= "if (document.layers && document.layers['shaperarea'] != null)";
+		$javascript .= "if (document.layers && document.layers['shaperarea'] != null) ";
 		$javascript .= "document.layers['shaperarea'].visibility = 'visible';";
-		$javascript .= "else if (document.all)";
+		$javascript .= "else if (document.all) ";
 		$javascript .= "document.all['shaperarea'].style.visibility = 'visible';";
 		$javascript .= "}";
 		$javascript .= "</script>";
@@ -858,7 +858,7 @@ class priq_queue {
 	function build_javascript() {
 		$javascript = "<script type=\"text/javascript\">";
 		$javascript .= "function mySuspend() { \n";
-		$javascript .= "if (document.layers && document.layers['shaperarea'] != null);\n";
+		$javascript .= "if (document.layers && document.layers['shaperarea'] != null)\n";
 		$javascript .= "document.layers['shaperarea'].visibility = 'hidden';\n";
 		$javascript .= "else if (document.all)\n";
 		$javascript .= "document.all['shaperarea'].style.visibility = 'hidden';\n";
@@ -967,8 +967,12 @@ class priq_queue {
 	}
 
 	function ReadConfig(&$q) {
-		if (isset($q['name']))
-				$this->SetQname($q['name']);
+		if (!empty($q['name']) && !empty($q['newname']) && $q['name'] != $q['newname']) {
+			$this->SetQname($q['newname']);
+		} else if (!empty($q['newname'])) {
+			$this->SetQname($q['newname']);
+		} else if (isset($q['name']))
+			$this->SetQname($q['name']);
 		if (isset($q['interface']))
 				$this->SetInterface($q['interface']);
 		$this->SetBandwidth($q['bandwidth']);
@@ -1100,7 +1104,10 @@ class priq_queue {
 		$form .= "<tr>";
 		$form .= "<td width=\"22%\" valign=\"center\" class=\"vncellreq\">";
 		$form .= gettext("Queue Name") . "</td><td width=\"78%\" class=\"vtable\">";
-		$form .= "<input name=\"name\" type=\"text\" id=\"name\" class=\"formfld unknown\" size=\"15\" maxlength=\"15\" value=\"";
+		$form .= "<input name=\"newname\" type=\"text\" id=\"newname\" class=\"formfld unknown\" size=\"15\" maxlength=\"15\" value=\"";
+		$form .= htmlspecialchars($this->GetQname());
+		$form .= "\">";
+		$form .= "<input name=\"name\" type=\"hidden\" id=\"name\" class=\"formfld unknown\" size=\"15\" maxlength=\"15\" value=\"";
 		$form .= htmlspecialchars($this->GetQname());
 		$form .= "\">";
 		$form .= "<br /> <span class=\"vexpl\">" . gettext("Enter the name of the queue here.  Do not use spaces and limit the size to 15 characters.");
@@ -2877,7 +2884,13 @@ class dnpipe_class extends dummynet_class {
 	}
 
 	function ReadConfig(&$q) {
-           	$this->SetQname($q['name']);
+		if (!empty($q['name']) && !empty($q['newname']) && $q['name'] != $q['newname']) {
+			$this->SetQname($q['newname']);
+		} else if (!empty($q['newname'])) {
+			$this->SetQname($q['newname']);
+		} else {
+			$this->SetQname($q['name']);
+		}
 		$this->SetNumber($q['number']);
 		if (isset($q['bandwidth']) && $q['bandwidth'] <> "") { 
 			$this->SetBandwidth($q['bandwidth']);
@@ -2983,7 +2996,9 @@ class dnpipe_class extends dummynet_class {
                 $form .= "</td></tr>";
 		$form .= "<tr><td valign=\"center\" class=\"vncellreq\"><br><span class=\"vexpl\">" . gettext("Name") . "</span></td>";
 		$form .= "<td class=\"vncellreq\">";
-		$form .= "<input type=\"text\" id=\"name\" name=\"name\" value=\"";
+		$form .= "<input type=\"text\" id=\"newname\" name=\"newname\" value=\"";
+		$form .= $this->GetQname()."\">";
+		$form .= "<input type=\"hidden\" id=\"name\" name=\"name\" value=\"";
 		$form .= $this->GetQname()."\">";
 		$form .= "</td></tr>";
 		$form .= "<tr><td valign=\"center\" class=\"vncellreq\">" . gettext("Bandwidth");
@@ -3163,7 +3178,13 @@ class dnqueue_class extends dummynet_class {
         }		
 
 	function ReadConfig(&$q) {
-          	$this->SetQname($q['name']);
+		if (!empty($q['name']) && !empty($q['newname']) && $q['name'] != $q['newname']) {
+			$this->SetQname($q['newname']);
+		} else if (!empty($q['newname'])) {
+			$this->SetQname($q['newname']);
+		} else {
+			$this->SetQname($q['name']);
+		}
 		$this->SetNumber($q['number']);
 		if (isset($q['qlimit']) && $q['qlimit'] <> "")
        		       	$this->SetQlimit($q['qlimit']);
@@ -3235,7 +3256,9 @@ class dnqueue_class extends dummynet_class {
                 $form .= "</td></tr>";
 		$form .= "<tr><td valign=\"center\" class=\"vncellreq\"><br><span class=\"vexpl\">" . gettext("Name") . "</span></td>";
 		$form .= "<td class=\"vncellreq\">";
-		$form .= "<input type=\"text\" id=\"name\" name=\"name\" value=\"";
+		$form .= "<input type=\"text\" id=\"newname\" name=\"newname\" value=\"";
+		$form .= $this->GetQname()."\">";
+		$form .= "<input type=\"hidden\" id=\"name\" name=\"name\" value=\"";
 		$form .= $this->GetQname()."\">";
 		$form .= "</td></tr>";
 		$form .= "<tr><td valign=\"center\" class=\"vncellreq\">" . gettext("Mask") . "</td>";