diff options
Diffstat (limited to 'plugins/CoreAdminHome')
| -rw-r--r-- | plugins/CoreAdminHome/API.php | 16 | ||||
| -rw-r--r-- | plugins/CoreAdminHome/Controller.php | 9 | ||||
| -rw-r--r-- | plugins/CoreAdminHome/CoreAdminHome.php | 22 |
3 files changed, 28 insertions, 19 deletions
diff --git a/plugins/CoreAdminHome/API.php b/plugins/CoreAdminHome/API.php index d9bf9b4cee..fe6772fe09 100644 --- a/plugins/CoreAdminHome/API.php +++ b/plugins/CoreAdminHome/API.php @@ -8,9 +8,13 @@ * @category Piwik_Plugins * @package Piwik_CoreAdminHome */ +use Piwik\DataAccess\ArchiveTableCreator; use Piwik\Period; +use Piwik\Period\Week; use Piwik\Piwik; +use Piwik\Config; use Piwik\Common; +use Piwik\Date; use Piwik\Site; /** @@ -85,7 +89,7 @@ class Piwik_CoreAdminHome_API $dates = array_unique($dates); foreach ($dates as $theDate) { try { - $date = Piwik_Date::factory($theDate); + $date = Date::factory($theDate); } catch (Exception $e) { $invalidDates[] = $theDate; continue; @@ -105,13 +109,13 @@ class Piwik_CoreAdminHome_API if ($logsDeleteEnabled && $logsAreDeletedBeforeThisDate ) { - $minimumDateWithLogs = Piwik_Date::factory('today')->subDay($logsAreDeletedBeforeThisDate); + $minimumDateWithLogs = Date::factory('today')->subDay($logsAreDeletedBeforeThisDate); } // Given the list of dates, process which tables they should be deleted from $minDate = false; $warningDates = $processedDates = array(); - /* @var $date Piwik_Date */ + /* @var $date Date */ foreach ($toInvalidate as $date) { // we should only delete reports for dates that are more recent than N days if ($minimumDateWithLogs @@ -131,7 +135,7 @@ class Piwik_CoreAdminHome_API $datesByMonth[$year][] = $date->toString(); // but also weeks overlapping several months stored in the month where the week is starting - /* @var $week Piwik_Period_Week */ + /* @var $week Week */ $week = Period::factory('week', $date); $weekAsString = $week->getDateStart()->toString('Y_m'); $datesByMonth[$weekAsString][] = $date->toString(); @@ -146,10 +150,10 @@ class Piwik_CoreAdminHome_API // In each table, invalidate day/week/month/year containing this date $sqlIdSites = implode(",", $idSites); - $archiveTables = Piwik_DataAccess_ArchiveTableCreator::getTablesArchivesInstalled(); + $archiveTables = ArchiveTableCreator::getTablesArchivesInstalled(); foreach ($archiveTables as $table) { // Extract Y_m from table name - $suffix = Piwik_DataAccess_ArchiveTableCreator::getDateFromTableName($table); + $suffix = ArchiveTableCreator::getDateFromTableName($table); if (!isset($datesByMonth[$suffix])) { continue; } diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php index 612a9e1c3e..5bae81c756 100644 --- a/plugins/CoreAdminHome/Controller.php +++ b/plugins/CoreAdminHome/Controller.php @@ -8,6 +8,7 @@ * @category Piwik_Plugins * @package Piwik_CoreAdminHome */ +use Piwik\ArchiveProcessor\Rules; use Piwik\Config; use Piwik\Piwik; use Piwik\Common; @@ -33,8 +34,8 @@ class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin $view = new Piwik_View('@CoreAdminHome/generalSettings'); if (Piwik::isUserIsSuperUser()) { - $enableBrowserTriggerArchiving = Piwik_ArchiveProcessor_Rules::isBrowserTriggerEnabled(); - $todayArchiveTimeToLive = Piwik_ArchiveProcessor_Rules::getTodayArchiveTimeToLive(); + $enableBrowserTriggerArchiving = Rules::isBrowserTriggerEnabled(); + $todayArchiveTimeToLive = Rules::getTodayArchiveTimeToLive(); $showWarningCron = false; if (!$enableBrowserTriggerArchiving && $todayArchiveTimeToLive < 3600 @@ -83,8 +84,8 @@ class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin $enableBrowserTriggerArchiving = Common::getRequestVar('enableBrowserTriggerArchiving'); $todayArchiveTimeToLive = Common::getRequestVar('todayArchiveTimeToLive'); - Piwik_ArchiveProcessor_Rules::setBrowserTriggerArchiving((bool)$enableBrowserTriggerArchiving); - Piwik_ArchiveProcessor_Rules::setTodayArchiveTimeToLive($todayArchiveTimeToLive); + Rules::setBrowserTriggerArchiving((bool)$enableBrowserTriggerArchiving); + Rules::setTodayArchiveTimeToLive($todayArchiveTimeToLive); // Update email settings $mail = array(); diff --git a/plugins/CoreAdminHome/CoreAdminHome.php b/plugins/CoreAdminHome/CoreAdminHome.php index 110feb03b6..39a4f08199 100644 --- a/plugins/CoreAdminHome/CoreAdminHome.php +++ b/plugins/CoreAdminHome/CoreAdminHome.php @@ -8,13 +8,17 @@ * @category Piwik_Plugins * @package Piwik_CoreAdminHome */ +use Piwik\DataAccess\ArchiveSelector; +use Piwik\DataAccess\ArchiveTableCreator; use Piwik\Piwik; +use Piwik\Date; +use Piwik\Plugin; /** * * @package Piwik_CoreAdminHome */ -class Piwik_CoreAdminHome extends Piwik_Plugin +class Piwik_CoreAdminHome extends Plugin { /** * @see Piwik_Plugin::getListHooksRegistered @@ -72,10 +76,10 @@ class Piwik_CoreAdminHome extends Piwik_Plugin function addMenu() { - Piwik_AddAdminSubMenu('CoreAdminHome_MenuManage', NULL, "", Piwik::isUserHasSomeAdminAccess(), $order = 1); - Piwik_AddAdminSubMenu('CoreAdminHome_MenuCommunity', NULL, "", Piwik::isUserHasSomeAdminAccess(), $order = 3); - Piwik_AddAdminSubMenu('CoreAdminHome_MenuDiagnostic', NULL, "", Piwik::isUserHasSomeAdminAccess(), $order = 20); - Piwik_AddAdminSubMenu('General_Settings', NULL, "", Piwik::isUserHasSomeAdminAccess(), $order = 5); + Piwik_AddAdminSubMenu('CoreAdminHome_MenuManage', null, "", Piwik::isUserHasSomeAdminAccess(), $order = 1); + Piwik_AddAdminSubMenu('CoreAdminHome_MenuCommunity', null, "", Piwik::isUserHasSomeAdminAccess(), $order = 3); + Piwik_AddAdminSubMenu('CoreAdminHome_MenuDiagnostic', null, "", Piwik::isUserHasSomeAdminAccess(), $order = 20); + Piwik_AddAdminSubMenu('General_Settings', null, "", Piwik::isUserHasSomeAdminAccess(), $order = 5); Piwik_AddAdminSubMenu('General_Settings', 'CoreAdminHome_MenuGeneralSettings', array('module' => 'CoreAdminHome', 'action' => 'generalSettings'), Piwik::isUserHasSomeAdminAccess(), @@ -89,17 +93,17 @@ class Piwik_CoreAdminHome extends Piwik_Plugin function purgeOutdatedArchives() { - $archiveTables = Piwik_DataAccess_ArchiveTableCreator::getTablesArchivesInstalled(); + $archiveTables = ArchiveTableCreator::getTablesArchivesInstalled(); foreach ($archiveTables as $table) { - $date = Piwik_DataAccess_ArchiveTableCreator::getDateFromTableName($table); + $date = ArchiveTableCreator::getDateFromTableName($table); list($month, $year) = explode('_', $date); - Piwik_DataAccess_ArchiveSelector::purgeOutdatedArchives(Piwik_Date::factory("$year-$month-15")); + ArchiveSelector::purgeOutdatedArchives(Date::factory("$year-$month-15")); } } function optimizeArchiveTable() { - $archiveTables = Piwik_DataAccess_ArchiveTableCreator::getTablesArchivesInstalled(); + $archiveTables = ArchiveTableCreator::getTablesArchivesInstalled(); Piwik_OptimizeTables($archiveTables); } } |