X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=cron.php;h=473f27effb1e26a927701e7aeb2414854a4ffcf0;hb=85d475278111ea1ed81fcd0dd5eef7140d1cd493;hp=22b4991d32e2484318c435736c12ba392f93bb8d;hpb=098a79f0819ebb89b7d48df4a6b154af4560f68e;p=timetracker.git

diff --git a/cron.php b/cron.php
index 22b4991d..473f27ef 100644
--- a/cron.php
+++ b/cron.php
@@ -45,33 +45,72 @@ 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;
+  exit();
 
 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;
-  
-  // Recycle global $user and $i18n objects, as user settings and language are specific for each report.
-  $user = new ttUser(null, $report['user_id']);
+  $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, $options['user_id']);
+  if (!$user->id) continue; // Skip not found user.
+
+  // Special handling of the NULL $options['users'] field (this used to mean "all users").
+  if (!$options['users']) {
+    if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
+      if ($user->can('view_reports') || $user->can('view_all_reports')) {
+        $max_rank = $user->rank-1;
+        if ($user->can('view_all_reports')) $max_rank = 512;
+        if ($user->can('view_own_reports'))
+          $user_options = array('max_rank'=>$max_rank,'include_self'=>true);
+        else
+          $user_options = array('max_rank'=>$max_rank);
+        $users = $user->getUsers($user_options); // Active and inactive users.
+      } elseif ($user->isClient()) {
+        $users = ttTeamHelper::getUsersForClient(); // Active and inactive users for clients.
+      }
+      foreach ($users as $single_user) {
+        $user_ids[] = $single_user['id'];
+      }
+      $options['users'] = implode(',', $user_ids);
+    }
+  } else {
+    // TODO: add checking the existing user list for potentially changed access rights for user.
+  }
+
+  // Skip users with disabled Notifications plugin.
+  if (!$user->isPluginEnabled('no')) continue;
+
+  // Recycle $i18n object because language is user-specific.
   $i18n->load($user->lang);
 
-  // Email report.
-  if (ttReportHelper::sendFavReport($report, $val['email']))
-    echo "Report ".$val['report_id']. " sent to ".$val['email']."<br>";
-  else
-    echo "Error while emailing report...<br>";
-    
+  // Check condition on a report.
+  $condition_ok = true;
+  if ($val['report_condition'])
+    $condition_ok = ttReportHelper::checkFavReportCondition($options, $val['report_condition']);
+
+  // Email report if condition is okay.
+  if ($condition_ok) {
+    if (ttReportHelper::sendFavReport($options, $val['subject'], $val['email'], $val['cc']))
+      echo "Report ".$val['report_id']. " sent.<br>";
+    else
+      echo "Error while emailing report...<br>";
+  }
+
   // Calculate next execution time.
-  $next = tdCron::getNextOccurrence($val['cron_spec'], $now); 
+  $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'];
@@ -80,5 +119,3 @@ while ($val = $res->fetchRow()) {
 }
 
 echo "Done!";
-
-?>
\ No newline at end of file