summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorErik Fonnesbeck <efonnes@gmail.com>2013-01-05 08:47:49 -0700
committerErik Fonnesbeck <efonnes@gmail.com>2013-01-05 08:47:49 -0700
commitd5d6c0add7954f2fc6d3bae08190e598a152f145 (patch)
treef8f5365492cf5d47df27236887b7365e186a080d /usr
parent0c8e9f0c26b29f57faa2ccef9a559774103fee79 (diff)
downloadpfsense-d5d6c0add7954f2fc6d3bae08190e598a152f145.zip
pfsense-d5d6c0add7954f2fc6d3bae08190e598a152f145.tar.gz
Revert "Use get_Cofnigured_interface_with_descr() here since that's the purpose"
This reverts commit 0c8e9f0c26b29f57faa2ccef9a559774103fee79.
Diffstat (limited to 'usr')
-rwxr-xr-xusr/local/www/firewall_nat_out.php15
1 files changed, 9 insertions, 6 deletions
diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php
index d777d23..3c3fc54 100755
--- a/usr/local/www/firewall_nat_out.php
+++ b/usr/local/www/firewall_nat_out.php
@@ -367,17 +367,20 @@ include("head.inc");
</table>
</td>
</tr>
- <?php
- $ifdescr = get_configured_interface_with_descr(false, true);
- $nnats = $i = 0; foreach ($a_out as $natent):
- if (!$natent['interface'] || !isset($ifdescr[$natent['interface']]))
- continue;
+ <?php $nnats = $i = 0; foreach ($a_out as $natent): ?>
+ <?php
+ global $FilterIflist;
+ if(empty($FilterIflist)) {
+ filter_generate_optcfg_array();
+ }
+ if (!$natent['interface'] || !isset($FilterIflist[$natent['interface']]))
+ continue;
?>
<tr valign="top" id="fr<?=$nnats;?>">
<td class="listt"><input type="checkbox" id="frc<?=$nnats;?>" name="rule[]" value="<?=$i;?>" onClick="fr_bgcolor('<?=$nnats;?>')" style="margin: 0; padding: 0; width: 15px; height: 15px;"></td>
<td class="listt" align="center"></td>
<td class="listlr" onClick="fr_toggle(<?=$nnats;?>)" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_out_edit.php?id=<?=$nnats;?>';">
- <?php echo htmlspecialchars($ifdescr[$natent['interface']]); ?>
+ <?php echo htmlspecialchars(convert_friendly_interface_to_friendly_descr($natent['interface'])); ?>
&nbsp;
</td>
<td class="listr" onClick="fr_toggle(<?=$nnats;?>)" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_out_edit.php?id=<?=$nnats;?>';">
OpenPOWER on IntegriCloud