diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-03 10:59:34 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-03 10:59:34 -0300 |
| commit | 270f81d9607be5f372a4bb89bbb53dd1e45a1f82 (patch) | |
| tree | b9511afa10dfd1b311606a74af707f000b50e9e4 /usr/local/www/firewall_nat.php | |
| parent | 416686be4caf89487f98f6bade2c6a72887e9157 (diff) | |
| parent | 073a2697dd86a8dece8dafa28b71084a547ba31e (diff) | |
| download | pfsense-270f81d9607be5f372a4bb89bbb53dd1e45a1f82.zip pfsense-270f81d9607be5f372a4bb89bbb53dd1e45a1f82.tar.gz | |
Merge remote branch 'mainline/master' into 2_firewall
Conflicts:
usr/local/www/diag_nanobsd.php
usr/local/www/diag_packet_capture.php
usr/local/www/firewall_shaper.php
Diffstat (limited to 'usr/local/www/firewall_nat.php')
| -rwxr-xr-x | usr/local/www/firewall_nat.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/usr/local/www/firewall_nat.php b/usr/local/www/firewall_nat.php index 4cab5d6..9646f52 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")) - echo "WAN"; - else if(strtolower($natent['interface']) == "lan") - 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> |
