Commit 9891bfb7 authored by djGrrr's avatar djGrrr Committed by Franco Fichtner

fix double encoding of NO NAT for NAT addresses

(cherry picked from commit d4cf6d17)
parent 0125ecec
...@@ -447,18 +447,18 @@ include("head.inc"); ...@@ -447,18 +447,18 @@ include("head.inc");
elseif ($natent['target'] == "other-subnet") elseif ($natent['target'] == "other-subnet")
$nat_address = $natent['targetip'] . '/' . $natent['targetip_subnet']; $nat_address = $natent['targetip'] . '/' . $natent['targetip_subnet'];
else else
$nat_address = $natent['target']; $nat_address = htmlspecialchars($natent['target']);
?> ?>
<?php if (isset($natent['target']) && is_alias($natent['target'])): ?> <?php if (isset($natent['target']) && is_alias($natent['target'])): ?>
<span title="<?=htmlspecialchars(get_alias_description($natent['target']));?>" data-toggle="tooltip"> <span title="<?=htmlspecialchars(get_alias_description($natent['target']));?>" data-toggle="tooltip">
<?=htmlspecialchars($nat_address);?>&nbsp; <?=$nat_address;?>&nbsp;
</span> </span>
<a href="/firewall_aliases_edit.php?name=<?=htmlspecialchars($natent['target']);?>" <a href="/firewall_aliases_edit.php?name=<?=htmlspecialchars($natent['target']);?>"
title="<?=gettext("edit alias");?>" data-toggle="tooltip"> title="<?=gettext("edit alias");?>" data-toggle="tooltip">
<i class="fa fa-list"></i> <i class="fa fa-list"></i>
</a> </a>
<?php else: ?> <?php else: ?>
<?=htmlspecialchars($nat_address);?> <?=$nat_address;?>
<?php endif; ?> <?php endif; ?>
</td> </td>
<td class="hidden-xs hidden-sm"> <td class="hidden-xs hidden-sm">
...@@ -611,7 +611,7 @@ include("head.inc"); ...@@ -611,7 +611,7 @@ include("head.inc");
} elseif ($natent['target'] == "other-subnet") { } elseif ($natent['target'] == "other-subnet") {
$nat_address = $natent['targetip'] . '/' . $natent['targetip_subnet']; $nat_address = $natent['targetip'] . '/' . $natent['targetip_subnet'];
} else { } else {
$nat_address = $natent['target']; $nat_address = htmlspecialchars($natent['target']);
} }
?> ?>
<?=$nat_address;?> <?=$nat_address;?>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment