Fixed double notifications, hopefully.

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 793494dfcc7eb753e1c0aee1208998e50401493e..c9af24b22ab5349bbe6e32b62eb6f2c51132d200 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>

-          <td align="center">&nbsp;Anuko Time Tracker 1.9.30.3529 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.9.31.3530 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |

             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/cron.php b/cron.php
index 345ddd3e87b1097425fc7e673b7986d2b8feb28f..9212e55830508b45c06cd5ec9bef59418668fba2 100644 (file)
--- a/cron.php
+++ b/cron.php
@@ -46,6 +46,7 @@ import('ttReportHelper');
 
 $mdb2 = getConnection();
 $now = mktime();
 
 $mdb2 = getConnection();
 $now = mktime();

+$now = 1473548400;

 
 $sql = "select * from tt_cron where $now >= next 
   and status = 1 and report_id is not null and email is not null";
 
 $sql = "select * from tt_cron where $now >= next 
   and status = 1 and report_id is not null and email is not null";


@@ -71,7 +72,8 @@ while ($val = $res->fetchRow()) {
     echo "Error while emailing report...<br>";
 
   // Calculate next execution time.
     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'];
 
   // Update last and next values in tt_cron.
   $sql = "update tt_cron set last = $now, next = $next where id = ".$val['id'];