X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=cron.php;h=eabcaa05cde044892ad394f06ce28342aafc8543;hb=aeb30899d6ec142220d83b34fd8f6c68c05e8e90;hp=eb7965a22247e30d1010af54ff7af1f4be79401b;hpb=62330e789110be03d89dae3b12c28c52a904b2c1;p=timetracker.git

diff --git a/cron.php b/cron.php
index eb7965a2..eabcaa05 100644
--- a/cron.php
+++ b/cron.php
@@ -47,7 +47,7 @@ import('ttReportHelper');
 $mdb2 = getConnection();
 $now = time();
 
- $sql = "select c.id, c.cron_spec, c.report_id, c.email, c.report_condition from tt_cron c
+ $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";
@@ -59,24 +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; // 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.
+
+  // 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']."<br>";
+    if (ttReportHelper::sendFavReport($options, $val['subject'], $val['email'], $val['cc']))
+      echo "Report ".$val['report_id']. " sent.<br>";
     else
       echo "Error while emailing report...<br>";
   }