Merged getWhere and getFavWhere into one function.

[timetracker.git] / cron.php

diff --git a/cron.php b/cron.php
index 94a20dd..473f27e 100644 (file)
--- a/cron.php
+++ b/cron.php
@@ -66,6 +66,29 @@ while ($val = $res->fetchRow()) {
   $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;