diff --git a/misc/cron/archive.php b/misc/cron/archive.php index 1f63c26ebf5b2bc6f09ddbd71468d1274f726cf6..bd8dafd71542f47020293fc1a754eadf394cd9f8 100644 --- a/misc/cron/archive.php +++ b/misc/cron/archive.php @@ -163,16 +163,14 @@ class Archiving */ private function getVisitsRequestUrl($idsite, $period, $lastTimestampWebsiteProcessed = false) { + $dateLastMax = $period == 'week' ? self::DEFAULT_DATE_LAST_WEEKS : self::DEFAULT_DATE_LAST; if (empty($lastTimestampWebsiteProcessed)) { - $dateLast = self::DEFAULT_DATE_LAST; - if ($period == 'week') { - $dateLast = self::DEFAULT_DATE_LAST_WEEKS; - } + $dateLast = $dateLastMax; } else { // Enforcing last2 at minimum to work around timing issues and ensure we make most archives available $dateLast = floor((time() - $lastTimestampWebsiteProcessed) / 86400) + 2; - if ($dateLast > self::DEFAULT_DATE_LAST) { - $dateLast = self::DEFAULT_DATE_LAST; + if ($dateLast > $dateLastMax) { + $dateLast = $dateLastMax; } } return "?module=API&method=VisitsSummary.getVisits&idSite=$idsite&period=$period&date=last" . $dateLast . "&format=php&token_auth=" . $this->token_auth; diff --git a/plugins/VisitsSummary/API.php b/plugins/VisitsSummary/API.php index 7dbabcf6d9fbf43763c93f3f4557492a54e5cd07..71b1775e7877986e3d293732eaad6cc36c14ad47 100644 --- a/plugins/VisitsSummary/API.php +++ b/plugins/VisitsSummary/API.php @@ -36,7 +36,7 @@ class Piwik_VisitsSummary_API { Piwik::checkUserHasViewAccess($idSite); $archive = Archive::build($idSite, $period, $date, $segment); - + // array values are comma separated $columns = Piwik::getArrayFromApiParameter($columns); $tempColumns = array(); diff --git a/tests/PHPUnit/Integration/ArchiveCronTest.php b/tests/PHPUnit/Integration/ArchiveCronTest.php index dce02cf182b5bcb87e9983971309466a15bb471e..bd036cd3e08babb3bd3c247a6ef35eef55104572 100644 --- a/tests/PHPUnit/Integration/ArchiveCronTest.php +++ b/tests/PHPUnit/Integration/ArchiveCronTest.php @@ -130,4 +130,4 @@ class Test_Piwik_Integration_ArchiveCronTest extends IntegrationTestCase } Test_Piwik_Integration_ArchiveCronTest::$fixture = new Test_Piwik_Fixture_ManySitesImportedLogs(); -Test_Piwik_Integration_ArchiveCronTest::$fixture->addSegments = true; +Test_Piwik_Integration_ArchiveCronTest::$fixture->addSegments = true; \ No newline at end of file