X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/4c3aa343fd0a7d708c69b0f22ae30259314427df..a32d1441bb4b6e2cf58467f14c20f67ef0cf50c7:/cron.php diff --git a/cron.php b/cron.php index cf5ac0dd..5f342ddf 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(); @@ -73,7 +75,7 @@ while ($val = $res->fetchRow()) { // Email report if condition is okay. if ($condition_ok) { - if (ttReportHelper::sendFavReport($report, $val['email'])) + 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...
";