Commit 4d177fb5 authored by Ad Schellevis's avatar Ad Schellevis
parent f39eae42
...@@ -243,6 +243,8 @@ $main_buttons = array( ...@@ -243,6 +243,8 @@ $main_buttons = array(
$span_end = "</U></span>"; $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_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_span_begin = $alias_popup["src"];
$alias_src_port_span_begin = $alias_popup["srcport"]; $alias_src_port_span_begin = $alias_popup["srcport"];
...@@ -300,21 +302,47 @@ $main_buttons = array( ...@@ -300,21 +302,47 @@ $main_buttons = array(
</td> </td>
<td class="listr" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';"> <td class="listr" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
<?=$textss;?><?php echo $alias_src_span_begin;?><?php echo htmlspecialchars(pprint_address($natent['source']));?><?php echo $alias_src_span_end;?><?=$textse;?> <?=$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>
<td class="listr" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';"> <td class="listr" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
<?=$textss;?><?php echo $alias_src_port_span_begin;?><?php echo htmlspecialchars(pprint_port($natent['source']['port']));?><?php echo $alias_src_port_span_end;?><?=$textse;?> <?=$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>
<td class="listr" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';"> <td class="listr" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
<?=$textss;?><?php echo $alias_dst_span_begin;?><?php echo htmlspecialchars(pprint_address($natent['destination']));?><?php echo $alias_dst_span_end;?><?=$textse;?> <?=$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>
<td class="listr" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';"> <td class="listr" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
<?=$textss;?><?php echo $alias_dst_port_span_begin;?><?php echo htmlspecialchars(pprint_port($natent['destination']['port']));?><?php echo $alias_dst_port_span_end;?><?=$textse;?> <?=$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>
<td class="listr" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';"> <td class="listr" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
<?=$textss;?><?php echo $alias_target_span_begin;?><?php echo htmlspecialchars($natent['target']);?><?php echo $alias_target_span_end;?><?=$textse;?> <?=$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>
<td class="listr" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';"> <td class="listr" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
<?php <?php
...@@ -327,7 +355,11 @@ $main_buttons = array( ...@@ -327,7 +355,11 @@ $main_buttons = array(
$localport .= '-' . $localendport; $localport .= '-' . $localendport;
} }
?> ?>
<?=$textss;?><?php echo $alias_local_port_span_begin;?><?php echo htmlspecialchars(pprint_port($localport));?><?php echo $alias_local_port_span_end;?><?=$textse;?> <?=$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> </td>
<td class="listbg" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';"> <td class="listbg" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
......
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