From edae72bf50dcdae223a3710d646040acc1333306 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Wed, 19 Aug 2015 14:04:41 +0000
Subject: [PATCH] (legacy) regression, fix aliasses in firewall_nat.php

---
 src/www/firewall_nat.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/www/firewall_nat.php b/src/www/firewall_nat.php
index f631a6532..1a69c3ed9 100644
--- a/src/www/firewall_nat.php
+++ b/src/www/firewall_nat.php
@@ -361,26 +361,26 @@ $( document ).ready(function() {
                       </td>
                       <td class="hidden-xs hidden-sm">
                         <?=htmlspecialchars(pprint_address($natent['source']));?>
-<?php                   if (is_alias(pprint_address($natent['source']))): ?>
-                        &nbsp;<a href="/firewall_aliases_edit.php?name=<?=htmlspecialchars(pprint_address($natent['source']));?>"><i class="fa fa-list"></i> </a>
+<?php                   if (isset($natent['source']['address']) && is_alias($natent['source']['address'])): ?>
+                        &nbsp;<a href="/firewall_aliases_edit.php?name=<?=htmlspecialchars($natent['source']['address']);?>"><i class="fa fa-list"></i> </a>
 <?php                   endif; ?>
                       </td>
                       <td class="hidden-xs hidden-sm">
                         <?=htmlspecialchars(pprint_port($natent['source']['port']));?>
-<?php                   if (is_alias(pprint_port($natent['source']['port']))): ?>
-                        &nbsp;<a href="/firewall_aliases_edit.php?name=<?=htmlspecialchars(pprint_port($natent['source']['port']));?>"><i class="fa fa-list"></i> </a>
+<?php                   if (is_alias($natent['source']['port'])): ?>
+                        &nbsp;<a href="/firewall_aliases_edit.php?name=<?=htmlspecialchars($natent['source']['port']);?>"><i class="fa fa-list"></i> </a>
 <?php                   endif; ?>
                       </td>
                       <td class="hidden-xs hidden-sm">
                         <?=htmlspecialchars(pprint_address($natent['destination']));?>
-<?php                   if (is_alias(pprint_address($natent['destination']))): ?>
-                        &nbsp;<a href="/firewall_aliases_edit.php?name=<?=htmlspecialchars(pprint_address($natent['destination']));?>"><i class="fa fa-list"></i> </a>
+<?php                   if (isset($natent['destination']['address']) && is_alias($natent['destination']['address'])): ?>
+                        &nbsp;<a href="/firewall_aliases_edit.php?name=<?=htmlspecialchars($natent['destination']['address']);?>"><i class="fa fa-list"></i> </a>
 <?php                   endif; ?>
                       </td>
                       <td class="hidden-xs hidden-sm">
                         <?=htmlspecialchars(pprint_port($natent['destination']['port']));?>
-<?php                   if (is_alias(pprint_port($natent['destination']['port']))): ?>
-                        &nbsp;<a href="/firewall_aliases_edit.php?name=<?=htmlspecialchars(pprint_port($natent['destination']['port']));?>"><i class="fa fa-list"></i> </a>
+<?php                   if (is_alias($natent['destination']['port'])): ?>
+                        &nbsp;<a href="/firewall_aliases_edit.php?name=<?=htmlspecialchars($natent['destination']['port']);?>"><i class="fa fa-list"></i> </a>
 <?php                   endif; ?>
                       </td>
                       <td>
@@ -399,8 +399,8 @@ $( document ).ready(function() {
                         }
 ?>
 												<?=htmlspecialchars(pprint_port($localport));?>
-<?php                   if (is_alias(pprint_port($localport))): ?>
-                        &nbsp;<a href="/firewall_aliases_edit.php?name=<?=htmlspecialchars(pprint_port($localport));?>"><i class="fa fa-list"></i> </a>
+<?php                   if (is_alias($localport)): ?>
+                        &nbsp;<a href="/firewall_aliases_edit.php?name=<?=htmlspecialchars($localport);?>"><i class="fa fa-list"></i> </a>
 <?php                   endif; ?>
 									  </td>
                       <td>