Commit 63b9660f authored by Till Brehm's avatar Till Brehm
Browse files

Fixes #5369 Internal ISPConfig cronjobs are not run in 3.1-dev version

parent 7eb3be87

install/sql/incremental/upd_dev_collection.sql

+2 −0
Original line number Diff line number Diff line
@@ -35,3 +35,5 @@ ALTER TABLE `ftp_user` CHANGE COLUMN `password` `password` VARCHAR(200) DEFAULT 
ALTER TABLE `shell_user` CHANGE COLUMN `password` `password` VARCHAR(200) DEFAULT NULL;

ALTER TABLE `sys_user` CHANGE COLUMN `passwort` `passwort` VARCHAR(200) DEFAULT NULL;

ALTER TABLE `webdav_user` CHANGE COLUMN `password` `password` VARCHAR(200) DEFAULT NULL;



DELETE FROM sys_cron WHERE `next_run` IS NOT NULL AND `next_run` >= DATE_ADD(`last_run`, INTERVAL 30 DAY) AND `next_run` BETWEEN '2020-01-01' AND '2020-01-02';

server/lib/classes/cron.inc.php

+2 −2
Original line number Diff line number Diff line
@@ -265,8 +265,8 @@ class cron { 


		reset($this->_aValidValues[$sField]);

		foreach($this->_aValidValues[$sField] as $cur) {

			if($bIncludeCurrent == true && $cur['value'] >= $iValue) return $cur['value'];

			elseif($cur['value'] > $iValue) return $cur['value'];

			if($bIncludeCurrent == true && $cur >= $iValue) return $cur;

			elseif($cur > $iValue) return $cur;

		}

		return reset($this->_aValidValues[$sField]);

	}