From f3bfd33d8ce160b32e413dc530281ea4908cded8 Mon Sep 17 00:00:00 2001
From: BBcan177 <bbcan177@gmail.com>
Date: Thu, 19 Feb 2015 14:36:37 -0500
Subject: pfBlockerNG - Mods to Schedule converter

As spotted by phil.davis -

https://github.com/phil-davis/pfsense-packages/commit/c5b497d4ea370e8f076bd95af5259d547894f2fa
---
 config/pfblockerng/pfblockerng.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'config/pfblockerng')

diff --git a/config/pfblockerng/pfblockerng.php b/config/pfblockerng/pfblockerng.php
index 0ca3aa7d..1dec1520 100644
--- a/config/pfblockerng/pfblockerng.php
+++ b/config/pfblockerng/pfblockerng.php
@@ -251,7 +251,7 @@ if ($argv[1] == 'gc') {
 }
 
 if ($argv[1] == 'cron') {
-	$hour = date('H');
+	$hour = date('G');
 	$dow  = date('N');
 	$pfb['update_cron'] = FALSE;
 
@@ -270,7 +270,7 @@ if ($argv[1] == 'cron') {
 	$sch2 = strval($shour);
 	for ($i=0; $i<11; $i++) {
 		$shour += 2;
-		if ($shour > 24)
+		if ($shour >= 24)
 			$shour -= 24;
 		$sch2 .= "," . strval($shour);
 	}
@@ -280,7 +280,7 @@ if ($argv[1] == 'cron') {
 	$sch3 = strval($shour);
 	for ($i=0; $i<7; $i++) {
 		$shour += 3;
-		if ($shour > 24)
+		if ($shour >= 24)
 			$shour -= 24;
 		$sch3 .= "," . strval($shour);
 	}
@@ -290,7 +290,7 @@ if ($argv[1] == 'cron') {
 	$sch4 = strval($shour);
 	for ($i=0; $i<5; $i++) {
 		$shour += 4;
-		if ($shour > 24)
+		if ($shour >= 24)
 			$shour -= 24;
 		$sch4 .= "," . strval($shour);
 	}
@@ -300,7 +300,7 @@ if ($argv[1] == 'cron') {
 	$sch6 = strval($shour);
 	for ($i=0; $i<3; $i++) {
 		$shour += 6;
-		if ($shour > 24)
+		if ($shour >= 24)
 			$shour -= 24;
 		$sch6 .= "," . strval($shour);
 	}
@@ -310,7 +310,7 @@ if ($argv[1] == 'cron') {
 	$sch8 = strval($shour);
 	for ($i=0; $i<2; $i++) {
 		$shour += 8;
-		if ($shour > 24)
+		if ($shour >= 24)
 			$shour -= 24;
 		$sch8 .= "," . strval($shour);
 	}
@@ -319,7 +319,7 @@ if ($argv[1] == 'cron') {
 	$shour = intval(substr($pfb['hour'], 0, 2));
 	$sch12 = strval($shour) . ",";
 	$shour += 12;
-	if ($shour > 24)
+	if ($shour >= 24)
 		$shour -= 24;
 	$sch12 .= strval($shour);
 
@@ -1480,4 +1480,4 @@ EOF;
 	// Unset Arrays
 	unset ($roptions4, $et_options, $xmlrep);
 }
-?>
\ No newline at end of file
+?>
-- 
cgit v1.2.3