update Piwik to version 2.16 (fixes #91)

www/analytics/core/ArchiveProcessor/Loader.php

@@ -1,18 +1,20 @@
 <?php
 /**
- * Piwik - Open source web analytics
+ * Piwik - free/libre analytics platform
  *
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  */
 namespace Piwik\ArchiveProcessor;
+
 use Piwik\Archive;
-use Piwik\ArchiveProcessor;
+use Piwik\Cache;
 use Piwik\Config;
 use Piwik\DataAccess\ArchiveSelector;
 use Piwik\Date;
 use Piwik\Period;
+use Piwik\Piwik;
 
 /**
  * This class uses PluginsArchiver class to trigger data aggregation and create archives.
@@ -81,6 +83,7 @@ class Loader
      * Prepares the core metrics if needed.
      *
      * @param $visits
+     * @return array
      */
     protected function prepareCoreMetricsArchive($visits, $visitsConverted)
     {
@@ -101,12 +104,14 @@ class Loader
             $visits = $metrics['nb_visits'];
             $visitsConverted = $metrics['nb_visits_converted'];
         }
+
         return array($visits, $visitsConverted);
     }
 
     protected function prepareAllPluginsArchive($visits, $visitsConverted)
     {
         $pluginsArchiver = new PluginsArchiver($this->params, $this->isArchiveTemporary());
+
         if ($this->mustProcessVisitCount($visits)
             || $this->doesRequestedPluginIncludeVisitsSummary()
         ) {
@@ -114,14 +119,14 @@ class Loader
             $visits = $metrics['nb_visits'];
             $visitsConverted = $metrics['nb_visits_converted'];
         }
-        if ($this->isThereSomeVisits($visits)) {
+
+        if ($this->isThereSomeVisits($visits)
+            || $this->shouldArchiveForSiteEvenWhenNoVisits()
+        ) {
             $pluginsArchiver->callAggregateAllPlugins($visits, $visitsConverted);
         }
-        $idArchive = $pluginsArchiver->finalizeArchive();
 
-        if (!$this->params->isSingleSiteDayArchive() && $visits) {
-            ArchiveSelector::purgeOutdatedArchives($this->params->getPeriod()->getDateStart());
-        }
+        $idArchive = $pluginsArchiver->finalizeArchive();
 
         return array($idArchive, $visits);
     }
@@ -139,11 +144,13 @@ class Loader
     {
         $period = $this->params->getPeriod()->getLabel();
         $debugSetting = 'always_archive_data_period'; // default
+
         if ($period == 'day') {
             $debugSetting = 'always_archive_data_day';
         } elseif ($period == 'range') {
             $debugSetting = 'always_archive_data_range';
         }
+
         return (bool) Config::getInstance()->Debug[$debugSetting];
     }
 
@@ -165,9 +172,11 @@ class Loader
         }
 
         $idAndVisits = ArchiveSelector::getArchiveIdAndVisits($this->params, $minDatetimeArchiveProcessedUTC);
+
         if (!$idAndVisits) {
             return $noArchiveFound;
         }
+
         return $idAndVisits;
     }
 
@@ -186,19 +195,27 @@ class Loader
             // Permanent archive
             return $endDateTimestamp;
         }
+
+        $dateStart = $this->params->getDateStart();
+        $period    = $this->params->getPeriod();
+        $segment   = $this->params->getSegment();
+        $site      = $this->params->getSite();
+
         // Temporary archive
-        return Rules::getMinTimeProcessedForTemporaryArchive($this->params->getDateStart(), $this->params->getPeriod(), $this->params->getSegment(), $this->params->getSite());
+        return Rules::getMinTimeProcessedForTemporaryArchive($dateStart, $period, $segment, $site);
     }
 
     protected static function determineIfArchivePermanent(Date $dateEnd)
     {
         $now = time();
         $endTimestampUTC = strtotime($dateEnd->getDateEndUTC());
+
         if ($endTimestampUTC <= $now) {
             // - if the period we are looking for is finished, we look for a ts_archived that
             //   is greater than the last day of the archive
             return $endTimestampUTC;
         }
+
         return false;
     }
 
@@ -207,8 +224,30 @@ class Loader
         if (is_null($this->temporaryArchive)) {
             throw new \Exception("getMinTimeArchiveProcessed() should be called prior to isArchiveTemporary()");
         }
+
         return $this->temporaryArchive;
     }
 
-}
+    private function shouldArchiveForSiteEvenWhenNoVisits()
+    {
+        $idSitesToArchive = $this->getIdSitesToArchiveWhenNoVisits();
+        return in_array($this->params->getSite()->getId(), $idSitesToArchive);
+    }
 
+    private function getIdSitesToArchiveWhenNoVisits()
+    {
+        $cache = Cache::getTransientCache();
+        $cacheKey = 'Archiving.getIdSitesToArchiveWhenNoVisits';
+
+        if (!$cache->contains($cacheKey)) {
+            $idSites = array();
+
+            // leaving undocumented unless decided otherwise
+            Piwik::postEvent('Archiving.getIdSitesToArchiveWhenNoVisits', array(&$idSites));
+
+            $cache->save($cacheKey, $idSites);
+        }
+
+        return $cache->fetch($cacheKey);
+    }
+}