maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

more fixing on the cronjob part

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2010-01-25 16:21:10 +00:00
parent 44716ff439
commit 1647d6ecfb
4 changed files with 71 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/functions/froxlor/function.getIntervalOptions.php
View File

@@ -11,7 +11,7 @@
* @copyright (c) the authors
* @author Froxlor team <team@froxlor.org> (2010-)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Settings
* @package Functions
* @version $Id: $
*/
@@ -27,7 +27,14 @@ function getIntervalOptions()
while($row = $db->fetch_array($result))
{
$cron_intervals[$row['interval']] = $row['interval'];
if(validateSqlInterval($row['interval']))
{
$cron_intervals[$row['interval']] = $row['interval'];
}
else
{
$log->logAction(ADM_ACTION, LOG_ERROR, "Invalid SQL-Interval ".$row['interval']." detected. Please fix this in the database.");
}
}
return $cron_intervals;

4
lib/functions/froxlor/function.getNextCronjobs.php
View File

@@ -36,9 +36,9 @@ function getNextCronjobs()
if($name == '0') continue;
if($x == 0) {
$sql.= 'DATE_ADD(FROM_UNIXTIME(`lastrun`), INTERVAL '.$ival.') <= CURDATE()';
$sql.= 'DATE_ADD(FROM_UNIXTIME(`lastrun`), INTERVAL '.$ival.') <= UTC_TIMESTAMP()';
} else {
$sql.= ' OR DATE_ADD(UNIX_TIMESTAMP(`lastrun`), INTERVAL '.$ival.') <= CURDATE()';
$sql.= ' OR DATE_ADD(UNIX_TIMESTAMP(`lastrun`), INTERVAL '.$ival.') <= UTC_TIMESTAMP()';
}
$x++;
}