update Piwik to version 2.16 (fixes #91)

www/analytics/core/Period/Month.php

@@ -1,6 +1,6 @@
 <?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
@@ -8,13 +8,15 @@
  */
 namespace Piwik\Period;
 
+use Piwik\Date;
 use Piwik\Period;
-use Piwik\Piwik;
 
 /**
  */
 class Month extends Period
 {
+    const PERIOD_ID = 3;
+
     protected $label = 'month';
 
     /**
@@ -25,7 +27,7 @@ class Month extends Period
     public function getLocalizedShortString()
     {
         //"Aug 09"
-        $out = $this->getDateStart()->getLocalized(Piwik::translate('CoreHome_ShortMonthFormat'));
+        $out = $this->getDateStart()->getLocalized(Date::DATE_FORMAT_MONTH_SHORT);
         return $out;
     }
 
@@ -37,7 +39,7 @@ class Month extends Period
     public function getLocalizedLongString()
     {
         //"August 2009"
-        $out = $this->getDateStart()->getLocalized(Piwik::translate('CoreHome_LongMonthFormat'));
+        $out = $this->getDateStart()->getLocalized(Date::DATE_FORMAT_MONTH_LONG);
         return $out;
     }
 
@@ -60,15 +62,65 @@ class Month extends Period
         if ($this->subperiodsProcessed) {
             return;
         }
+
         parent::generate();
 
         $date = $this->date;
 
-        $startMonth = $date->setDay(1);
-        $currentDay = clone $startMonth;
-        while ($currentDay->compareMonth($startMonth) == 0) {
-            $this->addSubperiod(new Day($currentDay));
-            $currentDay = $currentDay->addDay(1);
+        $startMonth = $date->setDay(1)->setTime('00:00:00');
+        $endMonth   = $startMonth->addPeriod(1, 'month')->setDay(1)->subDay(1);
+
+        $this->processOptimalSubperiods($startMonth, $endMonth);
+    }
+
+    /**
+     * Determine which kind of period is best to use.
+     * See Range.test.php
+     *
+     * @param Date $startDate
+     * @param Date $endDate
+     */
+    protected function processOptimalSubperiods($startDate, $endDate)
+    {
+        while ($startDate->isEarlier($endDate)
+            || $startDate == $endDate) {
+            $week        = new Week($startDate);
+            $startOfWeek = $week->getDateStart();
+            $endOfWeek   = $week->getDateEnd();
+
+            if ($endOfWeek->isLater($endDate)) {
+                $this->fillDayPeriods($startDate, $endDate);
+            } elseif ($startOfWeek == $startDate) {
+                $this->addSubperiod($week);
+            } else {
+                $this->fillDayPeriods($startDate, $endOfWeek);
+            }
+
+            $startDate = $endOfWeek->addDay(1);
         }
     }
+
+    /**
+     * Fills the periods from startDate to endDate with days
+     *
+     * @param Date $startDate
+     * @param Date $endDate
+     */
+    private function fillDayPeriods($startDate, $endDate)
+    {
+        while (($startDate->isEarlier($endDate) || $startDate == $endDate)) {
+            $this->addSubperiod(new Day($startDate));
+            $startDate = $startDate->addDay(1);
+        }
+    }
+
+    public function getImmediateChildPeriodLabel()
+    {
+        return 'week';
+    }
+
+    public function getParentPeriodLabel()
+    {
+        return 'year';
+    }
 }