Deal with new fields of Improved NAT Port Forward

1 files changed, 34 insertions, 49 deletions

diff --git a/usr/local/www/firewall_nat.php b/usr/local/www/firewall_nat.php
index 696248f..a3f9ce9 100755
--- a/usr/local/www/firewall_nat.php
+++ b/usr/local/www/firewall_nat.php
@@ -185,9 +185,12 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
                   <td width="3%" class="list">&nbsp;</td>
                   <td width="5%" class="listhdrr">If</td>
                   <td width="5%" class="listhdrr">Proto</td>
-                  <td width="20%" class="listhdrr">Ext. port range</td>
+                  <td width="20%" class="listhdrr">Src. addr</td>
+                  <td width="20%" class="listhdrr">Src. ports</td>
+                  <td width="20%" class="listhdrr">Dest. addr</td>
+                  <td width="20%" class="listhdrr">Dest. ports</td>
                   <td width="20%" class="listhdrr">NAT IP</td>
-                  <td width="20%" class="listhdrr">Int. port range</td>
+                  <td width="20%" class="listhdrr">NAT Ports</td>
                   <td width="20%" class="listhdr">Description</td>
                   <td width="5%" class="list">
                     <table border="0" cellspacing="0" cellpadding="1">
@@ -202,26 +205,19 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
 	<?php 
 	
 		//build Alias popup box
-		$span_begin = "";
-		$span_end = "";
-		$alias_src_port_span_begin = "";
-		$alias_dst_span_begin = "";
-		$alias_dst_port_span_begin = "";
-		
-		list($beginport, $endport) = split("-", $natent['external-port']);		
-		
-		$alias_popup = rule_popup("",$beginport,$natent['target'],$natent['local-port']);
 		$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_src_span_begin      = $alias_popup["src"];
 		$alias_src_port_span_begin = $alias_popup["srcport"];
-											
-		$alias_dst_span_begin = $alias_popup["dst"];
-												
+		$alias_dst_span_begin      = $alias_popup["dst"];
 		$alias_dst_port_span_begin = $alias_popup["dstport"];
-													
-		
 
+		$alias_popup = rule_popup("","",$natent['target'], pprint_port($natent['local-port']));
+
+		$alias_target_span_begin     = $alias_popup["dst"];
+		$alias_local_port_span_begin = $alias_popup["dstport"];
 	
 		/* if user does not have access to edit an interface skip on to the next record */
 		if(!have_natpfruleint_access($natent['interface'])) 
@@ -247,46 +243,32 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
 				echo strtoupper($config['interfaces'][$natent['interface']]['descr']);
 		    ?>
                   </td>
+
                   <td class="listr" onClick="fr_toggle(<?=$nnats;?>)" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
                     <?=strtoupper($natent['protocol']);?>
                   </td>
+
+                  <td class="listr" onClick="fr_toggle(<?=$nnats;?>)" 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;?>
+                  </td>
                   <td class="listr" onClick="fr_toggle(<?=$nnats;?>)" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
-                    <?php
-						list($beginport, $endport) = split("-", $natent['external-port']);
-						if ((!$endport) || ($beginport == $endport)) {
-							echo $alias_src_port_span_begin;
-				  			echo $beginport;
-							if ($wkports[$beginport])
-								echo " (" . $wkports[$beginport] . ")";
-							else
-								echo "&nbsp;";
-							echo $span_end;
-						} else
-							echo $beginport . " - " . $endport;
-				  ?>
+				    <?=$textss;?><?php echo $alias_src_port_span_begin;?><?php echo htmlspecialchars(pprint_port($natent['source']['port']));?><?php echo $alias_src_port_span_end;?><?=$textse;?>
+                  </td>
+
+                  <td class="listr" onClick="fr_toggle(<?=$nnats;?>)" 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;?>
                   </td>
                   <td class="listr" onClick="fr_toggle(<?=$nnats;?>)" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
-                    <?php echo $alias_dst_span_begin;?><?=$natent['target'];?><?php echo $span_end;?>
-					<?php if ($natent['external-address'])
-						echo "<br>(ext.: " . $natent['external-address'] . ")";
-					      else
-						echo "<br>(ext.: " . find_interface_ip(convert_friendly_interface_to_real_interface_name($natent['interface'])) . ")";
-					?>
+				    <?=$textss;?><?php echo $alias_dst_port_span_begin;?><?php echo htmlspecialchars(pprint_port($natent['destination']['port']));?><?php echo $alias_dst_port_span_end;?><?=$textse;?>
                   </td>
+
                   <td class="listr" onClick="fr_toggle(<?=$nnats;?>)" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
-                    <?php if ((!$endport) || ($beginport == $endport)) {
-				  			echo $alias_dst_port_span_begin;
-                    		echo $natent['local-port'];
-							if ($wkports[$natent['local-port']])
-								echo " (" . $wkports[$natent['local-port']] . ")";
-							else
-								echo "&nbsp;";
-							echo $span_end;
-						} else
-							echo $natent['local-port'] . " - " .
-								($natent['local-port']+$endport-$beginport);
-				  ?>
+				    <?=$textss;?><?php echo $alias_target_span_begin;?><?php echo htmlspecialchars($natent['target']);?><?php echo $alias_target_span_end;?><?=$textse;?>
                   </td>
+                  <td class="listr" onClick="fr_toggle(<?=$nnats;?>)" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
+				    <?=$textss;?><?php echo $alias_local_port_span_begin;?><?php echo htmlspecialchars(pprint_port($natent['local-port']));?><?php echo $alias_local_port_span_end;?><?=$textse;?>
+                  </td>
+
                   <td class="listbg" onClick="fr_toggle(<?=$nnats;?>)" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
                     <?=htmlspecialchars($natent['descr']);?>&nbsp;
                   </td>
@@ -304,6 +286,9 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
   	     <?php $i++; $nnats++; endforeach; ?>
                 <tr>
                   <td class="list" colspan="8"></td>
+                  <td>&nbsp;</td>
+                  <td>&nbsp;</td>
+                  <td>&nbsp;</td>
                   <td class="list" valign="middle" nowrap>
                     <table border="0" cellspacing="0" cellpadding="1">
                       <tr>