From 616dd997866a4bb16a84531359fdfb08061b78bb Mon Sep 17 00:00:00 2001
From: Scott Dale <sdale@pfsense.org>
Date: Sat, 5 May 2007 22:30:11 +0000
Subject: [PATCH] schedule icon update

MFC: asap
---
 usr/local/www/firewall_rules.php | 63 +++++++++++++++++---------------
 1 file changed, 33 insertions(+), 30 deletions(-)

diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php
index 9dacd5e6ee..0eb6fac74f 100755
--- a/usr/local/www/firewall_rules.php
+++ b/usr/local/www/firewall_rules.php
@@ -497,35 +497,38 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
 					}
 				}
 				$printicon = false;
-				 if ($schedstatus) 
-				 { 
-				 	if ($iconfn == "block" || $iconfn == "reject")
-				 	{
-				 		$image = "icon_clock_red";
-				 		$alttest = "Traffic matching this rule is currently being denied";
-				 	}
-				 	else
-				 	{
-				 		$image = "icon_clock_green";
-				 		$alttest = "Traffic matching this rule is currently being allowed";
-				 	}
-				 	$printicon = true;
-				  }
-				  else if ($filterent['sched'] )
-				  { 
-				 	if ($iconfn == "block" || $iconfn == "reject")
-				 	{
-				 		$image = "icon_clock_green";
-				 		$alttext = "Traffic matching this rule is currently being allowed";
-				 	}
-				 	else
-				 	{
-				 		$image = "icon_clock_red";
-				 		$alttext = "Traffic matching this rule is currently being denied";
-				 	}
-				 	$printicon = true;				  	
-				  }
-				
+				$alttext = "";
+				$image = "";
+				if (!isset($filterent['disabled'])){
+					 if ($schedstatus) 
+					 { 
+					 	if ($iconfn == "block" || $iconfn == "reject")
+					 	{
+					 		$image = "icon_clock_red";
+					 		$alttext = "Traffic matching this rule is currently being denied";
+					 	}
+					 	else
+					 	{
+					 		$image = "icon_clock_green";
+					 		$alttext = "Traffic matching this rule is currently being allowed";
+					 	}
+					 	$printicon = true;
+					  }
+					  else if ($filterent['sched'])
+					  { 
+					 	if ($iconfn == "block" || $iconfn == "reject")
+					 	{
+					 		$image = "icon_clock_grey";
+					 		$alttext = "Traffic matching this rule is currently being allowed";
+					 	}
+					 	else
+					 	{
+					 		$image = "icon_clock_red";
+					 		$alttext = "Traffic matching this rule is currently being denied";
+					 	}
+					 	$printicon = true;				  	
+					  }
+				}
 				?>
                   <td class="listlr" onClick="fr_toggle(<?=$nrules;?>)" id="frd<?=$nrules;?>" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';">
                     <?=$textss;?><?php if (isset($filterent['protocol'])) echo strtoupper($filterent['protocol']); else echo "*"; ?><?=$textse;?>
@@ -546,7 +549,7 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
                     <?=$textss;?><?php if (isset($config['interfaces'][$filterent['gateway']]['descr'])) echo htmlspecialchars($config['interfaces'][$filterent['gateway']]['descr']); else  echo htmlspecialchars(pprint_port($filterent['gateway'])); ?><?=$textse;?>
                   </td>
                   <td class="listr" onClick="fr_toggle(<?=$nrules;?>)" id="frd<?=$nrules;?>" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';"><font color="black">
-                    <?=$textss;?><?php echo $schedule_span_begin;?><?=htmlspecialchars($filterent['sched']);?><?php echo $schedule_span_end; ?><?=$textse;?>&nbsp; <?php if ($printicon) { ?><img src="./themes/<?= $g['theme']; ?>/images/icons/<?php echo $image; ?>.gif" title="<?php echo $alttext;?>" width="12" height="12" border="0"><?php } ?>
+                    <?php if ($printicon) { ?><img src="./themes/<?= $g['theme']; ?>/images/icons/<?php echo $image; ?>.gif" title="<?php echo $alttext;?>" width="12" height="12" border="0"><?php } ?>&nbsp;<?=$textss;?><?php echo $schedule_span_begin;?><?=htmlspecialchars($filterent['sched']);?><?php echo $schedule_span_end; ?><?=$textse;?>
                   </td>
                   <td class="listbg" onClick="fr_toggle(<?=$nrules;?>)" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';" bcolor="#990000"><font color="white">
                     <?=$textss;?><?=htmlspecialchars($filterent['descr']);?>&nbsp;<?=$textse;?>