Change ALIAS color to pfSense red. Add a dropdown box that lists aliases on the rules that when you select it will fill in the alias name in either src or dst boxes.

2 files changed, 28 insertions, 1 deletions

diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php
index 0bbd832..5d5d023 100755
--- a/usr/local/www/firewall_rules_edit.php
+++ b/usr/local/www/firewall_rules_edit.php
@@ -436,6 +436,18 @@ function src_rep_change() {
 function dst_rep_change() {
 	document.iform.dstendport.selectedIndex = document.iform.dstbeginport.selectedIndex;
 }
+function assignaliastofield(dst, dstsrc, dstype) {
+	dst.value = dstsrc.value;
+	dstsrc.value = "";
+	if(dstype == 'src') {
+		this.iform.srctype.selectedIndex = 1;
+		this.iform.src.disabled = 0;
+	} else {
+		this.iform.dsttype.selectedIndex = 1;
+		this.iform.dst.disabled = 0;
+	}
+
+}
 //-->
 </script>
 </head>
@@ -568,6 +580,14 @@ Hint: the difference between block and reject is that with reject, a packet (TCP
 						<option value="<?=$i;?>" <?php if ($i == $pconfig['srcmask']) echo "selected"; ?>><?=$i;?></option>
 						<?php endfor; ?>
 						</select>
+
+						 <select name="assignaliasa" id="assignaliasa" onChange="assignaliastofield(src, this, 'src');"><option></option>
+						<?php
+						foreach ($config['aliases']['alias'] as $alias) {
+							echo "<option value=\"" . $alias['name'] . "\">" . $alias['name'] . "</option>\n";
+						}
+						?>
+						</select>
 						</td>
 					  </tr>
                     </table></td>
@@ -648,6 +668,12 @@ Hint: the difference between block and reject is that with reject, a packet (TCP
 						<?php for ($i = 31; $i > 0; $i--): ?>
 						<option value="<?=$i;?>" <?php if ($i == $pconfig['dstmask']) echo "selected"; ?>><?=$i;?></option>
 						<?php endfor; ?>
+						</select>  <select name="assignaliasb" id="assignaliasb" onChange="assignaliastofield(dst, this, 'dst');"><option></option>
+						<?php
+						foreach ($config['aliases']['alias'] as $alias) {
+							echo "<option value=\"" . $alias['name'] . "\">" . $alias['name'] . "</option>\n";
+						}
+						?>
 						</select></td>
                       </tr>
                     </table></td>
diff --git a/usr/local/www/gui.css b/usr/local/www/gui.css
index 8d4996a..0c51fe6 100755
--- a/usr/local/www/gui.css
+++ b/usr/local/www/gui.css
@@ -31,7 +31,8 @@ form {
 
 }
 .formfldalias {
-	background-color: #B87D3E;
+	background-color: #990000;
+	color: #FFFFFF;
 }
 .formpre {
 	font-family: Courier New, Courier, monospaced;