Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline into mlppp

4 files changed, 162 insertions, 65 deletions

diff --git a/usr/local/www/javascript/firewall_nat_edit/firewall_nat_edit.js b/usr/local/www/javascript/firewall_nat_edit/firewall_nat_edit.js
index a2dff4c..9f21c2b 100644
--- a/usr/local/www/javascript/firewall_nat_edit/firewall_nat_edit.js
+++ b/usr/local/www/javascript/firewall_nat_edit/firewall_nat_edit.js
@@ -1,28 +1,65 @@
 <!--
+var portsenabled = 1;
+var dstenabled = 1;
+var showsource = 0;
+
 function ext_change() {
-	if (document.iform.beginport.selectedIndex == 0) {
-		document.iform.beginport_cust.disabled = 0;
+	if ((document.iform.srcbeginport.selectedIndex == 0) && portsenabled) {
+		document.iform.srcbeginport_cust.disabled = 0;
+	} else {
+		document.iform.srcbeginport_cust.value = "";
+		document.iform.srcbeginport_cust.disabled = 1;
+	}
+	if ((document.iform.srcendport.selectedIndex == 0) && portsenabled) {
+		document.iform.srcendport_cust.disabled = 0;
+	} else {
+		document.iform.srcendport_cust.value = "";
+		document.iform.srcendport_cust.disabled = 1;
+	}
+	if ((document.iform.dstbeginport.selectedIndex == 0) && portsenabled && dstenabled) {
+		document.iform.dstbeginport_cust.disabled = 0;
 	} else {
-		document.iform.beginport_cust.value = "";
-		document.iform.beginport_cust.disabled = 1;
+		document.iform.dstbeginport_cust.value = "";
+		document.iform.dstbeginport_cust.disabled = 1;
 	}
-	if (document.iform.endport.selectedIndex == 0) {
-		document.iform.endport_cust.disabled = 0;
+	if ((document.iform.dstendport.selectedIndex == 0) && portsenabled && dstenabled) {
+		document.iform.dstendport_cust.disabled = 0;
 	} else {
-		document.iform.endport_cust.value = "";
-		document.iform.endport_cust.disabled = 1;
+		document.iform.dstendport_cust.value = "";
+		document.iform.dstendport_cust.disabled = 1;
 	}
-	if (document.iform.localbeginport.selectedIndex == 0) {
+
+	if ((document.iform.localbeginport.selectedIndex == 0) && portsenabled) {
 		document.iform.localbeginport_cust.disabled = 0;
 	} else {
 		document.iform.localbeginport_cust.value = "";
 		document.iform.localbeginport_cust.disabled = 1;
 	}
+
+	if (!portsenabled) {
+		document.iform.srcbeginport.disabled = 1;
+		document.iform.srcendport.disabled = 1;
+		document.iform.dstbeginport.disabled = 1;
+		document.iform.dstendport.disabled = 1;
+		document.iform.localbeginport_cust.disabled = 1;
+	} else {
+		document.iform.srcbeginport.disabled = 0;
+		document.iform.srcendport.disabled = 0;
+		document.iform.localbeginport_cust.disabled = 0;
+		if( dstenabled ) {
+			document.iform.dstbeginport.disabled = 0;
+			document.iform.dstendport.disabled = 0;
+		}
+	}
 }
 
-function ext_rep_change() {
-	document.iform.endport.selectedIndex = document.iform.beginport.selectedIndex;
-	document.iform.localbeginport.selectedIndex = document.iform.beginport.selectedIndex;
+function show_source() {
+	if(portsenabled)
+		document.getElementById("sprtable").style.display = '';
+
+	document.getElementById("srctable").style.display = '';
+	document.getElementById("showadvancedboxsrc").style.display = 'none';
+	showsource = 1;
 }
 
 function check_for_aliases() {
@@ -30,64 +67,119 @@ function check_for_aliases() {
 	 *  entry of Local port
 	 */
 	for(i=0; i<customarray.length; i++) {
-		if(document.iform.beginport_cust.value == customarray[i]) {
-			document.iform.endport_cust.value = customarray[i];
+		if(document.iform.dstbeginport_cust.value == customarray[i]) {
+			document.iform.dstendport_cust.value = customarray[i];
 			document.iform.localbeginport_cust.value = customarray[i];
-			document.iform.endport_cust.disabled = 1;
+			document.iform.dstendport_cust.disabled = 1;
 			document.iform.localbeginport.disabled = 1;
 			document.iform.localbeginport_cust.disabled = 1;
-			document.iform.endport_cust.disabled = 0;
+			document.iform.dstendport_cust.disabled = 0;
 			document.iform.localbeginport.disabled = 0;
 			document.iform.localbeginport_cust.disabled = 0;
 		}
-		if(document.iform.beginport.value == customarray[i]) {
-			document.iform.endport_cust.value = customarray[i];
+		if(document.iform.dstbeginport.value == customarray[i]) {
+			document.iform.dstendport_cust.value = customarray[i];
 			document.iform.localbeginport_cust.value = customarray[i];
-			document.iform.endport_cust.disabled = 1;
+			document.iform.dstendport_cust.disabled = 1;
 			document.iform.localbeginport.disabled = 1;
 			document.iform.localbeginport_cust.disabled = 1;
-			document.iform.endport_cust.disabled = 0;
+			document.iform.dstendport_cust.disabled = 0;
 			document.iform.localbeginport.disabled = 0;
 			document.iform.localbeginport_cust.disabled = 0;
 		}
-		if(document.iform.endport_cust.value == customarray[i]) {
-			document.iform.endport_cust.value = customarray[i];
+		if(document.iform.dstendport_cust.value == customarray[i]) {
+			document.iform.dstendport_cust.value = customarray[i];
 			document.iform.localbeginport_cust.value = customarray[i];
-			document.iform.endport_cust.disabled = 1;
+			document.iform.dstendport_cust.disabled = 1;
 			document.iform.localbeginport.disabled = 1;
 			document.iform.localbeginport_cust.disabled = 1;
-			document.iform.endport_cust.disabled = 0;
+			document.iform.dstendport_cust.disabled = 0;
 			document.iform.localbeginport.disabled = 0;
 			document.iform.localbeginport_cust.disabled = 0;
 		}
-		if(document.iform.endport.value == customarray[i]) {
-			document.iform.endport_cust.value = customarray[i];
+		if(document.iform.dstendport.value == customarray[i]) {
+			document.iform.dstendport_cust.value = customarray[i];
 			document.iform.localbeginport_cust.value = customarray[i];
-			document.iform.endport_cust.disabled = 1;
+			document.iform.dstendport_cust.disabled = 1;
 			document.iform.localbeginport.disabled = 1;
 			document.iform.localbeginport_cust.disabled = 1;
-			document.iform.endport_cust.disabled = 0;
+			document.iform.dstendport_cust.disabled = 0;
 			document.iform.localbeginport.disabled = 0;
 			document.iform.localbeginport_cust.disabled = 0;
 		}
+
 	}
 }
 
 function proto_change() {
-	if(document.iform.proto.selectedIndex > 2) {
-		document.iform.beginport_cust.disabled = 1;
-		document.iform.endport_cust.disabled = 1;
-		document.iform.beginport.disabled = 1;
-		document.iform.endport.disabled = 1;
-		document.iform.localbeginport_cust.disabled = 1;
-		document.iform.localbeginport.disabled = 1;
+	if (document.iform.proto.selectedIndex < 3) {
+		portsenabled = 1;
 	} else {
-		document.iform.beginport_cust.disabled = 0;
-		document.iform.endport_cust.disabled = 0;
-		document.iform.beginport.disabled = 0;
-		document.iform.endport.disabled = 0;
-		document.iform.localbeginport_cust.disabled = 0;
-		document.iform.localbeginport.disabled = 0;
+		portsenabled = 0;
+	}
+
+	if(document.iform.proto.selectedIndex >= 0 && document.iform.proto.selectedIndex <= 2) {
+		document.getElementById("sprtable").style.display = showsource == 1 ? '':'none';
+		document.getElementById("dprtr").style.display = '';
+		document.getElementById("lprtr").style.display = '';
+	} else {
+		document.getElementById("sprtable").style.display = 'none';
+		document.getElementById("dprtr").style.display = 'none';
+		document.getElementById("lprtr").style.display = 'none';
+	}
+}
+
+function typesel_change() {
+	switch (document.iform.srctype.selectedIndex) {
+		case 1:	/* single */
+			document.iform.src.disabled = 0;
+			document.iform.srcmask.value = "";
+			document.iform.srcmask.disabled = 1;
+			break;
+		case 2:	/* network */
+			document.iform.src.disabled = 0;
+			document.iform.srcmask.disabled = 0;
+			break;
+		default:
+			document.iform.src.value = "";
+			document.iform.src.disabled = 1;
+			document.iform.srcmask.value = "";
+			document.iform.srcmask.disabled = 1;
+			break;
+	}
+	if( dstenabled )
+	{
+		switch (document.iform.dsttype.selectedIndex) {
+			case 1:	/* single */
+				document.iform.dst.disabled = 0;
+				document.iform.dstmask.value = "";
+				document.iform.dstmask.disabled = 1;
+				break;
+			case 2:	/* network */
+				document.iform.dst.disabled = 0;
+				document.iform.dstmask.disabled = 0;
+				break;
+			default:
+				document.iform.dst.value = "";
+				document.iform.dst.disabled = 1;
+				document.iform.dstmask.value = "";
+				document.iform.dstmask.disabled = 1;
+				break;
+		}
+	}
+}
+
+function src_rep_change() {
+	document.iform.srcendport.selectedIndex = document.iform.srcbeginport.selectedIndex;
+}
+
+function dst_rep_change() {
+	document.iform.dstendport.selectedIndex = document.iform.dstbeginport.selectedIndex;
+}
+
+function dst_change( iface, old_iface, old_dst ) {
+	if ( ( old_dst == "" ) || ( old_iface.concat("ip") == old_dst ) ) {
+		document.iform.dsttype.value = iface.concat("ip");
 	}
 }
 //-->
diff --git a/usr/local/www/javascript/firewall_rules_edit/firewall_rules_edit.js b/usr/local/www/javascript/firewall_rules_edit/firewall_rules_edit.js
index 75bcb62..1b7f33a 100644
--- a/usr/local/www/javascript/firewall_rules_edit/firewall_rules_edit.js
+++ b/usr/local/www/javascript/firewall_rules_edit/firewall_rules_edit.js
@@ -1,6 +1,6 @@
 <!--
 var portsenabled = 1;
-var dstenabled = 1;
+var editenabled = 1;
 
 function ext_change() {
 	if ((document.iform.srcbeginport.selectedIndex == 0) && portsenabled) {
@@ -15,13 +15,13 @@ function ext_change() {
 		document.iform.srcendport_cust.value = "";
 		document.iform.srcendport_cust.disabled = 1;
 	}
-	if ((document.iform.dstbeginport.selectedIndex == 0) && portsenabled && dstenabled) {
+	if ((document.iform.dstbeginport.selectedIndex == 0) && portsenabled && editenabled) {
 		document.iform.dstbeginport_cust.disabled = 0;
 	} else {
 		document.iform.dstbeginport_cust.value = "";
 		document.iform.dstbeginport_cust.disabled = 1;
 	}
-	if ((document.iform.dstendport.selectedIndex == 0) && portsenabled && dstenabled) {
+	if ((document.iform.dstendport.selectedIndex == 0) && portsenabled && editenabled) {
 		document.iform.dstendport_cust.disabled = 0;
 	} else {
 		document.iform.dstendport_cust.value = "";
@@ -36,7 +36,7 @@ function ext_change() {
 	} else {
 		document.iform.srcbeginport.disabled = 0;
 		document.iform.srcendport.disabled = 0;
-		if( dstenabled ) {
+		if( editenabled ) {
 			document.iform.dstbeginport.disabled = 0;
 			document.iform.dstendport.disabled = 0;
 		}
@@ -49,25 +49,24 @@ function show_source_port_range() {
 }
 
 function typesel_change() {
-	switch (document.iform.srctype.selectedIndex) {
-		case 1:	/* single */
-			document.iform.src.disabled = 0;
-			document.iform.srcmask.value = "";
-			document.iform.srcmask.disabled = 1;
-			break;
-		case 2:	/* network */
-			document.iform.src.disabled = 0;
-			document.iform.srcmask.disabled = 0;
-			break;
-		default:
-			document.iform.src.value = "";
-			document.iform.src.disabled = 1;
-			document.iform.srcmask.value = "";
-			document.iform.srcmask.disabled = 1;
-			break;
-	}
-	if( dstenabled )
-	{
+	if( editenabled ) {
+		switch (document.iform.srctype.selectedIndex) {
+			case 1:	/* single */
+				document.iform.src.disabled = 0;
+				document.iform.srcmask.value = "";
+				document.iform.srcmask.disabled = 1;
+				break;
+			case 2:	/* network */
+				document.iform.src.disabled = 0;
+				document.iform.srcmask.disabled = 0;
+				break;
+			default:
+				document.iform.src.value = "";
+				document.iform.src.disabled = 1;
+				document.iform.srcmask.value = "";
+				document.iform.srcmask.disabled = 1;
+				break;
+		}
 		switch (document.iform.dsttype.selectedIndex) {
 			case 1:	/* single */
 				document.iform.dst.disabled = 0;
@@ -118,7 +117,9 @@ function proto_change() {
 
 	if(document.iform.proto.selectedIndex >= 0 && document.iform.proto.selectedIndex <= 2) {
 		document.getElementById("dprtr").style.display = '';
-		document.getElementById("showadvancedboxspr").innerHTML='<p><input type="button" onClick="show_source_port_range()" value="Advanced"></input> - Show source port range</a>';
+		if (editenabled) {
+			document.getElementById("showadvancedboxspr").innerHTML='<p><input type="button" onClick="show_source_port_range()" value="Advanced"></input> - Show source port range</a>';
+		}
 	} else {
 		document.getElementById("sprtable").style.display = 'none';
 		document.getElementById("dprtr").style.display = 'none';
diff --git a/usr/local/www/javascript/row_helper.js b/usr/local/www/javascript/row_helper.js
index 8193043..476602b 100755
--- a/usr/local/www/javascript/row_helper.js
+++ b/usr/local/www/javascript/row_helper.js
@@ -28,6 +28,8 @@ var addRowTo = (function() {
 			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input size='" + rowsize[i] + "' class='formfld unknown' name='" + rowname[i] + totalrows + "' id='" + rowname[i] + totalrows + "'></input> ";
 		} else if(rowtype[i] == 'select') {
 			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><select size='1' name='" + rowname[i] + totalrows + "'><option value=\"32\" selected>32</option><option value=\"31\" >31</option><option value=\"30\" >30</option><option value=\"29\" >29</option><option value=\"28\" >28</option><option value=\"27\" >27</option><option value=\"26\" >26</option><option value=\"25\" >25</option><option value=\"24\" >24</option><option value=\"23\" >23</option><option value=\"22\" >22</option><option value=\"21\" >21</option><option value=\"20\" >20</option><option value=\"19\" >19</option><option value=\"18\" >18</option><option value=\"17\" >17</option><option value=\"16\" >16</option><option value=\"15\" >15</option><option value=\"14\" >14</option><option value=\"13\" >13</option><option value=\"12\" >12</option><option value=\"11\" >11</option><option value=\"10\" >10</option><option value=\"9\" >9</option><option value=\"8\" >8</option><option value=\"7\" >7</option><option value=\"6\" >6</option><option value=\"5\" >5</option><option value=\"4\" >4</option><option value=\"3\" >3</option><option value=\"2\" >2</option><option value=\"1\" >1</option></select> ";
+		} else if(rowtype[i] == 'select_source') {
+			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><select size='1' name='" + rowname[i] + totalrows + "'><option value=\"32\" selected>32</option><option value=\"31\" >31</option><option value=\"30\" >30</option><option value=\"29\" >29</option><option value=\"28\" >28</option><option value=\"27\" >27</option><option value=\"26\" >26</option><option value=\"25\" >25</option><option value=\"24\" >24</option><option value=\"23\" >23</option><option value=\"22\" >22</option><option value=\"21\" >21</option><option value=\"20\" >20</option><option value=\"19\" >19</option><option value=\"18\" >18</option><option value=\"17\" >17</option><option value=\"16\" >16</option><option value=\"15\" >15</option><option value=\"14\" >14</option><option value=\"13\" >13</option><option value=\"12\" >12</option><option value=\"11\" >11</option><option value=\"10\" >10</option><option value=\"9\" >9</option><option value=\"8\" >8</option><option value=\"7\" >7</option><option value=\"6\" >6</option><option value=\"5\" >5</option><option value=\"4\" >4</option><option value=\"3\" >3</option><option value=\"2\" >2</option><option value=\"1\" >1</option></select> ";
 		} else {
 			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input type='checkbox' name='" + rowname[i] + totalrows + "'></input> ";
 		}
diff --git a/usr/local/www/javascript/row_helper_dynamic.js b/usr/local/www/javascript/row_helper_dynamic.js
index 778f182..032874c 100755
--- a/usr/local/www/javascript/row_helper_dynamic.js
+++ b/usr/local/www/javascript/row_helper_dynamic.js
@@ -31,6 +31,8 @@ var addRowTo = (function() {
 			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input size='" + objectSize + "' name='" + rowname[i] + totalrows + "' id='" + rowname[i] + totalrows + "'></input> ";
 		} else if(rowtype[i] == 'select') {
 			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><select name='" + rowname[i] + totalrows + "' id='" + rowname[i] + totalrows + "'>" + newrow[i] + "</select> ";
+		} else if(rowtype[i] == 'select_source') {
+			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><select name='" + rowname[i] + totalrows + "' id='" + rowname[i] + totalrows + "'>" + newrow[i] + "</select> ";
 		} else if(rowtype[i] == 'checkbox') {
 			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input type='checkbox'name='" + rowname[i] + totalrows + "' id='" + rowname[i] + totalrows + "'></input> ";
 		} else if(rowtype[i] == 'input') {