From 1c96e1a511794fee798cd83536c84a768141daab Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Mon, 25 May 2015 20:32:43 +0000
Subject: [PATCH] (firewall) remove some alias popup leftovers in nat page

---
 src/www/firewall_nat.php | 40 ----------------------------------------
 1 file changed, 40 deletions(-)

diff --git a/src/www/firewall_nat.php b/src/www/firewall_nat.php
index 03a78ed68..6847c7a90 100644
--- a/src/www/firewall_nat.php
+++ b/src/www/firewall_nat.php
@@ -236,28 +236,6 @@ $main_buttons = array(
 											//build Alias popup box
 											$span_end = "</U></span>";
 
-											$alias_popup = rule_popup($natent['source']['address'], pprint_port($natent['source']['port']), $natent['destination']['address'], pprint_port($natent['destination']['port']));
-                                                                                        $alias_popup = rule_popup($natent['source']['address'], pprint_port($natent['source']['port']), $natent['destination']['address'], pprint_port($natent['destination']['port']));
-
-
-											$alias_src_span_begin      = $alias_popup["src"];
-											$alias_src_port_span_begin = $alias_popup["srcport"];
-											$alias_dst_span_begin      = $alias_popup["dst"];
-											$alias_dst_port_span_begin = $alias_popup["dstport"];
-
-											$alias_src_span_end        = $alias_popup["src_end"];
-											$alias_src_port_span_end   = $alias_popup["srcport_end"];
-											$alias_dst_span_end        = $alias_popup["dst_end"];
-											$alias_dst_port_span_end   = $alias_popup["dstport_end"];
-
-											$alias_popup = rule_popup("","",$natent['target'], pprint_port($natent['local-port']));
-
-											$alias_target_span_begin     = $alias_popup["dst"];
-											$alias_local_port_span_begin = $alias_popup["dstport"];
-
-											$alias_target_span_end       = $alias_popup["dst_end"];
-											$alias_local_port_span_end   = $alias_popup["dstport_end"];
-
 											if (isset($natent['disabled']))
 												$textss = "<span class=\"text-muted\">";
 											else
@@ -305,49 +283,34 @@ $main_buttons = array(
 									                  <td class="listr"  id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
 													    <?=$textss;?>
 													    <?php
-													    //if ($alias_src_span_begin) echo htmlspecialchars(pprint_address($alias_src_span_begin));
-													    //else
 													    echo htmlspecialchars(pprint_address($natent['source']));
-													    //if ($alias_src_span_end) echo htmlspecialchars(pprint_address($alias_src_span_end));
 													    ?>
 													    <?=$textse;?>
 									                  </td>
 									                  <td class="listr"  id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
 													    <?=$textss;?>
 													    <?php
-													    //if ($alias_src_port_span_begin) echo htmlspecialchars(pprint_port($alias_src_port_span_begin));
-													    //else
 													    echo htmlspecialchars(pprint_port($natent['source']['port']));
-													    //if($alias_src_port_span_end) echo htmlspecialchars(pprint_port($alias_src_port_span_end));
 													    ?><?=$textse;?>
 									                  </td>
 
 									                  <td class="listr"  id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
 													    <?=$textss;?>
 													    <?php
-													    //if ($alias_dst_span_begin) echo htmlspecialchars(pprint_address($alias_dst_span_begin));
-													    //else
 													    echo htmlspecialchars(pprint_address($natent['destination']));
-													    //if ($alias_dst_span_end)  echo htmlspecialchars(pprint_address($alias_dst_span_end));
 													    ?><?=$textse;?>
 									                  </td>
 									                  <td class="listr"  id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
 													    <?=$textss;?>
 													    <?php
-													    //if ($alias_dst_port_span_begin) echo htmlspecialchars(pprint_port($alias_dst_port_span_begin['address']));
-													    //else
 													    echo htmlspecialchars(pprint_port($natent['destination']['port']));
-													    //if ($alias_dst_port_span_end ) echo htmlspecialchars(pprint_port($alias_dst_port_span_end['address']));
 													    ?><?=$textse;?>
 									                  </td>
 
 									                  <td class="listr" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
 													    <?=$textss;?>
 													    <?php
-													    //if ($alias_target_span_begin) echo htmlspecialchars(pprint_address($alias_target_span_begin));
-													    //else
 													    echo htmlspecialchars($natent['target']);
-													    //if ($alias_target_span_end) echo htmlspecialchars(pprint_address($alias_target_span_end));
 													    ?><?=$textse;?>
 									                  </td>
 									                  <td class="listr"  id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
@@ -362,10 +325,7 @@ $main_buttons = array(
 															}
 														?>
 													    <?=$textss;?><?php
-													    //if ($alias_local_port_span_begin) echo htmlspecialchars(pprint_port($alias_local_port_span_begin['address']));
-													    //else
 													    echo htmlspecialchars(pprint_port($localport));
-													    //if ($alias_local_port_span_end) echo htmlspecialchars(pprint_port($alias_local_port_span_end['address']));
 													    ?><?=$textse;?>
 									                  </td>