X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=cron.php;h=337f96aefa36ab260d964674c449eaf09bc86791;hb=fb5b1697fdd701ada644b7e25f22a93a0893107c;hp=262cafe5423e6d493ba5d8f7a932ad5d94ac6631;hpb=259a4673f7475125e1ab6b68f77a67401fa52d06;p=timetracker.git
diff --git a/cron.php b/cron.php
index 262cafe5..337f96ae 100644
--- a/cron.php
+++ b/cron.php
@@ -47,10 +47,12 @@ import('ttReportHelper');
$mdb2 = getConnection();
$now = time();
- $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";
+$sql = "select c.id, c.cron_spec, c.report_id, c.email, c.cc, c.subject, c.report_condition from tt_cron c".
+ " inner join tt_fav_reports fr on".
+ " (c.report_id = fr.id and c.group_id = fr.group_id and c.org_id = fr.org_id)". // Report for a correct group.
+ " inner join tt_users u on (u.id = fr.user_id and u.status = 1)". // Report for an active user.
+ " where $now >= c.next and fr.status = 1". // Due now.
+ " 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();
@@ -59,23 +61,40 @@ while ($val = $res->fetchRow()) {
// We have jobs to execute in user language.
// Get favorite report details.
- $report = ttFavReportHelper::getReportOptions($val['report_id']);
- if (!$report) continue; // Skip not found report.
+ $options = ttFavReportHelper::getReportOptions($val['report_id']);
+ if (!$options) continue; // Skip not found report.
// Recycle global $user object, as user settings are specific for each report.
- $user = new ttUser(null, $report['user_id']);
+ $user = new ttUser(null, $options['user_id']);
if (!$user->id) continue; // Skip not found user.
+
+ // Avoid complications with impersonated users, possibly from subgroups.
+ // Note: this may happen when cron.php is called by a browser who already impersonates.
+ // This is not supposed to happen in automatic cron job.
+ if ($user->behalf_id)
+ continue; // Skip processing on behalf situations entirely.
+
+ // 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['subject'], $val['email'], $val['cc']))
+ if (ttReportHelper::sendFavReport($options, $val['subject'], $val['email'], $val['cc']))
echo "Report ".$val['report_id']. " sent.
";
else
echo "Error while emailing report...
";
@@ -84,7 +103,6 @@ while ($val = $res->fetchRow()) {
// Calculate next execution time.
$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'];
$affected = $mdb2->exec($sql);