X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=cron.php;h=262cafe5423e6d493ba5d8f7a932ad5d94ac6631;hb=187a16b0ffee5ae6af51b010ff90a194048d3457;hp=cf5ac0dde56d11df60ba36c0d544010cd9f8f927;hpb=4c3aa343fd0a7d708c69b0f22ae30259314427df;p=timetracker.git
diff --git a/cron.php b/cron.php
index cf5ac0dd..262cafe5 100644
--- a/cron.php
+++ b/cron.php
@@ -45,10 +45,12 @@ 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();
@@ -57,7 +59,7 @@ while ($val = $res->fetchRow()) {
// We have jobs to execute in user language.
// Get favorite report details.
- $report = ttFavReportHelper::getReport($val['report_id']);
+ $report = ttFavReportHelper::getReportOptions($val['report_id']);
if (!$report) continue; // Skip not found report.
// Recycle global $user object, as user settings are specific for each report.
@@ -73,8 +75,8 @@ while ($val = $res->fetchRow()) {
// Email report if condition is okay.
if ($condition_ok) {
- if (ttReportHelper::sendFavReport($report, $val['email']))
- echo "Report ".$val['report_id']. " sent to ".$val['email']."
";
+ if (ttReportHelper::sendFavReport($report, $val['subject'], $val['email'], $val['cc']))
+ echo "Report ".$val['report_id']. " sent.
";
else
echo "Error while emailing report...
";
}