Merge branch 'patch-2' into 'master'

Till Brehm · Till Brehm · commit 6d15c0f3f621 · 2018-01-18T18:24:33.000+01:00
Update cron.inc.php

See merge request ispconfig/ispconfig3!710
diff --git a/server/lib/classes/cron.inc.php b/server/lib/classes/cron.inc.php
@@ -264,9 +264,10 @@ private function _getNextValue($sField, $iValue, $bIncludeCurrent = false) {
 		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]);
 	}

Original file line number	Diff line number	Diff line change
`@@ -264,9 +264,10 @@ private function _getNextValue($sField, $iValue, $bIncludeCurrent = false) {`
`264`	`264`	`if(!array_key_exists($sField, $this->_aValidValues)) return false;`
`265`	`265`
`266`	`266`	`reset($this->_aValidValues[$sField]);`
`267`		`- while(($cur = each($this->_aValidValues[$sField])) !== false) {`
`268`		`- if($bIncludeCurrent == true && $cur['value'] >= $iValue) return $cur['value'];`
`269`		`- elseif($cur['value'] > $iValue) return $cur['value'];`
	`267`	`+`
	`268`	`+ foreach($this->_aValidValues[$sField] as $key => $value) {`
	`269`	`+ if($bIncludeCurrent == true && $value >= $iValue) return $value;`
	`270`	`+ elseif($value > $iValue) return $value;`
`270`	`271`	`}`
`271`	`272`	`return reset($this->_aValidValues[$sField]);`
`272`	`273`	`}`