X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=cron.php;h=473f27effb1e26a927701e7aeb2414854a4ffcf0;hb=22f23eb8f2f79853e18a4e4e5ded5c4db66cc5f8;hp=9424802efbca53aee12a68496eded868990dc5da;hpb=6b4cf0c797bc18757dd9708713982f733af9c89f;p=timetracker.git
diff --git a/cron.php b/cron.php
index 9424802e..473f27ef 100644
--- a/cron.php
+++ b/cron.php
@@ -59,23 +59,50 @@ 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.
+
+ // 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);
// 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...
";