mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix interface name display for various cases on NAT rule listings.

Browse Source
This commit is contained in:
Erik Fonnesbeck 2010-08-01 21:42:35 -06:00
parent 57c52d4507
commit 8b35aa779f
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr/local/www/firewall_nat.php
View File

@ -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>

6
usr/local/www/firewall_nat_1to1.php
View File

@ -117,10 +117,10 @@ include("head.inc");
<tr>
<td class="listlr" ondblclick="document.location='firewall_nat_1to1_edit.php?id=<?=$i;?>';">
<?php
if (!$natent['interface'] || ($natent['interface'] == "wan"))
echo "WAN";
if (!$natent['interface'])
echo htmlspecialchars(convert_friendly_interface_to_friendly_descr("wan"));
else
echo htmlspecialchars($config['interfaces'][$natent['interface']]['descr']);
echo htmlspecialchars(convert_friendly_interface_to_friendly_descr($natent['interface']));
?>
</td>
<td class="listr" ondblclick="document.location='firewall_nat_1to1_edit.php?id=<?=$i;?>';">

10
usr/local/www/firewall_nat_out.php
View File

@ -361,14 +361,10 @@ include("head.inc");
<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
if (!$natent['interface'] || ($natent['interface'] == "wan"))
echo "WAN";
else if (!$natent['interface'] || ($natent['interface'] == "lan"))
echo "LAN";
else if ($natent['interface'] == "openvpn")
echo "OpenVPN";
if (!$natent['interface'])
echo htmlspecialchars(convert_friendly_interface_to_friendly_descr("wan"));
else
echo htmlspecialchars($config['interfaces'][$natent['interface']]['descr']);
echo htmlspecialchars(convert_friendly_interface_to_friendly_descr($natent['interface']));
?>
&nbsp;
</td>