Prevent archiving of data for time periods that start in the future (#18790)

* Prevent archiving data later than today instead of today + 2days

* Added archive test to check that periods that start in the future are not archived

* Allow for local time being a day ahead of UTC when skipping archive ranges

* Added test for website with local time in the previous day from the current UTC time

1 files changed, 5 insertions, 5 deletions

diff --git a/core/Archive.php b/core/Archive.php
index 26abc2ce0a..09227df4d8 100644
--- a/core/Archive.php
+++ b/core/Archive.php
@@ -610,10 +610,7 @@ class Archive implements ArchiveQuery
      */
     private function cacheArchiveIdsAfterLaunching($archiveGroups, $plugins)
     {
-        $today = Date::today();
-
         foreach ($this->params->getPeriods() as $period) {
-            $twoDaysBeforePeriod = $period->getDateStart()->subDay(2);
             $twoDaysAfterPeriod = $period->getDateEnd()->addDay(2);
 
             foreach ($this->params->getIdSites() as $idSite) {
@@ -635,8 +632,11 @@ class Archive implements ArchiveQuery
                     continue;
                 }
 
-                // if the starting date is in the future we know there is no visiidsite = ?t
-                if ($twoDaysBeforePeriod->isLater($today)) {
+                // Allow for site timezone, local time may have started a new day ahead of UTC
+                $today = \Piwik\Date::factory('now', $site->getTimezone());
+
+                // if the starting date is in the future we know there are no visits
+                if ($period->getDateStart()->isLater($today)) {
                     Log::debug("Archive site %s, %s (%s) skipped, archive is after today.",
                         $idSite, $period->getLabel(), $period->getPrettyString());
                     continue;