diff options
| author | mattab <matthieu.aubry@gmail.com> | 2013-07-20 11:09:46 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2013-07-20 11:09:46 +0400 |
| commit | 0a63210e3eae7562af1a3dbee340eb1ee140db3d (patch) | |
| tree | c9f7c3a36a4b344b25c12aa04fed0733efb3bfa0 /plugins | |
| parent | 7ca35544d15cdb41b17283e693c8a14777c923ad (diff) | |
Converting to namespace: Period*, Metrics, Segment, SegmentExpression, PluginsManager
Diffstat (limited to 'plugins')
49 files changed, 274 insertions, 231 deletions
diff --git a/plugins/API/API.php b/plugins/API/API.php index f55d83b934..b93dae7902 100644 --- a/plugins/API/API.php +++ b/plugins/API/API.php @@ -8,6 +8,7 @@ * @category Piwik_Plugins * @package Piwik_API */ +use Piwik\Metrics; use Piwik\Piwik; use Piwik\Common; use Piwik\Config; @@ -119,7 +120,7 @@ class Piwik_API_API */ static public function getDefaultMetricTranslations() { - return Piwik_Metrics::getDefaultMetricTranslations(); + return Metrics::getDefaultMetricTranslations(); } public function getSegmentsMetadata($idSites = array(), $_hideImplementationData = true) diff --git a/plugins/API/ProcessedReport.php b/plugins/API/ProcessedReport.php index 1788ce79c8..db30a13648 100644 --- a/plugins/API/ProcessedReport.php +++ b/plugins/API/ProcessedReport.php @@ -1,4 +1,5 @@ <?php +use Piwik\Metrics; use Piwik\Period; use Piwik\Piwik; use Piwik\Common; @@ -77,10 +78,10 @@ class Piwik_API_ProcessedReport Piwik_PostEvent('API.getReportMetadata', array(&$availableReports, $parameters)); foreach ($availableReports as &$availableReport) { if (!isset($availableReport['metrics'])) { - $availableReport['metrics'] = Piwik_Metrics::getDefaultMetrics(); + $availableReport['metrics'] = Metrics::getDefaultMetrics(); } if (!isset($availableReport['processedMetrics'])) { - $availableReport['processedMetrics'] = Piwik_Metrics::getDefaultProcessedMetrics(); + $availableReport['processedMetrics'] = Metrics::getDefaultProcessedMetrics(); } if ($hideMetricsDoc) // remove metric documentation if it's not wanted @@ -88,7 +89,7 @@ class Piwik_API_ProcessedReport unset($availableReport['metricsDocumentation']); } else if (!isset($availableReport['metricsDocumentation'])) { // set metric documentation to default if it's not set - $availableReport['metricsDocumentation'] = Piwik_Metrics::getDefaultMetricsDocumentation(); + $availableReport['metricsDocumentation'] = Metrics::getDefaultMetricsDocumentation(); } } @@ -101,7 +102,7 @@ class Piwik_API_ProcessedReport // Add the magic API.get report metadata aggregating all plugins API.get API calls automatically $this->addApiGetMetdata($availableReports); - $knownMetrics = array_merge(Piwik_Metrics::getDefaultMetrics(), Piwik_Metrics::getDefaultProcessedMetrics()); + $knownMetrics = array_merge(Metrics::getDefaultMetrics(), Metrics::getDefaultProcessedMetrics()); foreach ($availableReports as &$availableReport) { // Ensure all metrics have a translation $metrics = $availableReport['metrics']; @@ -327,7 +328,7 @@ class Piwik_API_ProcessedReport ); if (isset($reportMetadata['processedMetrics'])) { - $processedMetricsAdded = Piwik_Metrics::getDefaultProcessedMetrics(); + $processedMetricsAdded = Metrics::getDefaultProcessedMetrics(); foreach ($processedMetricsAdded as $processedMetricId => $processedMetricTranslation) { // this processed metric can be displayed for this report if (isset($reportMetadata['processedMetrics'][$processedMetricId])) { diff --git a/plugins/API/RowEvolution.php b/plugins/API/RowEvolution.php index cd7f469b94..13b1250a1c 100644 --- a/plugins/API/RowEvolution.php +++ b/plugins/API/RowEvolution.php @@ -221,7 +221,7 @@ class Piwik_API_RowEvolution // add "processed metrics" like actions per visit or bounce rate // note: some reports should not be filtered with AddColumnProcessedMetrics - // specifically, reports without the Piwik_Metrics::INDEX_NB_VISITS metric such as Goals.getVisitsUntilConversion & Goal.getDaysToConversion + // specifically, reports without the Metrics::INDEX_NB_VISITS metric such as Goals.getVisitsUntilConversion & Goal.getDaysToConversion // this is because the AddColumnProcessedMetrics filter removes all datable rows lacking this metric if ( diff --git a/plugins/Actions/API.php b/plugins/Actions/API.php index 3c824c574f..0262f807e0 100644 --- a/plugins/Actions/API.php +++ b/plugins/Actions/API.php @@ -9,6 +9,7 @@ * @package Piwik_Actions */ use Piwik\Archive; +use Piwik\Metrics; use Piwik\Piwik; use Piwik\Common; @@ -277,7 +278,7 @@ class Piwik_Actions_API public function getSiteSearchKeywords($idSite, $period, $date, $segment = false) { $dataTable = $this->getSiteSearchKeywordsRaw($idSite, $period, $date, $segment); - $dataTable->deleteColumn(Piwik_Metrics::INDEX_SITE_SEARCH_HAS_NO_RESULT); + $dataTable->deleteColumn(Metrics::INDEX_SITE_SEARCH_HAS_NO_RESULT); $this->filterPageDatatable($dataTable); $this->filterActionsDataTable($dataTable); $this->addPagesPerSearchColumn($dataTable); @@ -302,11 +303,11 @@ class Piwik_Actions_API // Delete all rows that have some results $dataTable->filter('ColumnCallbackDeleteRow', array( - Piwik_Metrics::INDEX_SITE_SEARCH_HAS_NO_RESULT, + Metrics::INDEX_SITE_SEARCH_HAS_NO_RESULT, create_function('$value', 'return $value >= 1;') )); $dataTable->deleteRow(Piwik_DataTable::ID_SUMMARY_ROW); - $dataTable->deleteColumn(Piwik_Metrics::INDEX_SITE_SEARCH_HAS_NO_RESULT); + $dataTable->deleteColumn(Metrics::INDEX_SITE_SEARCH_HAS_NO_RESULT); $this->filterPageDatatable($dataTable); $this->filterActionsDataTable($dataTable); $this->addPagesPerSearchColumn($dataTable); @@ -472,7 +473,7 @@ class Piwik_Actions_API $dataTable->queueFilter('ColumnCallbackAddColumnPercentage', array('exit_rate', 'exit_nb_visits', 'nb_visits', 0)); // Handle performance analytics - $hasTimeGeneration = (array_sum($dataTable->getColumn(Piwik_Metrics::INDEX_PAGE_SUM_TIME_GENERATION)) > 0); + $hasTimeGeneration = (array_sum($dataTable->getColumn(Metrics::INDEX_PAGE_SUM_TIME_GENERATION)) > 0); if ($hasTimeGeneration) { // Average generation time = total generation time / number of pageviews $precisionAvgTimeGeneration = 3; @@ -482,10 +483,10 @@ class Piwik_Actions_API // No generation time: remove it from the API output and add it to empty_columns metadata, so that // the columns can also be removed from the view $dataTable->filter('ColumnDelete', array(array( - Piwik_Metrics::INDEX_PAGE_SUM_TIME_GENERATION, - Piwik_Metrics::INDEX_PAGE_NB_HITS_WITH_TIME_GENERATION, - Piwik_Metrics::INDEX_PAGE_MIN_TIME_GENERATION, - Piwik_Metrics::INDEX_PAGE_MAX_TIME_GENERATION + Metrics::INDEX_PAGE_SUM_TIME_GENERATION, + Metrics::INDEX_PAGE_NB_HITS_WITH_TIME_GENERATION, + Metrics::INDEX_PAGE_MIN_TIME_GENERATION, + Metrics::INDEX_PAGE_MAX_TIME_GENERATION ))); if ($dataTable instanceof Piwik_DataTable) { diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php index cb8716aba0..03109bfdb9 100644 --- a/plugins/Actions/Actions.php +++ b/plugins/Actions/Actions.php @@ -10,6 +10,7 @@ */ use Piwik\Piwik; use Piwik\Common; +use Piwik\SegmentExpression; use Piwik\Site; /** @@ -148,8 +149,8 @@ class Piwik_Actions extends Piwik_Plugin $valueToMatch = Common::sanitizeInputValue(Common::unsanitizeInputValue($valueToMatch)); // exact matches work by returning the id directly - if ($matchType == Piwik_SegmentExpression::MATCH_EQUAL - || $matchType == Piwik_SegmentExpression::MATCH_NOT_EQUAL + if ($matchType == SegmentExpression::MATCH_EQUAL + || $matchType == SegmentExpression::MATCH_NOT_EQUAL ) { $sql = Piwik_Tracker_Action::getSqlSelectActionId(); $bind = array($valueToMatch, $valueToMatch, $actionType); @@ -596,7 +597,7 @@ class Piwik_Actions extends Piwik_Plugin static protected function isCustomVariablesPluginsEnabled() { - return Piwik_PluginsManager::getInstance()->isPluginActivated('CustomVariables'); + return PluginsManager::getInstance()->isPluginActivated('CustomVariables'); } /** diff --git a/plugins/Actions/Archiver.php b/plugins/Actions/Archiver.php index c4a2bf24af..f512bd36ea 100644 --- a/plugins/Actions/Archiver.php +++ b/plugins/Actions/Archiver.php @@ -9,6 +9,7 @@ * @package Piwik_Actions */ use Piwik\Config; +use Piwik\Metrics; /** * Class encapsulating logic to process Day/Period Archiving for the Actions reports @@ -54,18 +55,18 @@ class Piwik_Actions_Archiver extends Piwik_PluginsArchiver Piwik_Tracker_Action::TYPE_SITE_SEARCH, ); static protected $invalidSummedColumnNameToRenamedNameFromPeriodArchive = array( - Piwik_Metrics::INDEX_NB_UNIQ_VISITORS => Piwik_Metrics::INDEX_SUM_DAILY_NB_UNIQ_VISITORS, - Piwik_Metrics::INDEX_PAGE_ENTRY_NB_UNIQ_VISITORS => Piwik_Metrics::INDEX_PAGE_ENTRY_SUM_DAILY_NB_UNIQ_VISITORS, - Piwik_Metrics::INDEX_PAGE_EXIT_NB_UNIQ_VISITORS => Piwik_Metrics::INDEX_PAGE_EXIT_SUM_DAILY_NB_UNIQ_VISITORS, + Metrics::INDEX_NB_UNIQ_VISITORS => Metrics::INDEX_SUM_DAILY_NB_UNIQ_VISITORS, + Metrics::INDEX_PAGE_ENTRY_NB_UNIQ_VISITORS => Metrics::INDEX_PAGE_ENTRY_SUM_DAILY_NB_UNIQ_VISITORS, + Metrics::INDEX_PAGE_EXIT_NB_UNIQ_VISITORS => Metrics::INDEX_PAGE_EXIT_SUM_DAILY_NB_UNIQ_VISITORS, ); static protected $invalidSummedColumnNameToDeleteFromDayArchive = array( - Piwik_Metrics::INDEX_NB_UNIQ_VISITORS, - Piwik_Metrics::INDEX_PAGE_ENTRY_NB_UNIQ_VISITORS, - Piwik_Metrics::INDEX_PAGE_EXIT_NB_UNIQ_VISITORS, + Metrics::INDEX_NB_UNIQ_VISITORS, + Metrics::INDEX_PAGE_ENTRY_NB_UNIQ_VISITORS, + Metrics::INDEX_PAGE_EXIT_NB_UNIQ_VISITORS, ); private static $actionColumnAggregationOperations = array( - Piwik_Metrics::INDEX_PAGE_MAX_TIME_GENERATION => 'max', - Piwik_Metrics::INDEX_PAGE_MIN_TIME_GENERATION => 'min' + Metrics::INDEX_PAGE_MAX_TIME_GENERATION => 'max', + Metrics::INDEX_PAGE_MIN_TIME_GENERATION => 'min' ); protected $actionsTablesByType = null; protected $isSiteSearchEnabled = false; @@ -171,25 +172,25 @@ class Piwik_Actions_Archiver extends Piwik_PluginsArchiver log_action.type, log_action.idaction, log_action.url_prefix, - count(distinct log_link_visit_action.idvisit) as `" . Piwik_Metrics::INDEX_NB_VISITS . "`, - count(distinct log_link_visit_action.idvisitor) as `" . Piwik_Metrics::INDEX_NB_UNIQ_VISITORS . "`, - count(*) as `" . Piwik_Metrics::INDEX_PAGE_NB_HITS . "`, + count(distinct log_link_visit_action.idvisit) as `" . Metrics::INDEX_NB_VISITS . "`, + count(distinct log_link_visit_action.idvisitor) as `" . Metrics::INDEX_NB_UNIQ_VISITORS . "`, + count(*) as `" . Metrics::INDEX_PAGE_NB_HITS . "`, sum( case when " . Piwik_Tracker_Action::DB_COLUMN_TIME_GENERATION . " is null then 0 else " . Piwik_Tracker_Action::DB_COLUMN_TIME_GENERATION . " end - ) / 1000 as `" . Piwik_Metrics::INDEX_PAGE_SUM_TIME_GENERATION . "`, + ) / 1000 as `" . Metrics::INDEX_PAGE_SUM_TIME_GENERATION . "`, sum( case when " . Piwik_Tracker_Action::DB_COLUMN_TIME_GENERATION . " is null then 0 else 1 end - ) as `" . Piwik_Metrics::INDEX_PAGE_NB_HITS_WITH_TIME_GENERATION . "`, + ) as `" . Metrics::INDEX_PAGE_NB_HITS_WITH_TIME_GENERATION . "`, min(" . Piwik_Tracker_Action::DB_COLUMN_TIME_GENERATION . ") / 1000 - as `" . Piwik_Metrics::INDEX_PAGE_MIN_TIME_GENERATION . "`, + as `" . Metrics::INDEX_PAGE_MIN_TIME_GENERATION . "`, max(" . Piwik_Tracker_Action::DB_COLUMN_TIME_GENERATION . ") / 1000 - as `" . Piwik_Metrics::INDEX_PAGE_MAX_TIME_GENERATION . "` + as `" . Metrics::INDEX_PAGE_MAX_TIME_GENERATION . "` "; $from = array( @@ -206,23 +207,23 @@ class Piwik_Actions_Archiver extends Piwik_PluginsArchiver AND log_link_visit_action.%s IS NOT NULL"; $groupBy = "log_action.idaction"; - $orderBy = "`" . Piwik_Metrics::INDEX_PAGE_NB_HITS . "` DESC, name ASC"; + $orderBy = "`" . Metrics::INDEX_PAGE_NB_HITS . "` DESC, name ASC"; $rankingQuery = false; if ($rankingQueryLimit > 0) { $rankingQuery = new Piwik_RankingQuery($rankingQueryLimit); $rankingQuery->setOthersLabel(Piwik_DataTable::LABEL_SUMMARY_ROW); $rankingQuery->addLabelColumn(array('idaction', 'name')); - $rankingQuery->addColumn(array('url_prefix', Piwik_Metrics::INDEX_NB_UNIQ_VISITORS)); - $rankingQuery->addColumn(array(Piwik_Metrics::INDEX_PAGE_NB_HITS, Piwik_Metrics::INDEX_NB_VISITS), 'sum'); + $rankingQuery->addColumn(array('url_prefix', Metrics::INDEX_NB_UNIQ_VISITORS)); + $rankingQuery->addColumn(array(Metrics::INDEX_PAGE_NB_HITS, Metrics::INDEX_NB_VISITS), 'sum'); if ($this->isSiteSearchEnabled()) { - $rankingQuery->addColumn(Piwik_Metrics::INDEX_SITE_SEARCH_HAS_NO_RESULT, 'min'); - $rankingQuery->addColumn(Piwik_Metrics::INDEX_PAGE_IS_FOLLOWING_SITE_SEARCH_NB_HITS, 'sum'); + $rankingQuery->addColumn(Metrics::INDEX_SITE_SEARCH_HAS_NO_RESULT, 'min'); + $rankingQuery->addColumn(Metrics::INDEX_PAGE_IS_FOLLOWING_SITE_SEARCH_NB_HITS, 'sum'); } - $rankingQuery->addColumn(Piwik_Metrics::INDEX_PAGE_SUM_TIME_GENERATION, 'sum'); - $rankingQuery->addColumn(Piwik_Metrics::INDEX_PAGE_NB_HITS_WITH_TIME_GENERATION, 'sum'); - $rankingQuery->addColumn(Piwik_Metrics::INDEX_PAGE_MIN_TIME_GENERATION, 'min'); - $rankingQuery->addColumn(Piwik_Metrics::INDEX_PAGE_MAX_TIME_GENERATION, 'max'); + $rankingQuery->addColumn(Metrics::INDEX_PAGE_SUM_TIME_GENERATION, 'sum'); + $rankingQuery->addColumn(Metrics::INDEX_PAGE_NB_HITS_WITH_TIME_GENERATION, 'sum'); + $rankingQuery->addColumn(Metrics::INDEX_PAGE_MIN_TIME_GENERATION, 'min'); + $rankingQuery->addColumn(Metrics::INDEX_PAGE_MAX_TIME_GENERATION, 'max'); $rankingQuery->partitionResultIntoMultipleGroups('type', array_keys($this->actionsTablesByType)); } @@ -231,7 +232,7 @@ class Piwik_Actions_Archiver extends Piwik_PluginsArchiver // 2) For each page view, count number of times the referrer page was a Site Search if ($this->isSiteSearchEnabled()) { $selectFlagNoResultKeywords = ", - CASE WHEN (MAX(log_link_visit_action.custom_var_v" . Piwik_Tracker_Action::CVAR_INDEX_SEARCH_COUNT . ") = 0 AND log_link_visit_action.custom_var_k" . Piwik_Tracker_Action::CVAR_INDEX_SEARCH_COUNT . " = '" . Piwik_Tracker_Action::CVAR_KEY_SEARCH_COUNT . "') THEN 1 ELSE 0 END AS `" . Piwik_Metrics::INDEX_SITE_SEARCH_HAS_NO_RESULT . "`"; + CASE WHEN (MAX(log_link_visit_action.custom_var_v" . Piwik_Tracker_Action::CVAR_INDEX_SEARCH_COUNT . ") = 0 AND log_link_visit_action.custom_var_k" . Piwik_Tracker_Action::CVAR_INDEX_SEARCH_COUNT . " = '" . Piwik_Tracker_Action::CVAR_KEY_SEARCH_COUNT . "') THEN 1 ELSE 0 END AS `" . Metrics::INDEX_SITE_SEARCH_HAS_NO_RESULT . "`"; //we need an extra JOIN to know whether the referrer "idaction_name_ref" was a Site Search request $from[] = array( @@ -241,7 +242,7 @@ class Piwik_Actions_Archiver extends Piwik_PluginsArchiver ); $selectSiteSearchFollowingPages = ", - SUM(CASE WHEN log_action_name_ref.type = " . Piwik_Tracker_Action::TYPE_SITE_SEARCH . " THEN 1 ELSE 0 END) AS `" . Piwik_Metrics::INDEX_PAGE_IS_FOLLOWING_SITE_SEARCH_NB_HITS . "`"; + SUM(CASE WHEN log_action_name_ref.type = " . Piwik_Tracker_Action::TYPE_SITE_SEARCH . " THEN 1 ELSE 0 END) AS `" . Metrics::INDEX_PAGE_IS_FOLLOWING_SITE_SEARCH_NB_HITS . "`"; $select .= $selectFlagNoResultKeywords . $selectSiteSearchFollowingPages; @@ -292,11 +293,11 @@ class Piwik_Actions_Archiver extends Piwik_PluginsArchiver $rankingQuery = new Piwik_RankingQuery($rankingQueryLimit); $rankingQuery->setOthersLabel(Piwik_DataTable::LABEL_SUMMARY_ROW); $rankingQuery->addLabelColumn('idaction'); - $rankingQuery->addColumn(Piwik_Metrics::INDEX_PAGE_ENTRY_NB_UNIQ_VISITORS); - $rankingQuery->addColumn(array(Piwik_Metrics::INDEX_PAGE_ENTRY_NB_VISITS, - Piwik_Metrics::INDEX_PAGE_ENTRY_NB_ACTIONS, - Piwik_Metrics::INDEX_PAGE_ENTRY_SUM_VISIT_LENGTH, - Piwik_Metrics::INDEX_PAGE_ENTRY_BOUNCE_COUNT), 'sum'); + $rankingQuery->addColumn(Metrics::INDEX_PAGE_ENTRY_NB_UNIQ_VISITORS); + $rankingQuery->addColumn(array(Metrics::INDEX_PAGE_ENTRY_NB_VISITS, + Metrics::INDEX_PAGE_ENTRY_NB_ACTIONS, + Metrics::INDEX_PAGE_ENTRY_SUM_VISIT_LENGTH, + Metrics::INDEX_PAGE_ENTRY_BOUNCE_COUNT), 'sum'); $rankingQuery->partitionResultIntoMultipleGroups('type', array_keys($this->actionsTablesByType)); $extraSelects = 'log_action.type, log_action.name,'; @@ -307,7 +308,7 @@ class Piwik_Actions_Archiver extends Piwik_PluginsArchiver "joinOn" => "log_visit.%s = log_action.idaction" ) ); - $orderBy = "`" . Piwik_Metrics::INDEX_PAGE_ENTRY_NB_ACTIONS . "` DESC, log_action.name ASC"; + $orderBy = "`" . Metrics::INDEX_PAGE_ENTRY_NB_ACTIONS . "` DESC, log_action.name ASC"; } else { $extraSelects = false; $from = "log_visit"; @@ -315,11 +316,11 @@ class Piwik_Actions_Archiver extends Piwik_PluginsArchiver } $select = "log_visit.%s as idaction, $extraSelects - count(distinct log_visit.idvisitor) as `" . Piwik_Metrics::INDEX_PAGE_ENTRY_NB_UNIQ_VISITORS . "`, - count(*) as `" . Piwik_Metrics::INDEX_PAGE_ENTRY_NB_VISITS . "`, - sum(log_visit.visit_total_actions) as `" . Piwik_Metrics::INDEX_PAGE_ENTRY_NB_ACTIONS . "`, - sum(log_visit.visit_total_time) as `" . Piwik_Metrics::INDEX_PAGE_ENTRY_SUM_VISIT_LENGTH . "`, - sum(case log_visit.visit_total_actions when 1 then 1 when 0 then 1 else 0 end) as `" . Piwik_Metrics::INDEX_PAGE_ENTRY_BOUNCE_COUNT . "`"; + count(distinct log_visit.idvisitor) as `" . Metrics::INDEX_PAGE_ENTRY_NB_UNIQ_VISITORS . "`, + count(*) as `" . Metrics::INDEX_PAGE_ENTRY_NB_VISITS . "`, + sum(log_visit.visit_total_actions) as `" . Metrics::INDEX_PAGE_ENTRY_NB_ACTIONS . "`, + sum(log_visit.visit_total_time) as `" . Metrics::INDEX_PAGE_ENTRY_SUM_VISIT_LENGTH . "`, + sum(case log_visit.visit_total_actions when 1 then 1 when 0 then 1 else 0 end) as `" . Metrics::INDEX_PAGE_ENTRY_BOUNCE_COUNT . "`"; $where = "log_visit.visit_last_action_time >= ? AND log_visit.visit_last_action_time <= ? @@ -343,8 +344,8 @@ class Piwik_Actions_Archiver extends Piwik_PluginsArchiver $rankingQuery = new Piwik_RankingQuery($rankingQueryLimit); $rankingQuery->setOthersLabel(Piwik_DataTable::LABEL_SUMMARY_ROW); $rankingQuery->addLabelColumn('idaction'); - $rankingQuery->addColumn(Piwik_Metrics::INDEX_PAGE_EXIT_NB_UNIQ_VISITORS); - $rankingQuery->addColumn(Piwik_Metrics::INDEX_PAGE_EXIT_NB_VISITS, 'sum'); + $rankingQuery->addColumn(Metrics::INDEX_PAGE_EXIT_NB_UNIQ_VISITORS); + $rankingQuery->addColumn(Metrics::INDEX_PAGE_EXIT_NB_VISITS, 'sum'); $rankingQuery->partitionResultIntoMultipleGroups('type', array_keys($this->actionsTablesByType)); $extraSelects = 'log_action.type, log_action.name,'; @@ -355,7 +356,7 @@ class Piwik_Actions_Archiver extends Piwik_PluginsArchiver "joinOn" => "log_visit.%s = log_action.idaction" ) ); - $orderBy = "`" . Piwik_Metrics::INDEX_PAGE_EXIT_NB_VISITS . "` DESC, log_action.name ASC"; + $orderBy = "`" . Metrics::INDEX_PAGE_EXIT_NB_VISITS . "` DESC, log_action.name ASC"; } else { $extraSelects = false; $from = "log_visit"; @@ -363,8 +364,8 @@ class Piwik_Actions_Archiver extends Piwik_PluginsArchiver } $select = "log_visit.%s as idaction, $extraSelects - count(distinct log_visit.idvisitor) as `" . Piwik_Metrics::INDEX_PAGE_EXIT_NB_UNIQ_VISITORS . "`, - count(*) as `" . Piwik_Metrics::INDEX_PAGE_EXIT_NB_VISITS . "`"; + count(distinct log_visit.idvisitor) as `" . Metrics::INDEX_PAGE_EXIT_NB_UNIQ_VISITORS . "`, + count(*) as `" . Metrics::INDEX_PAGE_EXIT_NB_VISITS . "`"; $where = "log_visit.visit_last_action_time >= ? AND log_visit.visit_last_action_time <= ? @@ -389,10 +390,10 @@ class Piwik_Actions_Archiver extends Piwik_PluginsArchiver $rankingQuery = new Piwik_RankingQuery($rankingQueryLimit); $rankingQuery->setOthersLabel(Piwik_DataTable::LABEL_SUMMARY_ROW); $rankingQuery->addLabelColumn('idaction'); - $rankingQuery->addColumn(Piwik_Metrics::INDEX_PAGE_SUM_TIME_SPENT, 'sum'); + $rankingQuery->addColumn(Metrics::INDEX_PAGE_SUM_TIME_SPENT, 'sum'); $rankingQuery->partitionResultIntoMultipleGroups('type', array_keys($this->actionsTablesByType)); - $extraSelects = "log_action.type, log_action.name, count(*) as `" . Piwik_Metrics::INDEX_PAGE_NB_HITS . "`,"; + $extraSelects = "log_action.type, log_action.name, count(*) as `" . Metrics::INDEX_PAGE_NB_HITS . "`,"; $from = array( "log_link_visit_action", array( @@ -400,7 +401,7 @@ class Piwik_Actions_Archiver extends Piwik_PluginsArchiver "joinOn" => "log_link_visit_action.%s = log_action.idaction" ) ); - $orderBy = "`" . Piwik_Metrics::INDEX_PAGE_NB_HITS . "` DESC, log_action.name ASC"; + $orderBy = "`" . Metrics::INDEX_PAGE_NB_HITS . "` DESC, log_action.name ASC"; } else { $extraSelects = false; $from = "log_link_visit_action"; @@ -408,7 +409,7 @@ class Piwik_Actions_Archiver extends Piwik_PluginsArchiver } $select = "log_link_visit_action.%s as idaction, $extraSelects - sum(log_link_visit_action.time_spent_ref_action) as `" . Piwik_Metrics::INDEX_PAGE_SUM_TIME_SPENT . "`"; + sum(log_link_visit_action.time_spent_ref_action) as `" . Metrics::INDEX_PAGE_SUM_TIME_SPENT . "`"; $where = "log_link_visit_action.server_time >= ? AND log_link_visit_action.server_time <= ? @@ -443,10 +444,10 @@ class Piwik_Actions_Archiver extends Piwik_PluginsArchiver $this->recordDataTable($dataTable, self::PAGE_URLS_RECORD_NAME); $records = array( - self::METRIC_PAGEVIEWS_RECORD_NAME => array_sum($dataTable->getColumn(Piwik_Metrics::INDEX_PAGE_NB_HITS)), - self::METRIC_UNIQ_PAGEVIEWS_RECORD_NAME => array_sum($dataTable->getColumn(Piwik_Metrics::INDEX_NB_VISITS)), - self::METRIC_SUM_TIME_RECORD_NAME => array_sum($dataTable->getColumn(Piwik_Metrics::INDEX_PAGE_SUM_TIME_GENERATION)), - self::METRIC_HITS_TIMED_RECORD_NAME => array_sum($dataTable->getColumn(Piwik_Metrics::INDEX_PAGE_NB_HITS_WITH_TIME_GENERATION)) + self::METRIC_PAGEVIEWS_RECORD_NAME => array_sum($dataTable->getColumn(Metrics::INDEX_PAGE_NB_HITS)), + self::METRIC_UNIQ_PAGEVIEWS_RECORD_NAME => array_sum($dataTable->getColumn(Metrics::INDEX_NB_VISITS)), + self::METRIC_SUM_TIME_RECORD_NAME => array_sum($dataTable->getColumn(Metrics::INDEX_PAGE_SUM_TIME_GENERATION)), + self::METRIC_HITS_TIMED_RECORD_NAME => array_sum($dataTable->getColumn(Metrics::INDEX_PAGE_NB_HITS_WITH_TIME_GENERATION)) ); $this->getProcessor()->insertNumericRecords( $records ); } @@ -502,7 +503,7 @@ class Piwik_Actions_Archiver extends Piwik_PluginsArchiver { // Delete all columns that have a value of zero $dataTable->filter('ColumnDelete', array( - $columnsToRemove = array(Piwik_Metrics::INDEX_PAGE_IS_FOLLOWING_SITE_SEARCH_NB_HITS), + $columnsToRemove = array(Metrics::INDEX_PAGE_IS_FOLLOWING_SITE_SEARCH_NB_HITS), $columnsToKeep = array(), $deleteIfZeroOnly = true )); @@ -513,8 +514,8 @@ class Piwik_Actions_Archiver extends Piwik_PluginsArchiver $dataTable = $this->getDataTable(Piwik_Tracker_Action::TYPE_DOWNLOAD); $this->recordDataTable($dataTable, self::DOWNLOADS_RECORD_NAME); - $this->getProcessor()->insertNumericRecord(self::METRIC_DOWNLOADS_RECORD_NAME, array_sum($dataTable->getColumn(Piwik_Metrics::INDEX_PAGE_NB_HITS))); - $this->getProcessor()->insertNumericRecord(self::METRIC_UNIQ_DOWNLOADS_RECORD_NAME, array_sum($dataTable->getColumn(Piwik_Metrics::INDEX_NB_VISITS))); + $this->getProcessor()->insertNumericRecord(self::METRIC_DOWNLOADS_RECORD_NAME, array_sum($dataTable->getColumn(Metrics::INDEX_PAGE_NB_HITS))); + $this->getProcessor()->insertNumericRecord(self::METRIC_UNIQ_DOWNLOADS_RECORD_NAME, array_sum($dataTable->getColumn(Metrics::INDEX_NB_VISITS))); } protected function recordOutlinksReports() @@ -522,8 +523,8 @@ class Piwik_Actions_Archiver extends Piwik_PluginsArchiver $dataTable = $this->getDataTable(Piwik_Tracker_Action::TYPE_OUTLINK); $this->recordDataTable($dataTable, self::OUTLINKS_RECORD_NAME); - $this->getProcessor()->insertNumericRecord(self::METRIC_OUTLINKS_RECORD_NAME, array_sum($dataTable->getColumn(Piwik_Metrics::INDEX_PAGE_NB_HITS))); - $this->getProcessor()->insertNumericRecord(self::METRIC_UNIQ_OUTLINKS_RECORD_NAME, array_sum($dataTable->getColumn(Piwik_Metrics::INDEX_NB_VISITS))); + $this->getProcessor()->insertNumericRecord(self::METRIC_OUTLINKS_RECORD_NAME, array_sum($dataTable->getColumn(Metrics::INDEX_PAGE_NB_HITS))); + $this->getProcessor()->insertNumericRecord(self::METRIC_UNIQ_OUTLINKS_RECORD_NAME, array_sum($dataTable->getColumn(Metrics::INDEX_NB_VISITS))); } protected function recordPageTitlesReports() @@ -538,21 +539,21 @@ class Piwik_Actions_Archiver extends Piwik_PluginsArchiver $this->deleteUnusedColumnsFromKeywordsDataTable($dataTable); $this->recordDataTable($dataTable, self::SITE_SEARCH_RECORD_NAME); - $this->getProcessor()->insertNumericRecord(self::METRIC_SEARCHES_RECORD_NAME, array_sum($dataTable->getColumn(Piwik_Metrics::INDEX_NB_VISITS))); + $this->getProcessor()->insertNumericRecord(self::METRIC_SEARCHES_RECORD_NAME, array_sum($dataTable->getColumn(Metrics::INDEX_NB_VISITS))); $this->getProcessor()->insertNumericRecord(self::METRIC_KEYWORDS_RECORD_NAME, $dataTable->getRowsCount()); } protected function deleteUnusedColumnsFromKeywordsDataTable($dataTable) { $columnsToDelete = array( - Piwik_Metrics::INDEX_NB_UNIQ_VISITORS, - Piwik_Metrics::INDEX_PAGE_IS_FOLLOWING_SITE_SEARCH_NB_HITS, - Piwik_Metrics::INDEX_PAGE_ENTRY_NB_UNIQ_VISITORS, - Piwik_Metrics::INDEX_PAGE_ENTRY_NB_ACTIONS, - Piwik_Metrics::INDEX_PAGE_ENTRY_SUM_VISIT_LENGTH, - Piwik_Metrics::INDEX_PAGE_ENTRY_NB_VISITS, - Piwik_Metrics::INDEX_PAGE_ENTRY_BOUNCE_COUNT, - Piwik_Metrics::INDEX_PAGE_EXIT_NB_UNIQ_VISITORS, + Metrics::INDEX_NB_UNIQ_VISITORS, + Metrics::INDEX_PAGE_IS_FOLLOWING_SITE_SEARCH_NB_HITS, + Metrics::INDEX_PAGE_ENTRY_NB_UNIQ_VISITORS, + Metrics::INDEX_PAGE_ENTRY_NB_ACTIONS, + Metrics::INDEX_PAGE_ENTRY_SUM_VISIT_LENGTH, + Metrics::INDEX_PAGE_ENTRY_NB_VISITS, + Metrics::INDEX_PAGE_ENTRY_BOUNCE_COUNT, + Metrics::INDEX_PAGE_EXIT_NB_UNIQ_VISITORS, ); $dataTable->deleteColumns($columnsToDelete); } diff --git a/plugins/Actions/ArchivingHelper.php b/plugins/Actions/ArchivingHelper.php index 72342adff7..514b75116b 100644 --- a/plugins/Actions/ArchivingHelper.php +++ b/plugins/Actions/ArchivingHelper.php @@ -9,6 +9,7 @@ * @package Piwik_Actions */ use Piwik\Config; +use Piwik\Metrics; /** * This static class provides: @@ -43,7 +44,7 @@ class Piwik_Actions_ArchivingHelper } if ($row['type'] != Piwik_Tracker_Action::TYPE_SITE_SEARCH) { - unset($row[Piwik_Metrics::INDEX_SITE_SEARCH_HAS_NO_RESULT]); + unset($row[Metrics::INDEX_SITE_SEARCH_HAS_NO_RESULT]); } // This will appear as <url /> in the API, which is actually very important to keep @@ -101,15 +102,15 @@ class Piwik_Actions_ArchivingHelper && !$actionRow->isSummaryRow() ) { if (($existingUrl = $actionRow->getMetadata('url')) !== false) { - if (!empty($row[Piwik_Metrics::INDEX_PAGE_NB_HITS]) - && $row[Piwik_Metrics::INDEX_PAGE_NB_HITS] > $actionRow->maxVisitsSummed + if (!empty($row[Metrics::INDEX_PAGE_NB_HITS]) + && $row[Metrics::INDEX_PAGE_NB_HITS] > $actionRow->maxVisitsSummed ) { $actionRow->setMetadata('url', $url); - $actionRow->maxVisitsSummed = $row[Piwik_Metrics::INDEX_PAGE_NB_HITS]; + $actionRow->maxVisitsSummed = $row[Metrics::INDEX_PAGE_NB_HITS]; } } else { $actionRow->setMetadata('url', $url); - $actionRow->maxVisitsSummed = !empty($row[Piwik_Metrics::INDEX_PAGE_NB_HITS]) ? $row[Piwik_Metrics::INDEX_PAGE_NB_HITS] : 0; + $actionRow->maxVisitsSummed = !empty($row[Metrics::INDEX_PAGE_NB_HITS]) ? $row[Metrics::INDEX_PAGE_NB_HITS] : 0; } } @@ -117,17 +118,17 @@ class Piwik_Actions_ArchivingHelper && $row['type'] != Piwik_Tracker_Action::TYPE_ACTION_NAME ) { // only keep performance metrics when they're used (i.e. for URLs and page titles) - if (array_key_exists(Piwik_Metrics::INDEX_PAGE_SUM_TIME_GENERATION, $row)) { - unset($row[Piwik_Metrics::INDEX_PAGE_SUM_TIME_GENERATION]); + if (array_key_exists(Metrics::INDEX_PAGE_SUM_TIME_GENERATION, $row)) { + unset($row[Metrics::INDEX_PAGE_SUM_TIME_GENERATION]); } - if (array_key_exists(Piwik_Metrics::INDEX_PAGE_NB_HITS_WITH_TIME_GENERATION, $row)) { - unset($row[Piwik_Metrics::INDEX_PAGE_NB_HITS_WITH_TIME_GENERATION]); + if (array_key_exists(Metrics::INDEX_PAGE_NB_HITS_WITH_TIME_GENERATION, $row)) { + unset($row[Metrics::INDEX_PAGE_NB_HITS_WITH_TIME_GENERATION]); } - if (array_key_exists(Piwik_Metrics::INDEX_PAGE_MIN_TIME_GENERATION, $row)) { - unset($row[Piwik_Metrics::INDEX_PAGE_MIN_TIME_GENERATION]); + if (array_key_exists(Metrics::INDEX_PAGE_MIN_TIME_GENERATION, $row)) { + unset($row[Metrics::INDEX_PAGE_MIN_TIME_GENERATION]); } - if (array_key_exists(Piwik_Metrics::INDEX_PAGE_MAX_TIME_GENERATION, $row)) { - unset($row[Piwik_Metrics::INDEX_PAGE_MAX_TIME_GENERATION]); + if (array_key_exists(Metrics::INDEX_PAGE_MAX_TIME_GENERATION, $row)) { + unset($row[Metrics::INDEX_PAGE_MAX_TIME_GENERATION]); } } @@ -151,7 +152,7 @@ class Piwik_Actions_ArchivingHelper // if the exit_action was not recorded properly in the log_link_visit_action // there would be an error message when getting the nb_hits column // we must fake the record and add the columns - if ($actionRow->getColumn(Piwik_Metrics::INDEX_PAGE_NB_HITS) === false) { + if ($actionRow->getColumn(Metrics::INDEX_PAGE_NB_HITS) === false) { // to test this code: delete the entries in log_link_action_visit for // a given exit_idaction_url foreach (self::getDefaultRow()->getColumns() as $name => $value) { @@ -174,7 +175,7 @@ class Piwik_Actions_ArchivingHelper */ private static function getColumnValuesMerged($columnName, $alreadyValue, $value) { - if ($columnName == Piwik_Metrics::INDEX_PAGE_MIN_TIME_GENERATION) { + if ($columnName == Metrics::INDEX_PAGE_MIN_TIME_GENERATION) { if (empty($alreadyValue)) { $newValue = $value; } else if (empty($value)) { @@ -184,7 +185,7 @@ class Piwik_Actions_ArchivingHelper } return $newValue; } - if ($columnName == Piwik_Metrics::INDEX_PAGE_MAX_TIME_GENERATION) { + if ($columnName == Metrics::INDEX_PAGE_MAX_TIME_GENERATION) { $newValue = max($alreadyValue, $value); return $newValue; } @@ -215,7 +216,7 @@ class Piwik_Actions_ArchivingHelper } self::$defaultActionName = Config::getInstance()->General['action_default_name']; - self::$columnToSortByBeforeTruncation = Piwik_Metrics::INDEX_NB_VISITS; + self::$columnToSortByBeforeTruncation = Metrics::INDEX_NB_VISITS; self::$maximumRowsInDataTableLevelZero = Config::getInstance()->General['datatable_archiving_maximum_rows_actions']; self::$maximumRowsInSubDataTable = Config::getInstance()->General['datatable_archiving_maximum_rows_subtable_actions']; @@ -239,9 +240,9 @@ class Piwik_Actions_ArchivingHelper // so we add this fake row information to make sure there is a nb_hits, etc. column for every action $row = new Piwik_DataTable_Row(array( Piwik_DataTable_Row::COLUMNS => array( - Piwik_Metrics::INDEX_NB_VISITS => 1, - Piwik_Metrics::INDEX_NB_UNIQ_VISITORS => 1, - Piwik_Metrics::INDEX_PAGE_NB_HITS => 1, + Metrics::INDEX_NB_VISITS => 1, + Metrics::INDEX_NB_UNIQ_VISITORS => 1, + Metrics::INDEX_PAGE_NB_HITS => 1, ))); } return $row; @@ -486,10 +487,10 @@ class Piwik_Actions_ArchivingHelper */ private static function getDefaultRowColumns() { - return array(Piwik_Metrics::INDEX_NB_VISITS => 0, - Piwik_Metrics::INDEX_NB_UNIQ_VISITORS => 0, - Piwik_Metrics::INDEX_PAGE_NB_HITS => 0, - Piwik_Metrics::INDEX_PAGE_SUM_TIME_SPENT => 0); + return array(Metrics::INDEX_NB_VISITS => 0, + Metrics::INDEX_NB_UNIQ_VISITORS => 0, + Metrics::INDEX_PAGE_NB_HITS => 0, + Metrics::INDEX_PAGE_SUM_TIME_SPENT => 0); } /** diff --git a/plugins/Actions/Controller.php b/plugins/Actions/Controller.php index f7597825e5..6044c225d8 100644 --- a/plugins/Actions/Controller.php +++ b/plugins/Actions/Controller.php @@ -49,7 +49,7 @@ class Piwik_Actions_Controller extends Piwik_Controller $view->noResultKeywords = $this->getSiteSearchNoResultKeywords(true); $view->pagesUrlsFollowingSiteSearch = $this->getPageUrlsFollowingSiteSearch(true); - $categoryTrackingEnabled = Piwik_PluginsManager::getInstance()->isPluginActivated('CustomVariables'); + $categoryTrackingEnabled = PluginsManager::getInstance()->isPluginActivated('CustomVariables'); if ($categoryTrackingEnabled) { $view->categories = $this->getSiteSearchCategories(true); } diff --git a/plugins/Annotations/API.php b/plugins/Annotations/API.php index faa7d76c97..603cce5431 100755 --- a/plugins/Annotations/API.php +++ b/plugins/Annotations/API.php @@ -9,6 +9,7 @@ * @package Piwik_Annotations */ use Piwik\Period; +use Piwik\Period_Range; use Piwik\Piwik; /** @@ -317,7 +318,7 @@ class Piwik_Annotations_API || $period == 'range' ) { if ($period == 'range') { - $oPeriod = new Piwik_Period_Range('day', $date); + $oPeriod = new Period_Range('day', $date); } else { $oPeriod = Period::factory($period, Piwik_Date::factory($date)); } diff --git a/plugins/CoreHome/Controller.php b/plugins/CoreHome/Controller.php index ded8a80658..08eabcbf82 100644 --- a/plugins/CoreHome/Controller.php +++ b/plugins/CoreHome/Controller.php @@ -31,7 +31,7 @@ class Piwik_CoreHome_Controller extends Piwik_Controller // User preference: default report to load is the All Websites dashboard if ($defaultReport == 'MultiSites' - && Piwik_PluginsManager::getInstance()->isPluginActivated('MultiSites') + && PluginsManager::getInstance()->isPluginActivated('MultiSites') ) { $module = 'MultiSites'; } diff --git a/plugins/CoreHome/DataTableRowAction/RowEvolution.php b/plugins/CoreHome/DataTableRowAction/RowEvolution.php index 4ca8bb6af3..4d16253e6b 100644 --- a/plugins/CoreHome/DataTableRowAction/RowEvolution.php +++ b/plugins/CoreHome/DataTableRowAction/RowEvolution.php @@ -9,6 +9,7 @@ * @package Piwik_CoreHome */ use Piwik\Common; +use Piwik\Metrics; /** * ROW EVOLUTION @@ -215,14 +216,14 @@ class Piwik_CoreHome_DataTableRowAction_RowEvolution $min = isset($metricData['min']) ? $metricData['min'] : 0; $change = isset($metricData['change']) ? $metricData['change'] : false; - $unit = Piwik_Metrics::getUnit($metric, $this->idSite); + $unit = Metrics::getUnit($metric, $this->idSite); $min .= $unit; $max .= $unit; $details = Piwik_Translate('RowEvolution_MetricBetweenText', array($min, $max)); if ($change !== false) { - $lowerIsBetter = Piwik_Metrics::isLowerValueBetter($metric); + $lowerIsBetter = Metrics::isLowerValueBetter($metric); if (substr($change, 0, 1) == '+') { $changeClass = $lowerIsBetter ? 'bad' : 'good'; $changeImage = $lowerIsBetter ? 'arrow_up_red' : 'arrow_up'; diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php index 85f8143063..64f7be4bb3 100644 --- a/plugins/CorePluginsAdmin/Controller.php +++ b/plugins/CorePluginsAdmin/Controller.php @@ -51,21 +51,21 @@ class Piwik_CorePluginsAdmin_Controller extends Piwik_Controller_Admin $plugins = array(); $listPlugins = array_merge( - Piwik_PluginsManager::getInstance()->readPluginsDirectory(), + PluginsManager::getInstance()->readPluginsDirectory(), Config::getInstance()->Plugins['Plugins'] ); $listPlugins = array_unique($listPlugins); foreach ($listPlugins as $pluginName) { - Piwik_PluginsManager::getInstance()->loadPlugin($pluginName); + PluginsManager::getInstance()->loadPlugin($pluginName); $plugins[$pluginName] = array( - 'activated' => Piwik_PluginsManager::getInstance()->isPluginActivated($pluginName), - 'alwaysActivated' => Piwik_PluginsManager::getInstance()->isPluginAlwaysActivated($pluginName), - 'uninstallable' => Piwik_PluginsManager::getInstance()->isPluginUninstallable($pluginName), + 'activated' => PluginsManager::getInstance()->isPluginActivated($pluginName), + 'alwaysActivated' => PluginsManager::getInstance()->isPluginAlwaysActivated($pluginName), + 'uninstallable' => PluginsManager::getInstance()->isPluginUninstallable($pluginName), ); } - Piwik_PluginsManager::getInstance()->loadPluginTranslations(); + PluginsManager::getInstance()->loadPluginTranslations(); - $loadedPlugins = Piwik_PluginsManager::getInstance()->getLoadedPlugins(); + $loadedPlugins = PluginsManager::getInstance()->getLoadedPlugins(); foreach ($loadedPlugins as $oPlugin) { $pluginName = $oPlugin->getPluginName(); $plugins[$pluginName]['info'] = $oPlugin->getInformation(); @@ -107,7 +107,7 @@ class Piwik_CorePluginsAdmin_Controller extends Piwik_Controller_Admin public function deactivate($redirectAfter = true) { $pluginName = $this->initPluginModification(); - Piwik_PluginsManager::getInstance()->deactivatePlugin($pluginName); + PluginsManager::getInstance()->deactivatePlugin($pluginName); $this->redirectAfterModification($redirectAfter); } @@ -129,14 +129,14 @@ class Piwik_CorePluginsAdmin_Controller extends Piwik_Controller_Admin public function activate($redirectAfter = true) { $pluginName = $this->initPluginModification(); - Piwik_PluginsManager::getInstance()->activatePlugin($pluginName); + PluginsManager::getInstance()->activatePlugin($pluginName); $this->redirectAfterModification($redirectAfter); } public function uninstall($redirectAfter = true) { $pluginName = $this->initPluginModification(); - $uninstalled = Piwik_PluginsManager::getInstance()->uninstallPlugin($pluginName); + $uninstalled = PluginsManager::getInstance()->uninstallPlugin($pluginName); if(!$uninstalled) { $path = Common::getPathToPiwikRoot() . '/plugins/' . $pluginName . '/'; $messagePermissions = Piwik::getErrorMessageMissingPermissions($path); diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php index 98f7d968fb..87f1beb634 100644 --- a/plugins/CoreUpdater/Controller.php +++ b/plugins/CoreUpdater/Controller.php @@ -345,7 +345,7 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller $this->coreError = true; break; } else { - Piwik_PluginsManager::getInstance()->deactivatePlugin($name); + PluginsManager::getInstance()->deactivatePlugin($name); $this->deactivatedPlugins[] = $name; } } diff --git a/plugins/CoreUpdater/CoreUpdater.php b/plugins/CoreUpdater/CoreUpdater.php index efc971908a..4c35b42029 100644 --- a/plugins/CoreUpdater/CoreUpdater.php +++ b/plugins/CoreUpdater/CoreUpdater.php @@ -32,7 +32,7 @@ class Piwik_CoreUpdater extends Piwik_Plugin public static function getComponentUpdates(Piwik_Updater $updater) { $updater->addComponentToCheck('core', Piwik_Version::VERSION); - $plugins = Piwik_PluginsManager::getInstance()->getLoadedPlugins(); + $plugins = PluginsManager::getInstance()->getLoadedPlugins(); foreach ($plugins as $pluginName => $plugin) { $updater->addComponentToCheck($pluginName, $plugin->getVersion()); } diff --git a/plugins/CustomVariables/API.php b/plugins/CustomVariables/API.php index b5b64f2791..800b916886 100644 --- a/plugins/CustomVariables/API.php +++ b/plugins/CustomVariables/API.php @@ -9,6 +9,7 @@ * @package Piwik_CustomVariables */ use Piwik\Archive; +use Piwik\Metrics; /** * The Custom Variables API lets you access reports for your <a href='http://piwik.org/docs/custom-variables/' target='_blank'>Custom Variables</a> names and values. @@ -43,7 +44,7 @@ class Piwik_CustomVariables_API protected function getDataTable($idSite, $period, $date, $segment, $expanded, $idSubtable) { $dataTable = Archive::getDataTableFromArchive(Piwik_CustomVariables_Archiver::CUSTOM_VARIABLE_RECORD_NAME, $idSite, $period, $date, $segment, $expanded, $idSubtable); - $dataTable->filter('Sort', array(Piwik_Metrics::INDEX_NB_ACTIONS, 'desc', $naturalSort = false, $expanded)); + $dataTable->filter('Sort', array(Metrics::INDEX_NB_ACTIONS, 'desc', $naturalSort = false, $expanded)); $dataTable->queueFilter('ReplaceColumnNames'); $dataTable->queueFilter('ColumnDelete', 'nb_uniq_visitors'); return $dataTable; diff --git a/plugins/CustomVariables/Archiver.php b/plugins/CustomVariables/Archiver.php index 89eaf7821a..08b15ec865 100644 --- a/plugins/CustomVariables/Archiver.php +++ b/plugins/CustomVariables/Archiver.php @@ -1,7 +1,7 @@ <?php use Piwik\Common; use Piwik\Config; - +use Piwik\Metrics; /** * Piwik - Open source web analytics @@ -46,7 +46,7 @@ class Piwik_CustomVariables_Archiver extends Piwik_PluginsArchiver $table = $this->getProcessor()->getDataTableFromDataArray($this->dataArray); $blob = $table->getSerialized( $this->maximumRowsInDataTableLevelZero, $this->maximumRowsInSubDataTable, - $columnToSort = Piwik_Metrics::INDEX_NB_VISITS + $columnToSort = Metrics::INDEX_NB_VISITS ); $this->getProcessor()->insertBlobRecord(self::CUSTOM_VARIABLE_RECORD_NAME, $blob); @@ -79,7 +79,7 @@ class Piwik_CustomVariables_Archiver extends Piwik_PluginsArchiver protected function getSelectAveragePrice() { return Piwik_DataAccess_LogAggregator::getSqlRevenue("AVG(log_link_visit_action.custom_var_v2)") - . " as `" . Piwik_Metrics::INDEX_ECOMMERCE_ITEM_PRICE_VIEWED . "`"; + . " as `" . Metrics::INDEX_ECOMMERCE_ITEM_PRICE_VIEWED . "`"; } protected function aggregateFromVisits($query, $keyField, $valueField) @@ -157,7 +157,7 @@ class Piwik_CustomVariables_Archiver extends Piwik_PluginsArchiver if ($this->isReservedKey($key)) { // Price tracking on Ecommerce product/category pages: // the average is returned from the SQL query so the price is not "summed" like other metrics - $index = Piwik_Metrics::INDEX_ECOMMERCE_ITEM_PRICE_VIEWED; + $index = Metrics::INDEX_ECOMMERCE_ITEM_PRICE_VIEWED; if (!empty($row[$index])) { $this->dataArray->setRowColumnPivot($key, $value, $index, (float)$row[$index]); } @@ -190,8 +190,8 @@ class Piwik_CustomVariables_Archiver extends Piwik_PluginsArchiver if (!self::isReservedKey($key) && Piwik_DataArray::isRowActions($row) ) { - unset($row[Piwik_Metrics::INDEX_NB_UNIQ_VISITORS]); - unset($row[Piwik_Metrics::INDEX_NB_VISITS]); + unset($row[Metrics::INDEX_NB_UNIQ_VISITORS]); + unset($row[Metrics::INDEX_NB_VISITS]); } } } @@ -200,6 +200,6 @@ class Piwik_CustomVariables_Archiver extends Piwik_PluginsArchiver { $nameToCount = $this->getProcessor()->aggregateDataTableReports( self::CUSTOM_VARIABLE_RECORD_NAME, $this->maximumRowsInDataTableLevelZero, $this->maximumRowsInSubDataTable, - $columnToSort = Piwik_Metrics::INDEX_NB_VISITS); + $columnToSort = Metrics::INDEX_NB_VISITS); } }
\ No newline at end of file diff --git a/plugins/DevicesDetection/API.php b/plugins/DevicesDetection/API.php index 01d783fb71..3117122c96 100644 --- a/plugins/DevicesDetection/API.php +++ b/plugins/DevicesDetection/API.php @@ -10,6 +10,7 @@ * @package Piwik_DevicesDetection */ use Piwik\Archive; +use Piwik\Metrics; use Piwik\Piwik; /** @@ -45,7 +46,7 @@ class Piwik_DevicesDetection_API Piwik::checkUserHasViewAccess($idSite); $archive = Archive::build($idSite, $period, $date, $segment); $dataTable = $archive->getDataTable($name); - $dataTable->filter('Sort', array(Piwik_Metrics::INDEX_NB_VISITS)); + $dataTable->filter('Sort', array(Metrics::INDEX_NB_VISITS)); $dataTable->queueFilter('ReplaceColumnNames'); $dataTable->queueFilter('ReplaceSummaryRowLabel'); return $dataTable; diff --git a/plugins/DevicesDetection/Archiver.php b/plugins/DevicesDetection/Archiver.php index 5b8114e412..6bf0288894 100644 --- a/plugins/DevicesDetection/Archiver.php +++ b/plugins/DevicesDetection/Archiver.php @@ -9,6 +9,8 @@ * @package Piwik_DevicesDetection */ +use Piwik\Metrics; + class Piwik_DevicesDetection_Archiver extends Piwik_PluginsArchiver { const DEVICE_TYPE_RECORD_NAME = 'DevicesDetection_types'; @@ -42,7 +44,7 @@ class Piwik_DevicesDetection_Archiver extends Piwik_PluginsArchiver { $metrics = $this->getProcessor()->getMetricsForDimension($labelSQL); $table = $this->getProcessor()->getDataTableFromDataArray($metrics); - $this->getProcessor()->insertBlobRecord($recordName, $table->getSerialized($this->maximumRows, null, Piwik_Metrics::INDEX_NB_VISITS)); + $this->getProcessor()->insertBlobRecord($recordName, $table->getSerialized($this->maximumRows, null, Metrics::INDEX_NB_VISITS)); } public function archivePeriod() diff --git a/plugins/ExampleUI/API.php b/plugins/ExampleUI/API.php index 697844a589..87bc64a88c 100644 --- a/plugins/ExampleUI/API.php +++ b/plugins/ExampleUI/API.php @@ -8,6 +8,7 @@ * @category Piwik_Plugins * @package Piwik_ExampleUI */ +use Piwik\Period_Range; /** * ExampleUI API is also an example API useful if you are developing a Piwik plugin. @@ -31,7 +32,7 @@ class Piwik_ExampleUI_API public function getTemperaturesEvolution($date, $period) { - $period = new Piwik_Period_Range($period, 'last30'); + $period = new Period_Range($period, 'last30'); $dateStart = $period->getDateStart()->toString('Y-m-d'); // eg. "2009-04-01" $dateEnd = $period->getDateEnd()->toString('Y-m-d'); // eg. "2009-04-30" diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php index aeffa5583b..5d0d0eab5c 100644 --- a/plugins/Goals/API.php +++ b/plugins/Goals/API.php @@ -9,6 +9,7 @@ * @package Piwik_Goals */ use Piwik\Archive; +use Piwik\Metrics; use Piwik\Piwik; use Piwik\Common; use Piwik\Site; @@ -215,14 +216,14 @@ class Piwik_Goals_API $archive = Archive::build($idSite, $period, $date); $dataTable = $archive->getDataTable($recordNameFinal); - $dataTable->filter('Sort', array(Piwik_Metrics::INDEX_ECOMMERCE_ITEM_REVENUE)); + $dataTable->filter('Sort', array(Metrics::INDEX_ECOMMERCE_ITEM_REVENUE)); $dataTable->queueFilter('ReplaceColumnNames'); $dataTable->queueFilter('ReplaceSummaryRowLabel'); $ordersColumn = 'orders'; if ($abandonedCarts) { $ordersColumn = 'abandoned_carts'; - $dataTable->renameColumn(Piwik_Metrics::INDEX_ECOMMERCE_ORDERS, $ordersColumn); + $dataTable->renameColumn(Metrics::INDEX_ECOMMERCE_ORDERS, $ordersColumn); } // Average price = sum product revenue / quantity @@ -308,15 +309,15 @@ class Piwik_Goals_API // If there is not already a 'sum price' for this product $rowFound = $dataTable->getRowFromLabel($rowView->getColumn('label')); $price = $rowFound - ? $rowFound->getColumn(Piwik_Metrics::INDEX_ECOMMERCE_ITEM_PRICE) + ? $rowFound->getColumn(Metrics::INDEX_ECOMMERCE_ITEM_PRICE) : false; if (empty($price)) { // If a price was tracked on the product page - if ($rowView->getColumn(Piwik_Metrics::INDEX_ECOMMERCE_ITEM_PRICE_VIEWED)) { - $rowView->renameColumn(Piwik_Metrics::INDEX_ECOMMERCE_ITEM_PRICE_VIEWED, 'avg_price'); + if ($rowView->getColumn(Metrics::INDEX_ECOMMERCE_ITEM_PRICE_VIEWED)) { + $rowView->renameColumn(Metrics::INDEX_ECOMMERCE_ITEM_PRICE_VIEWED, 'avg_price'); } } - $rowView->deleteColumn(Piwik_Metrics::INDEX_ECOMMERCE_ITEM_PRICE_VIEWED); + $rowView->deleteColumn(Metrics::INDEX_ECOMMERCE_ITEM_PRICE_VIEWED); } $dataTable->addDataTable($ecommerceViews); diff --git a/plugins/Goals/Archiver.php b/plugins/Goals/Archiver.php index 70d4fb1932..a22cc9ef98 100644 --- a/plugins/Goals/Archiver.php +++ b/plugins/Goals/Archiver.php @@ -9,6 +9,8 @@ * @package Piwik_Goals */ +use Piwik\Metrics; + class Piwik_Goals_Archiver extends Piwik_PluginsArchiver { const VISITS_UNTIL_RECORD_NAME = 'visits_until_conv'; @@ -121,20 +123,20 @@ class Piwik_Goals_Archiver extends Piwik_PluginsArchiver if (empty($visitsToConversions[$idGoal])) { $visitsToConversions[$idGoal] = new Piwik_DataTable(); } - $array = Piwik_DataAccess_LogAggregator::makeArrayOneColumn($row, Piwik_Metrics::INDEX_NB_CONVERSIONS, $prefixes[self::VISITS_UNTIL_RECORD_NAME]); + $array = Piwik_DataAccess_LogAggregator::makeArrayOneColumn($row, Metrics::INDEX_NB_CONVERSIONS, $prefixes[self::VISITS_UNTIL_RECORD_NAME]); $visitsToConversions[$idGoal]->addDataTable(Piwik_DataTable::makeFromIndexedArray($array)); if (empty($daysToConversions[$idGoal])) { $daysToConversions[$idGoal] = new Piwik_DataTable(); } - $array = Piwik_DataAccess_LogAggregator::makeArrayOneColumn($row, Piwik_Metrics::INDEX_NB_CONVERSIONS, $prefixes[self::DAYS_UNTIL_CONV_RECORD_NAME]); + $array = Piwik_DataAccess_LogAggregator::makeArrayOneColumn($row, Metrics::INDEX_NB_CONVERSIONS, $prefixes[self::DAYS_UNTIL_CONV_RECORD_NAME]); $daysToConversions[$idGoal]->addDataTable(Piwik_DataTable::makeFromIndexedArray($array)); // We don't want to sum Abandoned cart metrics in the overall revenue/conversions/converted visits // since it is a "negative conversion" if ($idGoal != Piwik_Tracker_GoalManager::IDGOAL_CART) { - $totalConversions += $row[Piwik_Metrics::INDEX_GOAL_NB_CONVERSIONS]; - $totalRevenue += $row[Piwik_Metrics::INDEX_GOAL_REVENUE]; + $totalConversions += $row[Metrics::INDEX_GOAL_NB_CONVERSIONS]; + $totalRevenue += $row[Metrics::INDEX_GOAL_REVENUE]; } } @@ -162,12 +164,12 @@ class Piwik_Goals_Archiver extends Piwik_PluginsArchiver $goals = $goals->getDataArray(); foreach ($goals as $idGoal => $array) { foreach ($array as $metricId => $value) { - $metricName = Piwik_Metrics::$mappingFromIdToNameGoal[$metricId]; + $metricName = Metrics::$mappingFromIdToNameGoal[$metricId]; $recordName = self::getRecordName($metricName, $idGoal); $numericRecords[$recordName] = $value; } - if(!empty($array[Piwik_Metrics::INDEX_GOAL_NB_VISITS_CONVERTED])) { - $conversion_rate = $this->getConversionRate($array[Piwik_Metrics::INDEX_GOAL_NB_VISITS_CONVERTED]); + if(!empty($array[Metrics::INDEX_GOAL_NB_VISITS_CONVERTED])) { + $conversion_rate = $this->getConversionRate($array[Metrics::INDEX_GOAL_NB_VISITS_CONVERTED]); $recordName = self::getRecordName('conversion_rate', $idGoal); $numericRecords[$recordName] = $conversion_rate; } @@ -330,10 +332,10 @@ class Piwik_Goals_Archiver extends Piwik_PluginsArchiver if ($row['ecommerceType'] == Piwik_Tracker_GoalManager::IDGOAL_CART) { // abandoned carts are the numner of visits with an abandoned cart - $row[Piwik_Metrics::INDEX_ECOMMERCE_ORDERS] = $row[Piwik_Metrics::INDEX_NB_VISITS]; + $row[Metrics::INDEX_ECOMMERCE_ORDERS] = $row[Metrics::INDEX_NB_VISITS]; } - unset($row[Piwik_Metrics::INDEX_NB_VISITS]); + unset($row[Metrics::INDEX_NB_VISITS]); unset($row['label']); unset($row['ecommerceType']); @@ -343,10 +345,10 @@ class Piwik_Goals_Archiver extends Piwik_PluginsArchiver protected function roundColumnValues(&$row) { $columnsToRound = array( - Piwik_Metrics::INDEX_ECOMMERCE_ITEM_REVENUE, - Piwik_Metrics::INDEX_ECOMMERCE_ITEM_QUANTITY, - Piwik_Metrics::INDEX_ECOMMERCE_ITEM_PRICE, - Piwik_Metrics::INDEX_ECOMMERCE_ITEM_PRICE_VIEWED, + Metrics::INDEX_ECOMMERCE_ITEM_REVENUE, + Metrics::INDEX_ECOMMERCE_ITEM_QUANTITY, + Metrics::INDEX_ECOMMERCE_ITEM_PRICE, + Metrics::INDEX_ECOMMERCE_ITEM_PRICE_VIEWED, ); foreach ($columnsToRound as $column) { if (isset($row[$column]) diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php index 3f33dc7305..d659959ab3 100644 --- a/plugins/Goals/Controller.php +++ b/plugins/Goals/Controller.php @@ -75,7 +75,7 @@ class Piwik_Goals_Controller extends Piwik_Controller public function ecommerceReport() { - if (!Piwik_PluginsManager::getInstance()->isPluginActivated('CustomVariables')) { + if (!PluginsManager::getInstance()->isPluginActivated('CustomVariables')) { throw new Exception("Ecommerce Tracking requires that the plugin Custom Variables is enabled. Please enable the plugin CustomVariables (or ask your admin)."); } @@ -294,14 +294,14 @@ class Piwik_Goals_Controller extends Piwik_Controller $topDimensionsToLoad = array(); - if (Piwik_PluginsManager::getInstance()->isPluginActivated('UserCountry')) { + if (PluginsManager::getInstance()->isPluginActivated('UserCountry')) { $topDimensionsToLoad += array( 'country' => 'UserCountry.getCountry', ); } $keywordNotDefinedString = ''; - if (Piwik_PluginsManager::getInstance()->isPluginActivated('Referers')) { + if (PluginsManager::getInstance()->isPluginActivated('Referers')) { $keywordNotDefinedString = Piwik_Referers_API::getKeywordNotDefinedString(); $topDimensionsToLoad += array( 'keyword' => 'Referers.getKeywords', diff --git a/plugins/Live/API.php b/plugins/Live/API.php index 78bc6802bd..a9fd58a6f6 100644 --- a/plugins/Live/API.php +++ b/plugins/Live/API.php @@ -10,8 +10,10 @@ */ use Piwik\Config; use Piwik\Period; +use Piwik\Period_Range; use Piwik\Piwik; use Piwik\Common; +use Piwik\Segment; use Piwik\Site; /** @@ -83,7 +85,7 @@ class Piwik_Live_API Piwik_Date::factory(time() - $lastMinutes * 60)->toString('Y-m-d H:i:s') ); - $segment = new Piwik_Segment($segment, $idSite); + $segment = new Segment($segment, $idSite); $query = $segment->getSelectQuery($select, $from, $where, $bind); $data = Piwik_FetchAll($query['sql'], $query['bind']); @@ -352,8 +354,8 @@ class Piwik_Live_API $dateString = $date; if ($period == 'range') { - $processedPeriod = new Piwik_Period_Range('range', $date); - if ($parsedDate = Piwik_Period_Range::parseDateRange($date)) { + $processedPeriod = new Period_Range('range', $date); + if ($parsedDate = Period_Range::parseDateRange($date)) { $dateString = $parsedDate[2]; } } else { @@ -389,7 +391,7 @@ class Piwik_Live_API $where = false; } - $segment = new Piwik_Segment($segment, $idSite); + $segment = new Segment($segment, $idSite); // Subquery to use the indexes for ORDER BY $select = "log_visit.*"; diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php index e10b1ea331..1c8ec26952 100644 --- a/plugins/Live/Visitor.php +++ b/plugins/Live/Visitor.php @@ -343,7 +343,7 @@ class Piwik_Live_Visitor function getKeyword() { $keyword = $this->details['referer_keyword']; - if (Piwik_PluginsManager::getInstance()->isPluginActivated('Referers') + if (PluginsManager::getInstance()->isPluginActivated('Referers') && $this->getRefererType() == 'search' ) { $keyword = Piwik_Referers_API::getCleanKeyword($keyword); @@ -354,7 +354,7 @@ class Piwik_Live_Visitor function getRefererUrl() { if ($this->getRefererType() == 'search') { - if (Piwik_PluginsManager::getInstance()->isPluginActivated('Referers') + if (PluginsManager::getInstance()->isPluginActivated('Referers') && $this->details['referer_keyword'] == Piwik_Referers_API::LABEL_KEYWORD_NOT_DEFINED ) { return 'http://piwik.org/faq/general/#faq_144'; @@ -512,7 +512,7 @@ class Piwik_Live_Visitor function getDeviceType() { - if(Piwik_PluginsManager::getInstance()->isPluginActivated('DevicesDetection')) { + if(PluginsManager::getInstance()->isPluginActivated('DevicesDetection')) { return Piwik_getDeviceTypeLabel($this->details['config_device_type']); } return false; diff --git a/plugins/MobileMessaging/MobileMessaging.php b/plugins/MobileMessaging/MobileMessaging.php index 22ae5f0d40..941d753fa7 100644 --- a/plugins/MobileMessaging/MobileMessaging.php +++ b/plugins/MobileMessaging/MobileMessaging.php @@ -158,7 +158,7 @@ class Piwik_MobileMessaging extends Piwik_Plugin public function getRendererInstance(&$reportRenderer, $info) { if (self::manageEvent($info)) { - if (Piwik_PluginsManager::getInstance()->isPluginActivated('MultiSites')) { + if (PluginsManager::getInstance()->isPluginActivated('MultiSites')) { $reportRenderer = new Piwik_MobileMessaging_ReportRenderer_Sms(); } else { $reportRenderer = new Piwik_MobileMessaging_ReportRenderer_Exception( diff --git a/plugins/MultiSites/API.php b/plugins/MultiSites/API.php index 16a5440916..0c75406004 100755 --- a/plugins/MultiSites/API.php +++ b/plugins/MultiSites/API.php @@ -9,6 +9,7 @@ * @package Piwik_MultiSites */ use Piwik\Archive; +use Piwik\Period_Range; use Piwik\Piwik; use Piwik\Common; use Piwik\Site; @@ -237,7 +238,7 @@ class Piwik_MultiSites_API // if the period isn't a range & a lastN/previousN date isn't used, we get the same // data for the last period to show the evolution of visits/actions/revenue - list($strLastDate, $lastPeriod) = Piwik_Period_Range::getLastDate($date, $period); + list($strLastDate, $lastPeriod) = Period_Range::getLastDate($date, $period); if ($strLastDate !== false) { if ($lastPeriod !== false) { // NOTE: no easy way to set last period date metadata when range of dates is requested. diff --git a/plugins/Overlay/Controller.php b/plugins/Overlay/Controller.php index d875fa97a7..6f7c00caf9 100644 --- a/plugins/Overlay/Controller.php +++ b/plugins/Overlay/Controller.php @@ -1,4 +1,5 @@ <?php +use Piwik\Metrics; use Piwik\Piwik; use Piwik\Common; @@ -69,7 +70,7 @@ class Piwik_Overlay_Controller extends Piwik_Controller if ($dataTable->getRowsCount() > 0) { $row = $dataTable->getFirstRow(); - $translations = Piwik_Metrics::getDefaultMetricTranslations(); + $translations = Metrics::getDefaultMetricTranslations(); $showMetrics = array('nb_hits', 'nb_visits', 'nb_uniq_visitors', 'bounce_rate', 'exit_rate', 'avg_time_on_page'); diff --git a/plugins/PDFReports/API.php b/plugins/PDFReports/API.php index b8a3d1b8dd..c3eea2e13d 100644 --- a/plugins/PDFReports/API.php +++ b/plugins/PDFReports/API.php @@ -798,6 +798,6 @@ class Piwik_PDFReports_API */ public static function isSegmentEditorActivated() { - return Piwik_PluginsManager::getInstance()->isPluginActivated('SegmentEditor'); + return PluginsManager::getInstance()->isPluginActivated('SegmentEditor'); } } diff --git a/plugins/PDFReports/PDFReports.php b/plugins/PDFReports/PDFReports.php index 2dde8fb0bb..5d93ed38cb 100644 --- a/plugins/PDFReports/PDFReports.php +++ b/plugins/PDFReports/PDFReports.php @@ -204,7 +204,7 @@ class Piwik_PDFReports extends Piwik_Plugin : $displayFormat != self::DISPLAY_FORMAT_TABLES_ONLY) && Piwik::isGdExtensionEnabled() - && Piwik_PluginsManager::getInstance()->isPluginActivated('ImageGraph') + && PluginsManager::getInstance()->isPluginActivated('ImageGraph') && !empty($metadata['imageGraphUrl']); $processedReport['evolutionGraph'] = $evolutionGraph; @@ -461,7 +461,7 @@ class Piwik_PDFReports extends Piwik_Plugin 13, $isHTML = false, $tooltip = Piwik_Translate( - Piwik_PluginsManager::getInstance()->isPluginActivated('MobileMessaging') + PluginsManager::getInstance()->isPluginActivated('MobileMessaging') ? 'MobileMessaging_TopLinkTooltip' : 'PDFReports_TopLinkTooltip' ) ); @@ -470,7 +470,7 @@ class Piwik_PDFReports extends Piwik_Plugin function getTopMenuTranslationKey() { // if MobileMessaging is not activated, display 'Email reports' - if (!Piwik_PluginsManager::getInstance()->isPluginActivated('MobileMessaging')) + if (!PluginsManager::getInstance()->isPluginActivated('MobileMessaging')) return self::PDF_REPORTS_TOP_MENU_TRANSLATION_KEY; if (Piwik::isUserIsAnonymous()) { diff --git a/plugins/PrivacyManager/Controller.php b/plugins/PrivacyManager/Controller.php index d7191339da..a6770ae74a 100644 --- a/plugins/PrivacyManager/Controller.php +++ b/plugins/PrivacyManager/Controller.php @@ -105,7 +105,7 @@ class Piwik_PrivacyManager_Controller extends Piwik_Controller_Admin */ public static function isDntSupported() { - return Piwik_PluginsManager::getInstance()->isPluginActivated('DoNotTrack'); + return PluginsManager::getInstance()->isPluginActivated('DoNotTrack'); } public function privacySettings() @@ -214,12 +214,12 @@ class Piwik_PrivacyManager_Controller extends Piwik_Controller_Admin Piwik::checkUserIsSuperUser(); $anonymizeIP = array(); - Piwik_PluginsManager::getInstance()->loadPlugin(self::ANONYMIZE_IP_PLUGIN_NAME); + PluginsManager::getInstance()->loadPlugin(self::ANONYMIZE_IP_PLUGIN_NAME); $anonymizeIP["name"] = self::ANONYMIZE_IP_PLUGIN_NAME; - $anonymizeIP["enabled"] = Piwik_PluginsManager::getInstance()->isPluginActivated(self::ANONYMIZE_IP_PLUGIN_NAME); + $anonymizeIP["enabled"] = PluginsManager::getInstance()->isPluginActivated(self::ANONYMIZE_IP_PLUGIN_NAME); $anonymizeIP["maskLength"] = Config::getInstance()->Tracker['ip_address_mask_length']; - $anonymizeIP["info"] = Piwik_PluginsManager::getInstance()->getLoadedPlugin(self::ANONYMIZE_IP_PLUGIN_NAME)->getInformation(); + $anonymizeIP["info"] = PluginsManager::getInstance()->getLoadedPlugin(self::ANONYMIZE_IP_PLUGIN_NAME)->getInformation(); return $anonymizeIP; } @@ -276,9 +276,9 @@ class Piwik_PrivacyManager_Controller extends Piwik_Controller_Admin { $pluginController = new Piwik_CorePluginsAdmin_Controller(); - if ($state == 1 && !Piwik_PluginsManager::getInstance()->isPluginActivated(self::ANONYMIZE_IP_PLUGIN_NAME)) { + if ($state == 1 && !PluginsManager::getInstance()->isPluginActivated(self::ANONYMIZE_IP_PLUGIN_NAME)) { $pluginController->activate($redirectAfter = false); - } elseif ($state == 0 && Piwik_PluginsManager::getInstance()->isPluginActivated(self::ANONYMIZE_IP_PLUGIN_NAME)) { + } elseif ($state == 0 && PluginsManager::getInstance()->isPluginActivated(self::ANONYMIZE_IP_PLUGIN_NAME)) { $pluginController->deactivate($redirectAfter = false); } else { //nothing to do diff --git a/plugins/PrivacyManager/PrivacyManager.php b/plugins/PrivacyManager/PrivacyManager.php index 59836dae9a..dcbc12814d 100644 --- a/plugins/PrivacyManager/PrivacyManager.php +++ b/plugins/PrivacyManager/PrivacyManager.php @@ -9,6 +9,7 @@ * @package Piwik_PrivacyManager */ use Piwik\Config; +use Piwik\Metrics; use Piwik\Piwik; use Piwik\Common; @@ -145,7 +146,7 @@ class Piwik_PrivacyManager extends Piwik_Plugin */ public static function savePurgeDataSettings($settings) { - $plugin = Piwik_PluginsManager::getInstance()->getLoadedPlugin('PrivacyManager'); + $plugin = PluginsManager::getInstance()->getLoadedPlugin('PrivacyManager'); foreach (self::$defaultPurgeDataOptions as $optionName => $defaultValue) { if (isset($settings[$optionName])) { @@ -318,7 +319,7 @@ class Piwik_PrivacyManager extends Piwik_Plugin private static function getGoalMetricsToKeep() { // keep all goal metrics - return array_values(Piwik_Metrics::$mappingFromIdToNameGoal); + return array_values(Metrics::$mappingFromIdToNameGoal); } /** diff --git a/plugins/Provider/API.php b/plugins/Provider/API.php index 937f62c48d..63565b5301 100644 --- a/plugins/Provider/API.php +++ b/plugins/Provider/API.php @@ -9,6 +9,7 @@ * @package Piwik_Provider */ use Piwik\Archive; +use Piwik\Metrics; use Piwik\Piwik; /** @@ -38,7 +39,7 @@ class Piwik_Provider_API Piwik::checkUserHasViewAccess($idSite); $archive = Archive::build($idSite, $period, $date, $segment); $dataTable = $archive->getDataTable(Piwik_Provider_Archiver::PROVIDER_RECORD_NAME); - $dataTable->filter('Sort', array(Piwik_Metrics::INDEX_NB_VISITS)); + $dataTable->filter('Sort', array(Metrics::INDEX_NB_VISITS)); $dataTable->queueFilter('ColumnCallbackAddMetadata', array('label', 'url', 'Piwik_getHostnameUrl')); $dataTable->queueFilter('ColumnCallbackReplace', array('label', 'Piwik_Provider_getPrettyProviderName')); $dataTable->queueFilter('ReplaceColumnNames'); diff --git a/plugins/Provider/Archiver.php b/plugins/Provider/Archiver.php index d515c5cefc..ce782f9342 100644 --- a/plugins/Provider/Archiver.php +++ b/plugins/Provider/Archiver.php @@ -8,6 +8,8 @@ * @category Piwik_Plugins * @package Piwik_Provider */ +use Piwik\Metrics; + class Piwik_Provider_Archiver extends Piwik_PluginsArchiver { const PROVIDER_RECORD_NAME = 'Provider_hostnameExt'; @@ -17,7 +19,7 @@ class Piwik_Provider_Archiver extends Piwik_PluginsArchiver { $metrics = $this->getProcessor()->getMetricsForDimension(self::PROVIDER_FIELD); $tableProvider = $this->getProcessor()->getDataTableFromDataArray($metrics); - $this->getProcessor()->insertBlobRecord(self::PROVIDER_RECORD_NAME, $tableProvider->getSerialized($this->maximumRows, null, Piwik_Metrics::INDEX_NB_VISITS)); + $this->getProcessor()->insertBlobRecord(self::PROVIDER_RECORD_NAME, $tableProvider->getSerialized($this->maximumRows, null, Metrics::INDEX_NB_VISITS)); } public function archivePeriod() diff --git a/plugins/Referers/API.php b/plugins/Referers/API.php index 3486969fef..16168b532a 100644 --- a/plugins/Referers/API.php +++ b/plugins/Referers/API.php @@ -9,6 +9,7 @@ * @package Piwik_Referers */ use Piwik\Archive; +use Piwik\Metrics; use Piwik\Piwik; use Piwik\Common; @@ -47,7 +48,7 @@ class Piwik_Referers_API protected function getDataTable($name, $idSite, $period, $date, $segment, $expanded = false, $idSubtable = null) { $dataTable = Archive::getDataTableFromArchive($name, $idSite, $period, $date, $segment, $expanded, $idSubtable); - $dataTable->filter('Sort', array(Piwik_Metrics::INDEX_NB_VISITS, 'desc', $naturalSort = false, $expanded)); + $dataTable->filter('Sort', array(Metrics::INDEX_NB_VISITS, 'desc', $naturalSort = false, $expanded)); $dataTable->queueFilter('ReplaceColumnNames'); return $dataTable; } @@ -130,7 +131,7 @@ class Piwik_Referers_API $dataTable = $dataTable->mergeSubtables($labelColumn = 'referrer_type', $useMetadataColumn = true); - $dataTable->filter('Sort', array(Piwik_Metrics::INDEX_NB_VISITS, 'desc')); + $dataTable->filter('Sort', array(Metrics::INDEX_NB_VISITS, 'desc')); $dataTable->queueFilter('ReplaceColumnNames'); $dataTable->queueFilter('ReplaceSummaryRowLabel'); @@ -377,7 +378,7 @@ class Piwik_Referers_API // prettify the DataTable $dataTable->filter('ColumnCallbackReplace', array('label', 'Piwik_Referrers_removeUrlProtocol')); - $dataTable->filter('Sort', array(Piwik_Metrics::INDEX_NB_VISITS, 'desc', $naturalSort = false, $expanded)); + $dataTable->filter('Sort', array(Metrics::INDEX_NB_VISITS, 'desc', $naturalSort = false, $expanded)); $dataTable->queueFilter('ReplaceColumnNames'); return $dataTable; diff --git a/plugins/Referers/Archiver.php b/plugins/Referers/Archiver.php index 42af90b320..7c7b484f02 100644 --- a/plugins/Referers/Archiver.php +++ b/plugins/Referers/Archiver.php @@ -1,6 +1,7 @@ <?php use Piwik\Common; use Piwik\Config; +use Piwik\Metrics; /** * Piwik - Open source web analytics @@ -34,7 +35,7 @@ class Piwik_Referers_Archiver extends Piwik_PluginsArchiver function __construct($processor) { parent::__construct($processor); - $this->columnToSortByBeforeTruncation = Piwik_Metrics::INDEX_NB_VISITS; + $this->columnToSortByBeforeTruncation = Metrics::INDEX_NB_VISITS; $this->maximumRowsInDataTableLevelZero = Config::getInstance()->General['datatable_archiving_maximum_rows_referers']; $this->maximumRowsInSubDataTable = Config::getInstance()->General['datatable_archiving_maximum_rows_subtable_referers']; } diff --git a/plugins/Referers/Controller.php b/plugins/Referers/Controller.php index 050965a734..06f2c1ca71 100644 --- a/plugins/Referers/Controller.php +++ b/plugins/Referers/Controller.php @@ -8,6 +8,8 @@ * @category Piwik_Plugins * @package Piwik_Referers */ +use Piwik\Metrics; +use Piwik\Period_Range; use Piwik\Piwik; use Piwik\Common; @@ -49,7 +51,7 @@ class Piwik_Referers_Controller extends Piwik_Controller } // calculate evolution for visit metrics & distinct metrics - list($lastPeriodDate, $ignore) = Piwik_Period_Range::getLastDate(); + list($lastPeriodDate, $ignore) = Period_Range::getLastDate(); if ($lastPeriodDate !== false) { $date = Common::getRequestVar('date'); $period = Common::getRequestVar('period'); @@ -439,7 +441,7 @@ class Piwik_Referers_Controller extends Piwik_Controller $value = 0; $row = $dataTableReferersType->getRowFromLabel($columnId); if ($row !== false) { - $value = $row->getColumn(Piwik_Metrics::INDEX_NB_VISITS); + $value = $row->getColumn(Metrics::INDEX_NB_VISITS); } $return[$nameVar] = $value; } diff --git a/plugins/SegmentEditor/API.php b/plugins/SegmentEditor/API.php index c3c04a054e..855affb5e6 100644 --- a/plugins/SegmentEditor/API.php +++ b/plugins/SegmentEditor/API.php @@ -10,6 +10,7 @@ */ use Piwik\Piwik; use Piwik\Common; +use Piwik\Segment; /** * The SegmentEditor API lets you add, update, delete custom Segments, and list saved segments.a @@ -42,7 +43,7 @@ class Piwik_SegmentEditor_API $definition = str_replace("&", '%26', $definition); try { - $segment = new Piwik_Segment($definition, $idSite); + $segment = new Segment($definition, $idSite); $segment->getHash(); } catch (Exception $e) { throw new Exception("The specified segment is invalid: " . $e->getMessage()); diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php index 55a4e8383b..d5dd1c8be0 100644 --- a/plugins/SitesManager/Controller.php +++ b/plugins/SitesManager/Controller.php @@ -62,7 +62,7 @@ class Piwik_SitesManager_Controller extends Piwik_Controller_Admin $view->globalSearchKeywordParameters = Piwik_SitesManager_API::getInstance()->getSearchKeywordParametersGlobal(); $view->globalSearchCategoryParameters = Piwik_SitesManager_API::getInstance()->getSearchCategoryParametersGlobal(); - $view->isSearchCategoryTrackingEnabled = Piwik_PluginsManager::getInstance()->isPluginActivated('CustomVariables'); + $view->isSearchCategoryTrackingEnabled = PluginsManager::getInstance()->isPluginActivated('CustomVariables'); $view->allowSiteSpecificUserAgentExclude = Piwik_SitesManager_API::getInstance()->isSiteSpecificUserAgentExcludeEnabled(); diff --git a/plugins/Transitions/API.php b/plugins/Transitions/API.php index ccb17fc875..fe84b328cb 100644 --- a/plugins/Transitions/API.php +++ b/plugins/Transitions/API.php @@ -8,9 +8,12 @@ * @category Piwik_Plugins * @package Piwik_Transitions */ +use Piwik\Metrics; use Piwik\Period; use Piwik\Piwik; use Piwik\Common; +use Piwik\Segment; +use Piwik\SegmentExpression; use Piwik\Site; /** @@ -66,7 +69,7 @@ class Piwik_Transitions_API } // prepare archive processing that can be used by the archiving code - $segment = new Piwik_Segment($segment, $idSite); + $segment = new Segment($segment, $idSite); $site = new Site($idSite); $period = Period::advancedFactory($period, $date); $archiveProcessor = new Piwik_ArchiveProcessor_Day($period, $site, $segment); @@ -110,9 +113,9 @@ class Piwik_Transitions_API ); foreach ($reportNames as $reportName => $replaceLabel) { if (isset($report[$reportName])) { - $columnNames = array(Piwik_Metrics::INDEX_NB_ACTIONS => 'referrals'); + $columnNames = array(Metrics::INDEX_NB_ACTIONS => 'referrals'); if ($replaceLabel) { - $columnNames[Piwik_Metrics::INDEX_NB_ACTIONS] = 'referrals'; + $columnNames[Metrics::INDEX_NB_ACTIONS] = 'referrals'; } $report[$reportName]->filter('ReplaceColumnNames', array($columnNames)); } @@ -131,25 +134,25 @@ class Piwik_Transitions_API case 'url': $originalActionName = $actionName; $actionName = Common::unsanitizeInputValue($actionName); - $id = $actionsPlugin->getIdActionFromSegment($actionName, 'idaction_url', Piwik_SegmentExpression::MATCH_EQUAL, 'pageUrl'); + $id = $actionsPlugin->getIdActionFromSegment($actionName, 'idaction_url', SegmentExpression::MATCH_EQUAL, 'pageUrl'); if ($id < 0) { // an example where this is needed is urls containing < or > $actionName = $originalActionName; - $id = $actionsPlugin->getIdActionFromSegment($actionName, 'idaction_url', Piwik_SegmentExpression::MATCH_EQUAL, 'pageUrl'); + $id = $actionsPlugin->getIdActionFromSegment($actionName, 'idaction_url', SegmentExpression::MATCH_EQUAL, 'pageUrl'); } return $id; case 'title': - $id = $actionsPlugin->getIdActionFromSegment($actionName, 'idaction_name', Piwik_SegmentExpression::MATCH_EQUAL, 'pageTitle'); + $id = $actionsPlugin->getIdActionFromSegment($actionName, 'idaction_name', SegmentExpression::MATCH_EQUAL, 'pageTitle'); if ($id < 0) { $unknown = Piwik_Actions_ArchivingHelper::getUnknownActionName( Piwik_Tracker_Action::TYPE_ACTION_NAME); if (trim($actionName) == trim($unknown)) { - $id = $actionsPlugin->getIdActionFromSegment('', 'idaction_name', Piwik_SegmentExpression::MATCH_EQUAL, 'pageTitle'); + $id = $actionsPlugin->getIdActionFromSegment('', 'idaction_name', SegmentExpression::MATCH_EQUAL, 'pageTitle'); } } @@ -287,7 +290,7 @@ class Piwik_Transitions_API . 'log_link_visit_action.idaction_' . $type . ' != ' . intval($idaction) . ')'; } - $metrics = array(Piwik_Metrics::INDEX_NB_ACTIONS); + $metrics = array(Metrics::INDEX_NB_ACTIONS); $data = $logAggregator->queryActionsByDimension(array($dimension), $where, $selects, $metrics, $rankingQuery, $joinLogActionColumn); $this->totalTransitionsToFollowingActions = 0; @@ -296,11 +299,11 @@ class Piwik_Transitions_API $dataTable = new Piwik_DataTable; if (isset($data[$type])) { foreach ($data[$type] as &$record) { - $actions = intval($record[Piwik_Metrics::INDEX_NB_ACTIONS]); + $actions = intval($record[Metrics::INDEX_NB_ACTIONS]); $dataTable->addRow(new Piwik_DataTable_Row(array( Piwik_DataTable_Row::COLUMNS => array( 'label' => $this->getPageLabel($record, $isTitle), - Piwik_Metrics::INDEX_NB_ACTIONS => $actions + Metrics::INDEX_NB_ACTIONS => $actions ) ))); $this->totalTransitionsToFollowingActions += $actions; @@ -362,14 +365,14 @@ class Piwik_Transitions_API $type = $this->getColumnTypeSuffix($actionType); $where = 'visit_entry_idaction_' . $type . ' = ' . intval($idaction); - $metrics = array(Piwik_Metrics::INDEX_NB_VISITS); + $metrics = array(Metrics::INDEX_NB_VISITS); $data = $logAggregator->queryVisitsByDimension($dimensions, $where, $selects, $metrics, $rankingQuery); $referrerData = array(); $referrerSubData = array(); foreach ($data as $referrerType => &$subData) { - $referrerData[$referrerType] = array(Piwik_Metrics::INDEX_NB_VISITS => 0); + $referrerData[$referrerType] = array(Metrics::INDEX_NB_VISITS => 0); if ($referrerType != Common::REFERER_TYPE_DIRECT_ENTRY) { $referrerSubData[$referrerType] = array(); } @@ -379,12 +382,12 @@ class Piwik_Transitions_API $row['referrer_data'] = Piwik_Referers_API::LABEL_KEYWORD_NOT_DEFINED; } - $referrerData[$referrerType][Piwik_Metrics::INDEX_NB_VISITS] += $row[Piwik_Metrics::INDEX_NB_VISITS]; + $referrerData[$referrerType][Metrics::INDEX_NB_VISITS] += $row[Metrics::INDEX_NB_VISITS]; $label = $row['referrer_data']; if ($label) { $referrerSubData[$referrerType][$label] = array( - Piwik_Metrics::INDEX_NB_VISITS => $row[Piwik_Metrics::INDEX_NB_VISITS] + Metrics::INDEX_NB_VISITS => $row[Metrics::INDEX_NB_VISITS] ); } } @@ -443,7 +446,7 @@ class Piwik_Transitions_API } else { $joinLogActionOn = $dimension; } - $metrics = array(Piwik_Metrics::INDEX_NB_ACTIONS); + $metrics = array(Metrics::INDEX_NB_ACTIONS); $data = $logAggregator->queryActionsByDimension(array($dimension), $where, $selects, $metrics, $rankingQuery, $joinLogActionOn); $loops = 0; @@ -451,11 +454,11 @@ class Piwik_Transitions_API $previousPagesDataTable = new Piwik_DataTable; if (isset($data['result'][1])) { foreach ($data['result'][1] as &$page) { - $nbActions = intval($page[Piwik_Metrics::INDEX_NB_ACTIONS]); + $nbActions = intval($page[Metrics::INDEX_NB_ACTIONS]); $previousPagesDataTable->addRow(new Piwik_DataTable_Row(array( Piwik_DataTable_Row::COLUMNS => array( 'label' => $this->getPageLabel($page, $isTitle), - Piwik_Metrics::INDEX_NB_ACTIONS => $nbActions + Metrics::INDEX_NB_ACTIONS => $nbActions ) ))); $nbPageviews += $nbActions; @@ -465,11 +468,11 @@ class Piwik_Transitions_API $previousSearchesDataTable = new Piwik_DataTable; if (isset($data['result'][2])) { foreach ($data['result'][2] as &$search) { - $nbActions = intval($search[Piwik_Metrics::INDEX_NB_ACTIONS]); + $nbActions = intval($search[Metrics::INDEX_NB_ACTIONS]); $previousSearchesDataTable->addRow(new Piwik_DataTable_Row(array( Piwik_DataTable_Row::COLUMNS => array( 'label' => $search['name'], - Piwik_Metrics::INDEX_NB_ACTIONS => $nbActions + Metrics::INDEX_NB_ACTIONS => $nbActions ) ))); $nbPageviews += $nbActions; @@ -478,12 +481,12 @@ class Piwik_Transitions_API if (isset($data['result'][0])) { foreach ($data['result'][0] as &$referrer) { - $nbPageviews += intval($referrer[Piwik_Metrics::INDEX_NB_ACTIONS]); + $nbPageviews += intval($referrer[Metrics::INDEX_NB_ACTIONS]); } } if (count($data['excludedFromLimit'])) { - $loops += intval($data['excludedFromLimit'][0][Piwik_Metrics::INDEX_NB_ACTIONS]); + $loops += intval($data['excludedFromLimit'][0][Metrics::INDEX_NB_ACTIONS]); $nbPageviews += $loops; } @@ -555,7 +558,7 @@ class Piwik_Transitions_API $report['referrers'] = array(); foreach ($data->getRows() as $row) { $referrerId = $row->getColumn('label'); - $visits = $row->getColumn(Piwik_Metrics::INDEX_NB_VISITS); + $visits = $row->getColumn(Metrics::INDEX_NB_VISITS); if ($visits) { // load details (i.e. subtables) $details = array(); @@ -564,7 +567,7 @@ class Piwik_Transitions_API foreach ($subTable->getRows() as $subRow) { $details[] = array( 'label' => $subRow->getColumn('label'), - 'referrals' => $subRow->getColumn(Piwik_Metrics::INDEX_NB_VISITS) + 'referrals' => $subRow->getColumn(Metrics::INDEX_NB_VISITS) ); } } diff --git a/plugins/UserCountry/API.php b/plugins/UserCountry/API.php index 9822461d17..79aaf191c5 100644 --- a/plugins/UserCountry/API.php +++ b/plugins/UserCountry/API.php @@ -9,6 +9,7 @@ * @package Piwik_UserCountry */ use Piwik\Archive; +use Piwik\Metrics; use Piwik\Piwik; /** @@ -194,7 +195,7 @@ class Piwik_UserCountry_API Piwik::checkUserHasViewAccess($idSite); $archive = Archive::build($idSite, $period, $date, $segment); $dataTable = $archive->getDataTable($name); - $dataTable->filter('Sort', array(Piwik_Metrics::INDEX_NB_VISITS)); + $dataTable->filter('Sort', array(Metrics::INDEX_NB_VISITS)); $dataTable->queueFilter('ReplaceColumnNames'); return $dataTable; } diff --git a/plugins/UserCountry/Archiver.php b/plugins/UserCountry/Archiver.php index deac72405c..4667e38474 100644 --- a/plugins/UserCountry/Archiver.php +++ b/plugins/UserCountry/Archiver.php @@ -9,6 +9,8 @@ * @package Piwik_UserCountry */ +use Piwik\Metrics; + class Piwik_UserCountry_Archiver extends Piwik_PluginsArchiver { const COUNTRY_RECORD_NAME = 'UserCountry_country'; @@ -127,12 +129,12 @@ class Piwik_UserCountry_Archiver extends Piwik_PluginsArchiver $this->getProcessor()->insertNumericRecord(self::DISTINCT_COUNTRIES_METRIC, $tableCountry->getRowsCount()); $tableRegion = Piwik_ArchiveProcessor_Day::getDataTableFromDataArray($this->arrays[self::REGION_FIELD]); - $serialized = $tableRegion->getSerialized($this->maximumRows, $this->maximumRows, Piwik_Metrics::INDEX_NB_VISITS); + $serialized = $tableRegion->getSerialized($this->maximumRows, $this->maximumRows, Metrics::INDEX_NB_VISITS); $this->getProcessor()->insertBlobRecord(self::REGION_RECORD_NAME, $serialized); $tableCity = Piwik_ArchiveProcessor_Day::getDataTableFromDataArray($this->arrays[self::CITY_FIELD]); $this->setLatitudeLongitude($tableCity); - $serialized = $tableCity->getSerialized($this->maximumRows, $this->maximumRows, Piwik_Metrics::INDEX_NB_VISITS); + $serialized = $tableCity->getSerialized($this->maximumRows, $this->maximumRows, Metrics::INDEX_NB_VISITS); $this->getProcessor()->insertBlobRecord(self::CITY_RECORD_NAME, $serialized); } diff --git a/plugins/UserCountryMap/Controller.php b/plugins/UserCountryMap/Controller.php index 5230677287..50b2986ae1 100644 --- a/plugins/UserCountryMap/Controller.php +++ b/plugins/UserCountryMap/Controller.php @@ -163,7 +163,7 @@ class Piwik_UserCountryMap_Controller extends Piwik_Controller private function checkUserCountryPluginEnabled() { - if (!Piwik_PluginsManager::getInstance()->isPluginActivated('UserCountry')) { + if (!PluginsManager::getInstance()->isPluginActivated('UserCountry')) { throw new Exception(Piwik_Translate('General_Required', 'Plugin UserCountry')); } } diff --git a/plugins/UserSettings/API.php b/plugins/UserSettings/API.php index 87ec150652..7a9f5b6dda 100644 --- a/plugins/UserSettings/API.php +++ b/plugins/UserSettings/API.php @@ -9,6 +9,7 @@ * @package Piwik_UserSettings */ use Piwik\Archive; +use Piwik\Metrics; use Piwik\Piwik; /** @@ -39,7 +40,7 @@ class Piwik_UserSettings_API Piwik::checkUserHasViewAccess($idSite); $archive = Archive::build($idSite, $period, $date, $segment); $dataTable = $archive->getDataTable($name); - $dataTable->filter('Sort', array(Piwik_Metrics::INDEX_NB_VISITS)); + $dataTable->filter('Sort', array(Metrics::INDEX_NB_VISITS)); $dataTable->queueFilter('ReplaceColumnNames'); $dataTable->queueFilter('ReplaceSummaryRowLabel'); return $dataTable; @@ -105,8 +106,8 @@ class Piwik_UserSettings_API protected function ensureDefaultRowsInTable($dataTable) { $requiredRows = array( - 'General_Desktop' => Piwik_Metrics::INDEX_NB_VISITS, - 'General_Mobile' => Piwik_Metrics::INDEX_NB_VISITS + 'General_Desktop' => Metrics::INDEX_NB_VISITS, + 'General_Mobile' => Metrics::INDEX_NB_VISITS ); $dataTables = array($dataTable); @@ -218,7 +219,7 @@ class Piwik_UserSettings_API $ieStats = $browserType->getRowFromLabel('ie'); if ($ieStats !== false) { - $ieVisits = $ieStats->getColumn(Piwik_Metrics::INDEX_NB_VISITS); + $ieVisits = $ieStats->getColumn(Metrics::INDEX_NB_VISITS); } $visitsSum = $visitsSumTotal - $ieVisits; @@ -230,7 +231,7 @@ class Piwik_UserSettings_API // The filter must be applied now so that the new column can // be sorted by the generic filters (applied right after this loop exits) - $table->filter('ColumnCallbackAddColumnPercentage', array('nb_visits_percentage', Piwik_Metrics::INDEX_NB_VISITS, $visitsSum, 1)); + $table->filter('ColumnCallbackAddColumnPercentage', array('nb_visits_percentage', Metrics::INDEX_NB_VISITS, $visitsSum, 1)); $table->filter('RangeCheck', array('nb_visits_percentage')); } diff --git a/plugins/UserSettings/Archiver.php b/plugins/UserSettings/Archiver.php index cdfd893faf..0c53938257 100644 --- a/plugins/UserSettings/Archiver.php +++ b/plugins/UserSettings/Archiver.php @@ -10,6 +10,7 @@ */ use Piwik\Common; +use Piwik\Metrics; require_once PIWIK_INCLUDE_PATH . '/plugins/UserSettings/functions.php'; @@ -112,7 +113,7 @@ class Piwik_UserSettings_Archiver extends Piwik_PluginsArchiver $query = $this->getLogAggregator()->queryVisitsByDimension(array(), false, $selects, $metrics = array()); $data = $query->fetch(); - $cleanRow = Piwik_DataAccess_LogAggregator::makeArrayOneColumn($data, Piwik_Metrics::INDEX_NB_VISITS); + $cleanRow = Piwik_DataAccess_LogAggregator::makeArrayOneColumn($data, Metrics::INDEX_NB_VISITS); $table = Piwik_DataTable::makeFromIndexedArray($cleanRow); $this->insertTable(self::PLUGIN_RECORD_NAME, $table); } @@ -133,7 +134,7 @@ class Piwik_UserSettings_Archiver extends Piwik_PluginsArchiver protected function insertTable($recordName, Piwik_DataTable $table) { - return $this->getProcessor()->insertBlobRecord($recordName, $table->getSerialized($this->maximumRows, null, Piwik_Metrics::INDEX_NB_VISITS)); + return $this->getProcessor()->insertBlobRecord($recordName, $table->getSerialized($this->maximumRows, null, Metrics::INDEX_NB_VISITS)); } public function archivePeriod() diff --git a/plugins/VisitFrequency/API.php b/plugins/VisitFrequency/API.php index 49473b5192..08d37c30b2 100644 --- a/plugins/VisitFrequency/API.php +++ b/plugins/VisitFrequency/API.php @@ -9,6 +9,7 @@ * @package Piwik_VisitFrequency */ use Piwik\Piwik; +use Piwik\SegmentExpression; /** * VisitFrequency API lets you access a list of metrics related to Returning Visitors. @@ -52,7 +53,7 @@ class Piwik_VisitFrequency_API if (empty($segment)) { $segment = ''; } else { - $segment .= Piwik_SegmentExpression::AND_DELIMITER; + $segment .= SegmentExpression::AND_DELIMITER; } $segment .= self::RETURNING_VISITOR_SEGMENT; return $segment; diff --git a/plugins/VisitTime/API.php b/plugins/VisitTime/API.php index c8a3dd86e6..9075c65532 100644 --- a/plugins/VisitTime/API.php +++ b/plugins/VisitTime/API.php @@ -9,6 +9,7 @@ * @package Piwik_VisitTime */ use Piwik\Archive; +use Piwik\Metrics; use Piwik\Period; use Piwik\Piwik; use Piwik\Site; @@ -71,8 +72,8 @@ class Piwik_VisitTime_API Piwik::checkUserHasViewAccess($idSite); // metrics to query - $metrics = Piwik_Metrics::getVisitsMetricNames(); - unset($metrics[Piwik_Metrics::INDEX_MAX_ACTIONS]); + $metrics = Metrics::getVisitsMetricNames(); + unset($metrics[Metrics::INDEX_MAX_ACTIONS]); // disabled for multiple dates if (Period::isMultiplePeriod($date, $period)) { diff --git a/plugins/VisitorInterest/API.php b/plugins/VisitorInterest/API.php index 9cd295cf40..f93abbcb34 100644 --- a/plugins/VisitorInterest/API.php +++ b/plugins/VisitorInterest/API.php @@ -9,6 +9,7 @@ * @package Piwik_VisitorInterest */ use Piwik\Archive; +use Piwik\Metrics; use Piwik\Piwik; /** @@ -29,7 +30,7 @@ class Piwik_VisitorInterest_API return self::$instance; } - protected function getDataTable($name, $idSite, $period, $date, $segment, $column = Piwik_Metrics::INDEX_NB_VISITS) + protected function getDataTable($name, $idSite, $period, $date, $segment, $column = Metrics::INDEX_NB_VISITS) { Piwik::checkUserHasViewAccess($idSite); $archive = Archive::build($idSite, $period, $date, $segment); @@ -72,7 +73,7 @@ class Piwik_VisitorInterest_API public function getNumberOfVisitsByDaysSinceLast($idSite, $period, $date, $segment = false) { $dataTable = $this->getDataTable( - Piwik_VisitorInterest_Archiver::DAYS_SINCE_LAST_RECORD_NAME, $idSite, $period, $date, $segment, Piwik_Metrics::INDEX_NB_VISITS); + Piwik_VisitorInterest_Archiver::DAYS_SINCE_LAST_RECORD_NAME, $idSite, $period, $date, $segment, Metrics::INDEX_NB_VISITS); $dataTable->queueFilter('Sort', array('label', 'asc', true)); $dataTable->queueFilter('BeautifyRangeLabels', array( Piwik_Translate('General_OneDay'), Piwik_Translate('General_NDays'))); @@ -93,7 +94,7 @@ class Piwik_VisitorInterest_API public function getNumberOfVisitsByVisitCount($idSite, $period, $date, $segment = false) { $dataTable = $this->getDataTable( - Piwik_VisitorInterest_Archiver::VISITS_COUNT_RECORD_NAME, $idSite, $period, $date, $segment, Piwik_Metrics::INDEX_NB_VISITS); + Piwik_VisitorInterest_Archiver::VISITS_COUNT_RECORD_NAME, $idSite, $period, $date, $segment, Metrics::INDEX_NB_VISITS); $dataTable->queueFilter('BeautifyRangeLabels', array( Piwik_Translate('General_OneVisit'), Piwik_Translate('General_NVisits'))); @@ -118,7 +119,7 @@ class Piwik_VisitorInterest_API self::addVisitsPercentColumn($table); } } else { - $totalVisits = array_sum($dataTable->getColumn(Piwik_Metrics::INDEX_NB_VISITS)); + $totalVisits = array_sum($dataTable->getColumn(Metrics::INDEX_NB_VISITS)); $dataTable->queueFilter('ColumnCallbackAddColumnPercentage', array('nb_visits_percentage', 'nb_visits', $totalVisits)); } } diff --git a/plugins/VisitorInterest/Archiver.php b/plugins/VisitorInterest/Archiver.php index 2e5a24dbc7..4c38bf1a7f 100644 --- a/plugins/VisitorInterest/Archiver.php +++ b/plugins/VisitorInterest/Archiver.php @@ -9,6 +9,8 @@ * @package Piwik_VisitorInterest */ +use Piwik\Metrics; + class Piwik_VisitorInterest_Archiver extends Piwik_PluginsArchiver { // third element is unit (s for seconds, default is munutes) @@ -107,7 +109,7 @@ class Piwik_VisitorInterest_Archiver extends Piwik_PluginsArchiver $query = $this->getLogAggregator()->queryVisitsByDimension(array(), $where = false, $selects, array()); $row = $query->fetch(); foreach($prefixes as $recordName => $selectAsPrefix) { - $cleanRow = Piwik_DataAccess_LogAggregator::makeArrayOneColumn($row, Piwik_Metrics::INDEX_NB_VISITS, $selectAsPrefix); + $cleanRow = Piwik_DataAccess_LogAggregator::makeArrayOneColumn($row, Metrics::INDEX_NB_VISITS, $selectAsPrefix); $dataTable = Piwik_DataTable::makeFromIndexedArray($cleanRow); $this->getProcessor()->insertBlobRecord($recordName, $dataTable->getSerialized()); } diff --git a/plugins/VisitorInterest/Controller.php b/plugins/VisitorInterest/Controller.php index e2b9936c7f..cecb7fd61c 100644 --- a/plugins/VisitorInterest/Controller.php +++ b/plugins/VisitorInterest/Controller.php @@ -8,6 +8,7 @@ * @category Piwik_Plugins * @package Piwik_VisitorInterest */ +use Piwik\Metrics; /** * @package Piwik_VisitorInterest @@ -73,7 +74,7 @@ class Piwik_VisitorInterest_Controller extends Piwik_Controller $view->setColumnsToDisplay(array('label', 'nb_visits', 'nb_visits_percentage')); $view->setSortedColumn('label', 'asc'); $view->setColumnTranslation('label', Piwik_Translate('VisitorInterest_VisitNum')); - $view->setColumnTranslation('nb_visits_percentage', Piwik_Metrics::getPercentVisitColumn()); + $view->setColumnTranslation('nb_visits_percentage', Metrics::getPercentVisitColumn()); $view->disableExcludeLowPopulation(); $view->disableOffsetInformationAndPaginationControls(); $view->disableShowAllViewsIcons(); |