Parcourir la source

Add logs + add working days validation

jmontoyaa il y a 8 ans
Parent
commit
646e9aab6f
1 fichiers modifiés avec 7 ajouts et 6 suppressions
  1. 7 6
      main/cron/import_csv.php

+ 7 - 6
main/cron/import_csv.php

@@ -981,11 +981,12 @@ class ImportCsv
                 }
 
                 $start = $event['start'];
-                // Tolerance days see BT#12156#note-16
+                // Working days (Mon-Fri)see BT#12156#note-16
                 $days = 5;
+                $startDatePlusDays = api_strtotime($start ." +$days weekdays");
 
                 // Send
-                if (api_strtotime($start) + $days * 24*60*60 > time() &&
+                if ($startDatePlusDays > time() &&
                     api_strtotime($start) < time()
                 ) {
                     $sendMail = true;
@@ -1001,10 +1002,6 @@ class ImportCsv
                     $alreadyAdded = true;
                 }
 
-                $this->logger->addInfo(
-                    "Send Mail already added? : ".(int) ($alreadyAdded)
-                );
-
                 // Send announcement to users
                 if ($sendMail && $alreadyAdded == false) {
                     $start = api_get_local_time(
@@ -1062,6 +1059,10 @@ class ImportCsv
                     );
 
                     if ($announcementId) {
+                        $this->logger->addInfo(
+                            "<<--SEND MAIL-->>"
+                        );
+
                         $this->logger->addInfo(
                             "Announcement added: ".(int) ($announcementId)
                         );