X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=cron.php;h=eabcaa05cde044892ad394f06ce28342aafc8543;hb=69915aba68a312fb2080c2356a482736efc254ae;hp=d782546127d2e62bf5410599679837af1e34db6b;hpb=4af7dd7e10968588fe4c2828be5402f41d53ebc5;p=timetracker.git
diff --git a/cron.php b/cron.php
index d7825461..eabcaa05 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,22 +59,35 @@ 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;
+ $options = ttFavReportHelper::getReportOptions($val['report_id']);
+ if (!$options) continue; // Skip not found report.
- // Recycle global $user and $i18n objects, as user settings and language are specific for each report.
- $user = new ttUser(null, $report['user_id']);
+ // Recycle global $user object, as user settings are specific for each report.
+ $user = new ttUser(null, $options['user_id']);
+ if (!$user->id) continue; // Skip not found user.
+
+ // TODO: write a new function ttFavReportHelper::adjustOptions that will use
+ // a $user object recycled above. Put user handling below into it.
+ // Also adjust remaining options for potentially changed user access rights and group properties.
+ // For example, tracking mode may have changed, but fav report options are still old...
+ // This needs to be fixed.
+ $options = ttFavReportHelper::adjustOptions($options);
+
+ // Skip users with disabled Notifications plugin.
+ if (!$user->isPluginEnabled('no')) continue;
+
+ // Recycle $i18n object because language is user-specific.
$i18n->load($user->lang);
// Check condition on a report.
$condition_ok = true;
if ($val['report_condition'])
- $condition_ok = ttReportHelper::checkFavReportCondition($report, $val['report_condition']);
+ $condition_ok = ttReportHelper::checkFavReportCondition($options, $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']."
";
+ if (ttReportHelper::sendFavReport($options, $val['subject'], $val['email'], $val['cc']))
+ echo "Report ".$val['report_id']. " sent.
";
else
echo "Error while emailing report...
";
}