X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=cron.php;h=5f342ddf519aa5a3847929eed5072b23d3c87d2f;hb=1d9668e44a209fa5b8b9db184c6d94c82230e168;hp=81ef89822e2dfad0cde8cc7cb25fd9844c88d3a7;hpb=b5d95bbf6e8ce2b60c6640cdee5571025524e1a6;p=timetracker.git
diff --git a/cron.php b/cron.php
index 81ef8982..5f342ddf 100644
--- a/cron.php
+++ b/cron.php
@@ -45,33 +45,45 @@ import('ttFavReportHelper');
import('ttReportHelper');
$mdb2 = getConnection();
-$now = mktime();
+$now = time();
-$sql = "select * from tt_cron where $now >= next
- and status = 1 and report_id is not null and email is not null";
+ $sql = "select c.id, c.cron_spec, c.report_id, c.email, c.cc, c.subject, c.report_condition from tt_cron c
+ left join tt_fav_reports fr on (c.report_id = fr.id)
+ where $now >= c.next and fr.status = 1
+ and c.status = 1 and c.report_id is not null and c.email is not null";
$res = $mdb2->query($sql);
if (is_a($res, 'PEAR_Error'))
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.
+ if (!$report) continue; // Skip not found report.
+
+ // Recycle global $user object, as user settings are specific for each report.
$user = new ttUser(null, $report['user_id']);
+ if (!$user->id) continue; // Skip not found user.
+ // Recycle $i18n object because language is user-specific.
$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['subject'], $val['email'], $val['cc']))
+ 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'];