Refs #4059 Work in progress: Conversion to use Namespaces of dozen more classes

Removed many Piwik_ functions, in Piwik 2 it is best practise to use the methods calls instead

Todo: finish converting core/ classes + convert plugins/ classes to use \Piwik\Plugin namespace + fix build + Merge master

2 files changed, 23 insertions, 15 deletions

diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php
index edc66625e6..47b3e44f1d 100644
--- a/plugins/SitesManager/API.php
+++ b/plugins/SitesManager/API.php
@@ -12,6 +12,9 @@ use Piwik\Piwik;
 use Piwik\Common;
 use Piwik\Access;
 use Piwik\Date;
+use Piwik\IP;
+use Piwik\Url;
+use Piwik\TaskScheduler;
 use Piwik\Site;
 
 /**
@@ -69,7 +72,7 @@ class Piwik_SitesManager_API
         Piwik::checkUserHasViewAccess($idSite);
 
         if (empty($piwikUrl)) {
-            $piwikUrl = Piwik_Url::getCurrentUrlWithoutFileName();
+            $piwikUrl = Url::getCurrentUrlWithoutFileName();
         }
         $piwikUrl = Common::sanitizeInputValues($piwikUrl);
 
@@ -170,7 +173,7 @@ class Piwik_SitesManager_API
      */
     private function getSitesId()
     {
-        $result = Piwik_FetchAll("SELECT idsite FROM " . Common::prefixTable('site'));
+        $result = Db::fetchAll("SELECT idsite FROM " . Common::prefixTable('site'));
         $idSites = array();
         foreach ($result as $idSite) {
             $idSites[] = $idSite['idsite'];
@@ -225,7 +228,7 @@ class Piwik_SitesManager_API
         if (empty($timestamp)) $timestamp = time();
 
         $time = Date::factory((int)$timestamp)->getDatetime();
-        $result = Piwik_FetchAll("
+        $result = Db::fetchAll("
             SELECT
                 idsite
             FROM
@@ -321,7 +324,7 @@ class Piwik_SitesManager_API
             // but during scheduled task execution, we sometimes want to restrict sites to
             // a different login than the superuser.
             && (Piwik::isUserIsSuperUserOrTheUser($_restrictSitesToLogin)
-                || Piwik_TaskScheduler::isTaskBeingExecuted())
+                || TaskScheduler::isTaskBeingExecuted())
         ) {
             $accessRaw = Access::getInstance()->getRawSitesWithSomeViewAccess($_restrictSitesToLogin);
             $sitesId = array();
@@ -681,12 +684,12 @@ class Piwik_SitesManager_API
      */
     public function getIpsForRange($ipRange)
     {
-        $range = Piwik_IP::getIpsForRange($ipRange);
+        $range = IP::getIpsForRange($ipRange);
         if ($range === false) {
             return false;
         }
 
-        return array(Piwik_IP::N2P($range[0]), Piwik_IP::N2P($range[1]));
+        return array(IP::N2P($range[0]), IP::N2P($range[1]));
     }
 
     /**
@@ -1164,7 +1167,7 @@ class Piwik_SitesManager_API
     public function getUniqueSiteTimezones()
     {
         Piwik::checkUserIsSuperUser();
-        $results = Piwik_FetchAll("SELECT distinct timezone FROM " . Common::prefixTable('site'));
+        $results = Db::fetchAll("SELECT distinct timezone FROM " . Common::prefixTable('site'));
         $timezones = array();
         foreach ($results as $result) {
             $timezones[] = $result['timezone'];
@@ -1237,7 +1240,7 @@ class Piwik_SitesManager_API
      */
     private function isValidIp($ip)
     {
-        return Piwik_IP::getIpsForRange($ip) !== false;
+        return IP::getIpsForRange($ip) !== false;
     }
 
     /**
diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php
index afbd9d21ed..3a8f339693 100644
--- a/plugins/SitesManager/Controller.php
+++ b/plugins/SitesManager/Controller.php
@@ -8,24 +8,29 @@
  * @category Piwik_Plugins
  * @package Piwik_SitesManager
  */
+use Piwik\API\ResponseBuilder;
+use Piwik\Controller\Admin;
 use Piwik\DataTable\Renderer\Json;
 use Piwik\Piwik;
 use Piwik\Common;
 use Piwik\Date;
+use Piwik\IP;
+use Piwik\View;
+use Piwik\Url;
 use Piwik\Site;
 
 /**
  *
  * @package Piwik_SitesManager
  */
-class Piwik_SitesManager_Controller extends Piwik_Controller_Admin
+class Piwik_SitesManager_Controller extends Admin
 {
     /**
      * Main view showing listing of websites and settings
      */
     public function index()
     {
-        $view = new Piwik_View('@SitesManager/index');
+        $view = new View('@SitesManager/index');
 
         if (Piwik::isUserIsSuperUser()) {
             $sites = Piwik_SitesManager_API::getInstance()->getAllSites();
@@ -70,7 +75,7 @@ class Piwik_SitesManager_Controller extends Piwik_Controller_Admin
 
         $view->globalKeepURLFragments = Piwik_SitesManager_API::getInstance()->getKeepURLFragmentsGlobal();
 
-        $view->currentIpAddress = Piwik_IP::getIpFromHeader();
+        $view->currentIpAddress = IP::getIpFromHeader();
 
         $view->showAddSite = (boolean)Common::getRequestVar('showaddsite', false);
 
@@ -83,7 +88,7 @@ class Piwik_SitesManager_Controller extends Piwik_Controller_Admin
      */
     public function setGlobalSettings()
     {
-        $response = new Piwik_API_ResponseBuilder(Common::getRequestVar('format'));
+        $response = new ResponseBuilder(Common::getRequestVar('format'));
 
         try {
             $this->checkTokenInUrl();
@@ -122,8 +127,8 @@ class Piwik_SitesManager_Controller extends Piwik_Controller_Admin
     {
         $idSite = Common::getRequestVar('idSite');
         Piwik::checkUserHasViewAccess($idSite);
-        $jsTag = Piwik::getJavascriptCode($idSite, Piwik_Url::getCurrentUrlWithoutFileName());
-        $view = new Piwik_View('@SitesManager/displayJavascriptCode');
+        $jsTag = Piwik::getJavascriptCode($idSite, Url::getCurrentUrlWithoutFileName());
+        $view = new View('@SitesManager/displayJavascriptCode');
         $this->setBasicVariablesView($view);
         $view->idSite = $idSite;
         $site = new Site($idSite);
@@ -149,7 +154,7 @@ class Piwik_SitesManager_Controller extends Piwik_Controller_Admin
      */
     function displayAlternativeTagsHelp()
     {
-        $view = new Piwik_View('@SitesManager/displayAlternativeTagsHelp');
+        $view = new View('@SitesManager/displayAlternativeTagsHelp');
         $view->idSite = Common::getRequestVar('idSite');
         $url = Common::getRequestVar('piwikUrl', '', 'string');
         if (empty($url)