From 6f8ed7d8f1fe783a0d8f2490353fec10b6da6ae2 Mon Sep 17 00:00:00 2001
From: Ederson Mora <ederson_mora@hotmail.com>
Date: Thu, 18 Jan 2018 14:13:39 +0100
Subject: [PATCH 1/4] Update cron.inc.php

---
 server/lib/classes/cron.inc.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/server/lib/classes/cron.inc.php b/server/lib/classes/cron.inc.php
index 48ca093739..374cfcc4e0 100644
--- a/server/lib/classes/cron.inc.php
+++ b/server/lib/classes/cron.inc.php
@@ -264,10 +264,16 @@ class cron {
 		if(!array_key_exists($sField, $this->_aValidValues)) return false;
 
 		reset($this->_aValidValues[$sField]);
+		/*
 		while(($cur = each($this->_aValidValues[$sField])) !== false) {
 			if($bIncludeCurrent == true && $cur['value'] >= $iValue) return $cur['value'];
 			elseif($cur['value'] > $iValue) return $cur['value'];
 		}
+		*/
+		foreach($this->_aValidValues[$sField] as $key => $value) {
+        	if($bIncludeCurrent == true && $value >= $iValue) return $value;                
+        	elseif($value > $iValue) return $value;                
+        }
 		return reset($this->_aValidValues[$sField]);
 	}
 
-- 
GitLab


From 15ddf6db88224ce79e69998e024621d009ecfa4d Mon Sep 17 00:00:00 2001
From: Ederson Mora <ederson_mora@hotmail.com>
Date: Thu, 18 Jan 2018 14:15:44 +0100
Subject: [PATCH 2/4] Update cron.inc.php

---
 server/lib/classes/cron.inc.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/lib/classes/cron.inc.php b/server/lib/classes/cron.inc.php
index 374cfcc4e0..d426cfb432 100644
--- a/server/lib/classes/cron.inc.php
+++ b/server/lib/classes/cron.inc.php
@@ -271,9 +271,9 @@ class cron {
 		}
 		*/
 		foreach($this->_aValidValues[$sField] as $key => $value) {
-        	if($bIncludeCurrent == true && $value >= $iValue) return $value;                
-        	elseif($value > $iValue) return $value;                
-        }
+		    if($bIncludeCurrent == true && $value >= $iValue) return $value;
+		    elseif($value > $iValue) return $value;
+		}
 		return reset($this->_aValidValues[$sField]);
 	}
 
-- 
GitLab


From 7be68d5edf1e1d8042f57b70bc76fd35c113bc15 Mon Sep 17 00:00:00 2001
From: Ederson Mora <ederson_mora@hotmail.com>
Date: Thu, 18 Jan 2018 15:25:59 +0100
Subject: [PATCH 3/4] Update cron.sh

---
 server/cron.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/cron.sh b/server/cron.sh
index 98f0ddfd30..05fa10ef0d 100644
--- a/server/cron.sh
+++ b/server/cron.sh
@@ -10,7 +10,7 @@ if [ -f /usr/local/ispconfig/server/lib/php.ini ]; then
 fi
 
 cd /usr/local/ispconfig/server
-/usr/bin/php -q \
+$(which php) -q \
     -d disable_classes= \
     -d disable_functions= \
     -d open_basedir= \
-- 
GitLab


From 19cf886951c12791f3323d4772a5a68cac8f3df5 Mon Sep 17 00:00:00 2001
From: Ederson Mora <ederson_mora@hotmail.com>
Date: Thu, 18 Jan 2018 15:53:20 +0100
Subject: [PATCH 4/4] Update cron.inc.php

---
 server/lib/classes/cron.inc.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/server/lib/classes/cron.inc.php b/server/lib/classes/cron.inc.php
index d426cfb432..3a8ba2c6a6 100644
--- a/server/lib/classes/cron.inc.php
+++ b/server/lib/classes/cron.inc.php
@@ -264,12 +264,7 @@ class cron {
 		if(!array_key_exists($sField, $this->_aValidValues)) return false;
 
 		reset($this->_aValidValues[$sField]);
-		/*
-		while(($cur = each($this->_aValidValues[$sField])) !== false) {
-			if($bIncludeCurrent == true && $cur['value'] >= $iValue) return $cur['value'];
-			elseif($cur['value'] > $iValue) return $cur['value'];
-		}
-		*/
+		
 		foreach($this->_aValidValues[$sField] as $key => $value) {
 		    if($bIncludeCurrent == true && $value >= $iValue) return $value;
 		    elseif($value > $iValue) return $value;
-- 
GitLab