From 3c9d543d6807df4051e62bd4f4203abad56a92ca Mon Sep 17 00:00:00 2001
From: Chris Buechler <cmb@pfsense.org>
Date: Sun, 1 Aug 2010 16:09:10 -0400
Subject: Don't use WAN/LAN if an interface descr exists  ticket #783

---
 usr/local/www/firewall_nat.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'usr/local/www/firewall_nat.php')

diff --git a/usr/local/www/firewall_nat.php b/usr/local/www/firewall_nat.php
index 84fc0e8..4e30c56 100755
--- a/usr/local/www/firewall_nat.php
+++ b/usr/local/www/firewall_nat.php
@@ -261,9 +261,9 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
                   <td class="listlr" onClick="fr_toggle(<?=$nnats;?>)" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
                     <?=$textss;?>
 		    <?php
-			if (!$natent['interface'] || ($natent['interface'] == "wan"))
+			if (!$natent['interface'] || ($natent['interface'] == "wan") && !isset($config['interfaces'][$natent['interface']]['descr']))
 				echo "WAN";
-			else if(strtolower($natent['interface']) == "lan")
+			else if(strtolower($natent['interface']) == "lan" && !isset($config['interfaces'][$natent['interface']]['descr']))
 				echo "LAN";
 			else
 				echo strtoupper($config['interfaces'][$natent['interface']]['descr']);
-- 
cgit v1.1


From 8b35aa779f17c034cb9a43fcbad8a2186f6966c9 Mon Sep 17 00:00:00 2001
From: Erik Fonnesbeck <efonnes@gmail.com>
Date: Sun, 1 Aug 2010 21:42:35 -0600
Subject: Fix interface name display for various cases on NAT rule listings.

---
 usr/local/www/firewall_nat.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'usr/local/www/firewall_nat.php')

diff --git a/usr/local/www/firewall_nat.php b/usr/local/www/firewall_nat.php
index 4e30c56..02a2595 100755
--- a/usr/local/www/firewall_nat.php
+++ b/usr/local/www/firewall_nat.php
@@ -261,12 +261,10 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
                   <td class="listlr" onClick="fr_toggle(<?=$nnats;?>)" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
                     <?=$textss;?>
 		    <?php
-			if (!$natent['interface'] || ($natent['interface'] == "wan") && !isset($config['interfaces'][$natent['interface']]['descr']))
-				echo "WAN";
-			else if(strtolower($natent['interface']) == "lan" && !isset($config['interfaces'][$natent['interface']]['descr']))
-				echo "LAN";
+			if (!$natent['interface'])
+				echo htmlspecialchars(convert_friendly_interface_to_friendly_descr("wan"));
 			else
-				echo strtoupper($config['interfaces'][$natent['interface']]['descr']);
+				echo htmlspecialchars(convert_friendly_interface_to_friendly_descr($natent['interface']));
 		    ?>
                     <?=$textse;?>
                   </td>
-- 
cgit v1.1