X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=cron.php;h=d782546127d2e62bf5410599679837af1e34db6b;hb=14c75c39cb898efeeeba6485e7cccb4e3fa4d78c;hp=908c890c06e60e992927266452c1154c8c69e916;hpb=5ef582473f6b329be18ad83c61e053fdcd9c6ed5;p=timetracker.git
diff --git a/cron.php b/cron.php
index 908c890c..d7825461 100644
--- a/cron.php
+++ b/cron.php
@@ -48,30 +48,38 @@ $mdb2 = getConnection();
$now = mktime();
$sql = "select * from tt_cron where $now >= next
- and status = 1 and report_id is not null and email is not null";
+ and status = 1 and report_id is not null and email is not null";
$res = $mdb2->query($sql);
if (is_a($res, 'PEAR_Error'))
- exit;
+ exit();
while ($val = $res->fetchRow()) {
// We have jobs to execute in user language.
-
+
// Get favorite report details.
$report = ttFavReportHelper::getReport($val['report_id']);
if (!$report) continue;
-
+
// Recycle global $user and $i18n objects, as user settings and language are specific for each report.
$user = new ttUser(null, $report['user_id']);
$i18n->load($user->lang);
- // Email report.
- if (ttReportHelper::sendFavReport($report, $val['email']))
- echo "Report ".$val['report_id']. " sent to ".$val['email']."
";
- else
- echo "Error while emailing report...
";
-
+ // Check condition on a report.
+ $condition_ok = true;
+ if ($val['report_condition'])
+ $condition_ok = ttReportHelper::checkFavReportCondition($report, $val['report_condition']);
+
+ // Email report if condition is okay.
+ if ($condition_ok) {
+ if (ttReportHelper::sendFavReport($report, $val['email']))
+ echo "Report ".$val['report_id']. " sent to ".$val['email']."
";
+ else
+ echo "Error while emailing report...
";
+ }
+
// Calculate next execution time.
- $next = tdCron::getNextOccurrence($val['cron_spec'], $now);
+ $next = tdCron::getNextOccurrence($val['cron_spec'], $now + 60); // +60 sec is here to get us correct $next when $now is close to existing "next".
+ // This is because the accuracy of tdcron class appears to be 1 minute.
// Update last and next values in tt_cron.
$sql = "update tt_cron set last = $now, next = $next where id = ".$val['id'];