* Allow setting of OPTional interface IP address correctly

* Print "Interface IP Address" in firewall rules summary when selected

Ticket #1052

2 files changed, 6 insertions, 2 deletions

diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php
index 24e44d5..36dcee3 100755
--- a/usr/local/www/firewall_rules_edit.php
+++ b/usr/local/www/firewall_rules_edit.php
@@ -571,7 +571,7 @@ include("head.inc");
 								<option value="pppoe" <?php if ($pconfig['dst'] == "pppoe") { echo "selected"; } ?>>PPPoE clients</option>
 <?php 							for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++): ?>
 									<option value="opt<?=$i;?>" <?php if ($pconfig['dst'] == "opt" . $i) { echo "selected"; } ?>><?=htmlspecialchars($config['interfaces']['opt' . $i]['descr']);?> subnet</option>
-									<option value="opt<?=$i;?>ip"<?php if ($pconfig['src'] == "opt" . $i . "ip") { echo "selected"; } ?>>
+									<option value="opt<?=$i;?>ip"<?php if ($pconfig['dst'] == "opt" . $i . "ip") { echo "selected"; } ?>>
 										<?=$config['interfaces']['opt' . $i]['descr']?> address
 									</option>
 <?php 							endfor; ?>
diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc
index 15a8b01..bad1d20 100755
--- a/usr/local/www/guiconfig.inc
+++ b/usr/local/www/guiconfig.inc
@@ -263,7 +263,11 @@ function pprint_address($adr) {
 	if (isset($adr['any'])) {
 		$padr = "*";
 	} else if ($adr['network']) {
-		$padr = $specialnets[$adr['network']];
+		if (preg_match("/opt[0-999]ip/", $adr['network'])) {
+			$padr = "Interface IP address";
+		} else {
+			$padr = $specialnets[$adr['network']];
+		}
 	} else {
 		$padr = $adr['address'];
 	}