From 9ea2576b3a000c4c598e5d6a866c199d812e0e4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ermal=20Lu=C3=A7i?= <eri@pfsense.org>
Date: Sun, 14 Dec 2008 20:28:30 +0000
Subject: [PATCH] * Remove an uneccesary global variable($schedule_enabled) *
 Do not create schedule rules in the case that schedules have been created but
 not referenced in any rule

---
 etc/inc/filter.inc | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 89e9c3309a..2f671e8027 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -1128,7 +1128,6 @@ function generate_user_filter_rule($rule)
 {
 	global $config, $g, $FilterIflist, $GatewaysList, $GatewayGroupsList;
 	global $table_cache;
-	global $schedule_enabled;
 	if(isset($config['system']['developerspew'])) {
 		$mt = microtime();
 		echo "generate_user_filter_rule() being called $mt\n";
@@ -1137,12 +1136,6 @@ function generate_user_filter_rule($rule)
 	if (isset($rule['disabled'])) {
 		return "# rule " . $rule['descr'] . " disabled \n";
 	}
-	if($config['schedules']) {
-		foreach($config['schedules']['schedule'] as $sched) {
-			$schedule_enabled = true;
-			break;
-		}
-	}
 	/* Setup cache array if not already existing */
 	if (!isset($table_cache)) {
 		if ($g['debug'])
@@ -1655,10 +1648,9 @@ function generate_user_filter_rule($rule)
 			$aline['flags'] . $aline['queue'] . $aline['dnpipe'];
 
 		/* is a time based rule schedule attached? */
-		if($rule['sched']) {
+		if(!empty($rule['sched'])) {
 			if($config['schedules']) {
 				foreach($config['schedules']['schedule'] as $sched) {
-					$schedule_enabled = true;
 					if($sched['name'] == $rule['sched']) {
 						$schedule_xml_block = $sched;	
 						break;
@@ -1695,14 +1687,9 @@ function generate_user_filter_rule($rule)
 				}
 				return "# $line";
 			}
-		} else {
-			if($schedule_enabled) {
-				// no schedule allow rules should simply allow
-				$ipfw_rule = tdr_create_ipfw_rule($rule, "allow");
-				tdr_install_rule($ipfw_rule);			
-			}
-			return $line;			
-		}
+		} 
+
+		return $line;			
 }
 
 function filter_rules_generate()