Correctly turn off un-needed options such as subnet when selecting a type of "Port(s)", etc.

Ticket #864

2 files changed, 9 insertions, 8 deletions

diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php
index 04edfc5..8b30466 100755
--- a/usr/local/www/firewall_aliases_edit.php
+++ b/usr/local/www/firewall_aliases_edit.php
@@ -171,16 +171,17 @@ function typesel_change() {
 	switch (document.iform.type.selectedIndex) {
 		case 0:	/* host */
 			var cmd;
-			document.iform.address_subnet.disabled = 1;
 			document.iform.address_subnet.value = "";
 			document.iform.address_subnet.selected = 0;
+			document.iform.address_subnet.disabled = 1;
 			newrows = totalrows+100;
-			for(i=2; i<newrows; i++) {
-				var item = document.getElementById('document.iform.address_subnet' + i);
+			for(i=1; i<newrows; i++) {
+				var working_with = 'address_subnet' + i;
+				var item = document.getElementById(working_with);
 				if(item) {
-					comd = 'document.iform.address_subnet' + i + '.disabled = 1;';
+					comd = 'document.iform.' + working_with + '.value = "";';
 					eval(comd);
-					comd = 'document.iform.address_subnet' + i + '.value = "";';
+					comd = 'document.iform.' + working_with + '.disabled = 1;';
 					eval(comd);
 				}
 			}
@@ -190,7 +191,7 @@ function typesel_change() {
 			document.iform.address_subnet.disabled = 0;
 			newrows = totalrows+100;
 			for(i=2; i<newrows; i++) {
-				var item = document.getElementById('document.iform.address_subnet' + i);
+				var item = document.getElementById('address_subnet' + i);
 				if(item) {
 					comd = 'document.iform.address_subnet' + i + '.disabled = 0;';
 					eval(comd);
@@ -203,7 +204,7 @@ function typesel_change() {
 			document.iform.address_subnet.value = "";
 			newrows = totalrows+100;
 			for(i=2; i<newrows; i++) {
-				var item = document.getElementById('document.iform.address_subnet' + i);
+				var item = document.getElementById('address_subnet' + i);
 				if(item) {
 					comd = 'document.iform.address_subnet' + i + '.disabled = 1;';
 					eval(comd);
diff --git a/usr/local/www/row_helper.js b/usr/local/www/row_helper.js
index b38e82b..7794ea8 100755
--- a/usr/local/www/row_helper.js
+++ b/usr/local/www/row_helper.js
@@ -26,7 +26,7 @@ var addRowTo = (function() {
 		if(rowtype[i] == 'textbox') {
 			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input id='" + rowname[i] + totalrows + "' name='" + rowname[i] + totalrows + "'></input> ";
 		} else if(rowtype[i] == 'select') {
-			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><select id='" + rowname[i] + totalrows + "' 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> ";
+			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><select id='" + rowname[i] + totalrows + "' name='" + rowname[i] + totalrows + "'><option value=\"\" selected></option><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 id='" + rowname[i] + totalrows + "' type='checkbox' name='" + rowname[i] + totalrows + "'></input> ";
 		}