From 0f18d2e1f9b7077e6b60d3ddb62ee79ec474985e Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Tue, 30 Jan 2018 18:02:05 +0100
Subject: [PATCH] firewall/outbound nat, align "NAT Address" output to edit
 page

---
 src/www/firewall_nat_out.php | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/www/firewall_nat_out.php b/src/www/firewall_nat_out.php
index 7217782ab..dbeeb8b2c 100644
--- a/src/www/firewall_nat_out.php
+++ b/src/www/firewall_nat_out.php
@@ -101,6 +101,15 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
 
 $mode = $config['nat']['outbound']['mode'];
 
+$interface_names= array();
+// add this hosts ips
+foreach ($config['interfaces'] as $intf => $intfdata) {
+    if (isset($intfdata['ipaddr']) && $intfdata['ipaddr'] != 'dhcp') {
+        $interface_names[$intfdata['ipaddr']] = (!empty($intfdata['descr']) ? $intfdata['descr'] : $intf ) . " " . gettext("address");
+    }
+}
+
+
 include("head.inc");
 
 ?>
@@ -383,14 +392,15 @@ include("head.inc");
                     <td class="hidden-xs hidden-sm">
 <?php
 
-                      if (isset($natent['nonat']))
-                        $nat_address = '<I>NO NAT</I>';
-                      elseif (!$natent['target'])
-                        $nat_address = htmlspecialchars(convert_friendly_interface_to_friendly_descr($natent['interface'])) . " address";
-                      elseif ($natent['target'] == "other-subnet")
-                        $nat_address = $natent['targetip'] . '/' . $natent['targetip_subnet'];
-                      else
-                        $nat_address = htmlspecialchars($natent['target']);
+                      if (isset($natent['nonat'])) {
+                          $nat_address = '<I>NO NAT</I>';
+                      } elseif (empty($natent['target'])) {
+                          $nat_address = gettext("Interface address");
+                      } elseif ($natent['target'] == "other-subnet") {
+                          $nat_address = $natent['targetip'] . '/' . $natent['targetip_subnet'];
+                      } else {
+                          $nat_address = htmlspecialchars($natent['target']);
+                      }
 ?>
 <?php                 if (isset($natent['target']) && is_alias($natent['target'])): ?>
                         <span title="<?=htmlspecialchars(get_alias_description($natent['target']));?>" data-toggle="tooltip">
@@ -400,6 +410,8 @@ include("head.inc");
                             title="<?=gettext("edit alias");?>" data-toggle="tooltip">
                           <i class="fa fa-list"></i>
                         </a>
+<?php                 elseif (!empty($interface_names[$nat_address])): ?>
+                        <?=$interface_names[$nat_address];?>
 <?php                 else: ?>
                         <?=$nat_address;?>
 <?php                 endif; ?>