Move alias popup to function. Display Alias popup for NATs now.

1 files changed, 10 insertions, 70 deletions

diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php
index ecb0295..b9a5ebf 100755
--- a/usr/local/www/firewall_rules.php
+++ b/usr/local/www/firewall_rules.php
@@ -208,30 +208,6 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
 <?php if (file_exists($d_filterconfdirty_path)): ?><p>
 <?php print_info_box_np("The firewall rule configuration has been changed.<br>You must apply the changes in order for them to take effect.");?><br>
 <?php endif; ?>
-<?php
-	$aliases_array = array();
-	if($config['aliases']['alias'] <> "" and is_array($config['aliases']['alias']))
-	{
-		foreach($config['aliases']['alias'] as $alias_name) 
-		{	
-		 	$alias_addresses = explode (" ", $alias_name['address']);
-		 	$alias_details = explode ("||", $alias_name['detail']);
-		 	$alias_objects_with_details = "";
-		 	$counter = 0;
-		 	foreach($alias_addresses as $alias_ports_address)
-		 	{
-				$alias_objects_with_details .= $alias_addresses[$counter];
-				$alias_detail_default = strpos ($alias_details[$counter],"Entry added");
-				if ($alias_details[$counter] != "" && $alias_detail_default === False){
-					$alias_objects_with_details .=" - " . $alias_details[$counter];
-				}  
-				$alias_objects_with_details .= "<br>";
-				$counter++;
-			}
-			$aliases_array[] = array($alias_name['name'], $alias_name['descr'], $alias_objects_with_details);
-		}		
-	}
-?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr><td class="tabnavtbl">
   <?php
@@ -382,61 +358,25 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
 				  <?php endif; ?>
 				  </td>
 				<?php
+				
 				//build Alias popup box
-				$span_begin = "";
 				$span_end = "";
 				$alias_src_span_begin = "";
-				$alias_src_span_end = "";
 				$alias_src_port_span_begin = "";
-				$alias_src_port_span_end = "";
 				$alias_dst_span_begin = "";
-				$alias_dst_span_end = "";
 				$alias_dst_port_span_begin = "";
-				$alias_dst_port_span_end = "";
-				$alias_content_text = "";
-				//max character length for caption field
-				$maxlength = 60;
 				
-				foreach ($aliases_array as $alias)
-				{
-					$alias_id_substr = $alias[0];
-					$alias_descr_substr = $alias[1];
-					$alias_content_text = htmlspecialchars($alias[2]);
-					$alias_caption = htmlspecialchars($alias_descr_substr . ":");
-					$strlength = strlen ($alias_caption);
-					if ($strlength >= $maxlength) 
-						$alias_caption = substr($alias_caption, 0, $maxlength) . "...";					
-					
-					$alias_check_src = $filterent['source']['address'];
-					$alias_check_srcport = pprint_port($filterent['source']['port']);
-					$alias_check_dst = $filterent['destination']['address'];
-					$alias_check_dstport = pprint_port($filterent['destination']['port']);
+				$alias_popup = rule_popup($filterent['source']['address'],pprint_port($filterent['source']['port']),$filterent['destination']['address'],pprint_port($filterent['destination']['port']));
+				$span_end = "</U></span>";
 					
-					$span_begin = "<span style=\"cursor: help;\" onmouseover=\"domTT_activate(this, event, 'content', '<h1>$alias_caption</h1><p>$alias_content_text</p>', 'trail', true, 'delay', 0, 'fade', 'both', 'fadeMax', 93, 'styleClass', 'niceTitle');\" onmouseout=\"this.style.color = ''; domTT_mouseout(this, event);\"><U>";
-					$span_end = "</U></span>";
+				$alias_src_span_begin = $alias_popup["src"];
+				 									
+				$alias_src_port_span_begin = $alias_popup["srcport"];
+													
+				$alias_dst_span_begin = $alias_popup["dst"];
+														
+				$alias_dst_port_span_begin = $alias_popup["dstport"];
 					
-				 	if ($alias_id_substr == $alias_check_src)
-				 	{										
-						$alias_src_span_begin = $span_begin;
-						$alias_src_span_end = $span_end;
-					}
-				 	if ($alias_id_substr == $alias_check_srcport)
-				 	{									
-						$alias_src_port_span_begin = $span_begin;
-						$alias_src_port_span_end = $span_end;					
-					}
-					if ($alias_id_substr == $alias_check_dst)
-				 	{										
-						$alias_dst_span_begin = $span_begin;
-						$alias_dst_span_end = $span_end;											
-					}
-					if ($alias_id_substr == $alias_check_dstport)
-				 	{											
-						$alias_dst_port_span_begin = $span_begin;
-						$alias_dst_port_span_end = $span_end;											
-					}										
-				}
-				
 				//build Schedule popup box
 				$a_schedules = &$config['schedules']['schedule'];
 				$schedule_span_begin = "";