X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=cron.php;h=d782546127d2e62bf5410599679837af1e34db6b;hb=e2b992aea6edc4a734ddb751103101e2450f3b20;hp=345ddd3e87b1097425fc7e673b7986d2b8feb28f;hpb=0e3c4d629800de449c5a1bb9da780993e5dc5277;p=timetracker.git

diff --git a/cron.php b/cron.php
index 345ddd3e..d7825461 100644
--- a/cron.php
+++ b/cron.php
@@ -64,14 +64,22 @@ while ($val = $res->fetchRow()) {
   $user = new ttUser(null, $report['user_id']);
   $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($report, $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>";
+    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'];