Adding new Metrics class that knows about all metrics. Moving from Piwik_Archive class.

Also moved some other const to Piwik class.

2 files changed, 7 insertions, 7 deletions

diff --git a/plugins/UserSettings/API.php b/plugins/UserSettings/API.php
index 03ea9ac61d..1aa80230f9 100644
--- a/plugins/UserSettings/API.php
+++ b/plugins/UserSettings/API.php
@@ -37,7 +37,7 @@ class Piwik_UserSettings_API
         Piwik::checkUserHasViewAccess($idSite);
         $archive = Piwik_Archive::build($idSite, $period, $date, $segment);
         $dataTable = $archive->getDataTable($name);
-        $dataTable->filter('Sort', array(Piwik_Archive::INDEX_NB_VISITS));
+        $dataTable->filter('Sort', array(Piwik_Metrics::INDEX_NB_VISITS));
         $dataTable->queueFilter('ReplaceColumnNames');
         $dataTable->queueFilter('ReplaceSummaryRowLabel');
         return $dataTable;
@@ -103,8 +103,8 @@ class Piwik_UserSettings_API
     protected function ensureDefaultRowsInTable($dataTable)
     {
         $requiredRows = array(
-            'General_Desktop' => Piwik_Archive::INDEX_NB_VISITS,
-            'General_Mobile'  => Piwik_Archive::INDEX_NB_VISITS
+            'General_Desktop' => Piwik_Metrics::INDEX_NB_VISITS,
+            'General_Mobile'  => Piwik_Metrics::INDEX_NB_VISITS
         );
 
         $dataTables = array($dataTable);
@@ -216,7 +216,7 @@ class Piwik_UserSettings_API
 
             $ieStats = $browserType->getRowFromLabel('ie');
             if ($ieStats !== false) {
-                $ieVisits = $ieStats->getColumn(Piwik_Archive::INDEX_NB_VISITS);
+                $ieVisits = $ieStats->getColumn(Piwik_Metrics::INDEX_NB_VISITS);
             }
 
             $visitsSum = $visitsSumTotal - $ieVisits;
@@ -228,7 +228,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_Archive::INDEX_NB_VISITS, $visitsSum, 1));
+            $table->filter('ColumnCallbackAddColumnPercentage', array('nb_visits_percentage', Piwik_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 5d3319f19d..d6ba9e32b2 100644
--- a/plugins/UserSettings/Archiver.php
+++ b/plugins/UserSettings/Archiver.php
@@ -110,7 +110,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_Archive::INDEX_NB_VISITS);
+        $cleanRow = Piwik_DataAccess_LogAggregator::makeArrayOneColumn($data, Piwik_Metrics::INDEX_NB_VISITS);
         $table = Piwik_DataTable::makeFromIndexedArray($cleanRow);
         $this->insertTable(self::PLUGIN_RECORD_NAME, $table);
     }
@@ -131,7 +131,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_Archive::INDEX_NB_VISITS));
+        return $this->getProcessor()->insertBlobRecord($recordName, $table->getSerialized($this->maximumRows, null, Piwik_Metrics::INDEX_NB_VISITS));
     }
 
     public function archivePeriod()