Moving piwik settings specific getters to SettingsPiwik class

Adding MetricsFormatter class which knows how to format/display metrics (time, money, size, etc)

3 files changed, 21 insertions, 24 deletions

diff --git a/plugins/Live/API.php b/plugins/Live/API.php
index 6b2c19aa7f..008c4abc43 100644
--- a/plugins/Live/API.php
+++ b/plugins/Live/API.php
@@ -11,24 +11,23 @@
 namespace Piwik\Plugins\Live;
 
 use Exception;
+use Piwik\Common;
 use Piwik\Config;
 use Piwik\DataAccess\LogAggregator;
 use Piwik\DataTable\Filter\ColumnDelete;
 use Piwik\DataTable\Row;
+use Piwik\DataTable;
+use Piwik\Date;
+use Piwik\Db;
 use Piwik\Period;
 use Piwik\Period\Range;
 use Piwik\Piwik;
-use Piwik\Common;
-use Piwik\Date;
-use Piwik\DataTable;
-use Piwik\Tracker;
+use Piwik\Plugins\SitesManager\API as SitesManagerAPI;
 use Piwik\Segment;
 use Piwik\Site;
-use Piwik\Db;
 use Piwik\Tracker\Action;
+use Piwik\Tracker;
 use Piwik\Tracker\GoalManager;
-use Piwik\Plugins\Live\Visitor;
-use Piwik\Plugins\SitesManager\API as SitesManagerAPI;
 
 /**
  * @see plugins/Live/Visitor.php
@@ -283,7 +282,7 @@ class API
                                             'prettyName' => \Piwik\Plugins\UserCountry\continentTranslate($continentCode));
         }
 
-        $result['totalVisitDurationPretty'] = Piwik::getPrettyTimeFromSeconds($result['totalVisitDuration']);
+        $result['totalVisitDurationPretty'] = \Piwik\MetricsFormatter::getPrettyTimeFromSeconds($result['totalVisitDuration']);
 
         // use requested visits for first/last visit info
         $rows = $visits->getRows();
@@ -813,13 +812,13 @@ class API
             // Set the time spent for this action (which is the timeSpentRef of the next action)
             if (isset($actionDetails[$actionIdx + 1])) {
                 $actionDetail['timeSpent'] = $actionDetails[$actionIdx + 1]['timeSpentRef'];
-                $actionDetail['timeSpentPretty'] = Piwik::getPrettyTimeFromSeconds($actionDetail['timeSpent']);
+                $actionDetail['timeSpentPretty'] = \Piwik\MetricsFormatter::getPrettyTimeFromSeconds($actionDetail['timeSpent']);
             }
             unset($actionDetails[$actionIdx]['timeSpentRef']); // not needed after timeSpent is added
 
             // Handle generation time
             if ($actionDetail['custom_float'] > 0) {
-                $actionDetail['generationTime'] = Piwik::getPrettyTimeFromSeconds($actionDetail['custom_float'] / 1000);
+                $actionDetail['generationTime'] = \Piwik\MetricsFormatter::getPrettyTimeFromSeconds($actionDetail['custom_float'] / 1000);
             }
             unset($actionDetail['custom_float']);
 
diff --git a/plugins/Live/Controller.php b/plugins/Live/Controller.php
index dfbb0720c1..ca546b45c8 100644
--- a/plugins/Live/Controller.php
+++ b/plugins/Live/Controller.php
@@ -10,17 +10,16 @@
  */
 namespace Piwik\Plugins\Live;
 
-use Piwik\Url;
 use Piwik\API\Request;
 use Piwik\Common;
-use Piwik\Piwik;
 use Piwik\Config;
-use Piwik\Plugins\Live\API;
-use Piwik\ViewDataTable;
-use Piwik\View;
-use Piwik\FrontController;
-use Piwik\PluginsManager;
+use Piwik\MetricsFormatter;
+use Piwik\Piwik;
 use Piwik\Plugins\Goals\API as Goals_API;
+use Piwik\PluginsManager;
+use Piwik\Url;
+use Piwik\View;
+use Piwik\ViewDataTable;
 
 /**
  * @package Live
@@ -53,9 +52,9 @@ class Controller extends \Piwik\Controller
 
         $view = new View('@Live/getSimpleLastVisitCount');
         $view->lastMinutes = $lastMinutes;
-        $view->visitors = Piwik::getPrettyNumber($lastNData[0]['visitors']);
-        $view->visits = Piwik::getPrettyNumber($lastNData[0]['visits']);
-        $view->actions = Piwik::getPrettyNumber($lastNData[0]['actions']);
+        $view->visitors = MetricsFormatter::getPrettyNumber($lastNData[0]['visitors']);
+        $view->visits = MetricsFormatter::getPrettyNumber($lastNData[0]['visits']);
+        $view->actions = MetricsFormatter::getPrettyNumber($lastNData[0]['actions']);
         $view->refreshAfterXSecs = Config::getInstance()->General['live_widget_refresh_after_seconds'];
         $view->translations = array(
             'one_visitor' => Piwik_Translate('Live_NbVisitor'),
diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php
index 849521ba3d..70076fd1c3 100644
--- a/plugins/Live/Visitor.php
+++ b/plugins/Live/Visitor.php
@@ -10,14 +10,13 @@
  */
 namespace Piwik\Plugins\Live;
 
-use Piwik\Piwik;
 use Piwik\Common;
 use Piwik\IP;
-use Piwik\Tracker;
-use Piwik\Tracker\Visit;
 use Piwik\Plugins\API\API as MetaAPI;
 use Piwik\Plugins\Referers\API as ReferersAPI;
 use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
+use Piwik\Tracker;
+use Piwik\Tracker\Visit;
 
 /**
  * @see plugins/Referers/functions.php
@@ -207,7 +206,7 @@ class Visitor
 
     function getVisitLengthPretty()
     {
-        return Piwik::getPrettyTimeFromSeconds($this->details['visit_total_time']);
+        return \Piwik\MetricsFormatter::getPrettyTimeFromSeconds($this->details['visit_total_time']);
     }
 
     function getVisitorReturning()