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

3 files changed, 24 insertions, 17 deletions

diff --git a/plugins/CoreAdminHome/API.php b/plugins/CoreAdminHome/API.php
index fe6772fe09..6877d8ac90 100644
--- a/plugins/CoreAdminHome/API.php
+++ b/plugins/CoreAdminHome/API.php
@@ -15,6 +15,7 @@ use Piwik\Piwik;
 use Piwik\Config;
 use Piwik\Common;
 use Piwik\Date;
+use Piwik\TaskScheduler;
 use Piwik\Site;
 
 /**
@@ -43,7 +44,7 @@ class Piwik_CoreAdminHome_API
     public function runScheduledTasks()
     {
         Piwik::checkUserIsSuperUser();
-        return Piwik_TaskScheduler::runTasks();
+        return TaskScheduler::runTasks();
     }
 
     public function getKnownSegmentsToArchive()
@@ -173,7 +174,7 @@ class Piwik_CoreAdminHome_API
             $query = "DELETE FROM $table " .
                 " WHERE ( $sql ) " .
                 " AND idsite IN (" . $sqlIdSites . ")";
-            Piwik_Query($query, $bind);
+            Db::query($query, $bind);
         }
 
         // Update piwik_site.ts_created
@@ -183,7 +184,7 @@ class Piwik_CoreAdminHome_API
 					AND ts_created > ?";
         $minDateSql = $minDate->subDay(1)->getDatetime();
         $bind = array($minDateSql, $minDateSql);
-        Piwik_Query($query, $bind);
+        Db::query($query, $bind);
 
         // Force to re-process data for these websites in the next archive.php cron run
         $invalidatedIdSites = Piwik_CoreAdminHome_API::getWebsiteIdsToInvalidate();
diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php
index 5bae81c756..7ccf51921e 100644
--- a/plugins/CoreAdminHome/Controller.php
+++ b/plugins/CoreAdminHome/Controller.php
@@ -8,17 +8,22 @@
  * @category Piwik_Plugins
  * @package Piwik_CoreAdminHome
  */
+use Piwik\API\ResponseBuilder;
 use Piwik\ArchiveProcessor\Rules;
 use Piwik\Config;
+use Piwik\Controller\Admin;
 use Piwik\Piwik;
 use Piwik\Common;
+use Piwik\Nonce;
+use Piwik\View;
+use Piwik\Url;
 use Piwik\Site;
 
 /**
  *
  * @package Piwik_CoreAdminHome
  */
-class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin
+class Piwik_CoreAdminHome_Controller extends Admin
 {
     const LOGO_HEIGHT = 300;
     const LOGO_SMALL_HEIGHT = 100;
@@ -31,7 +36,7 @@ class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin
     public function generalSettings()
     {
         Piwik::checkUserHasSomeAdminAccess();
-        $view = new Piwik_View('@CoreAdminHome/generalSettings');
+        $view = new View('@CoreAdminHome/generalSettings');
 
         if (Piwik::isUserIsSuperUser()) {
             $enableBrowserTriggerArchiving = Rules::isBrowserTriggerEnabled();
@@ -78,7 +83,7 @@ class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin
     public function setGeneralSettings()
     {
         Piwik::checkUserIsSuperUser();
-        $response = new Piwik_API_ResponseBuilder(Common::getRequestVar('format'));
+        $response = new ResponseBuilder(Common::getRequestVar('format'));
         try {
             $this->checkTokenInUrl();
             $enableBrowserTriggerArchiving = Common::getRequestVar('enableBrowserTriggerArchiving');
@@ -112,7 +117,7 @@ class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin
             // update trusted host settings
             $trustedHosts = Common::getRequestVar('trustedHosts', false, 'json');
             if ($trustedHosts !== false) {
-                Piwik_Url::saveTrustedHostnameInConfig($trustedHosts);
+                Url::saveTrustedHostnameInConfig($trustedHosts);
             }
 
             $config->forceSave();
@@ -130,7 +135,7 @@ class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin
      */
     public function trackingCodeGenerator()
     {
-        $view = new Piwik_View('@CoreAdminHome/trackingCodeGenerator');
+        $view = new View('@CoreAdminHome/trackingCodeGenerator');
         $this->setBasicVariablesView($view);
         $view->topMenu = Piwik_GetTopMenu();
 
@@ -170,15 +175,15 @@ class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin
 
         $nonce = Common::getRequestVar('nonce', false);
         $language = Common::getRequestVar('language', '');
-        if ($nonce !== false && Piwik_Nonce::verifyNonce('Piwik_OptOut', $nonce)) {
-            Piwik_Nonce::discardNonce('Piwik_OptOut');
+        if ($nonce !== false && Nonce::verifyNonce('Piwik_OptOut', $nonce)) {
+            Nonce::discardNonce('Piwik_OptOut');
             Piwik_Tracker_IgnoreCookie::setIgnoreCookie();
             $trackVisits = !$trackVisits;
         }
 
-        $view = new Piwik_View('@CoreAdminHome/optOut');
+        $view = new View('@CoreAdminHome/optOut');
         $view->trackVisits = $trackVisits;
-        $view->nonce = Piwik_Nonce::getNonce('Piwik_OptOut', 3600);
+        $view->nonce = Nonce::getNonce('Piwik_OptOut', 3600);
         $view->language = Piwik_LanguagesManager_API::getInstance()->isLanguageAvailable($language)
             ? $language
             : Piwik_LanguagesManager::getLanguageCodeForCurrentUser();
diff --git a/plugins/CoreAdminHome/CoreAdminHome.php b/plugins/CoreAdminHome/CoreAdminHome.php
index 39a4f08199..8b4aece240 100644
--- a/plugins/CoreAdminHome/CoreAdminHome.php
+++ b/plugins/CoreAdminHome/CoreAdminHome.php
@@ -12,6 +12,7 @@ use Piwik\DataAccess\ArchiveSelector;
 use Piwik\DataAccess\ArchiveTableCreator;
 use Piwik\Piwik;
 use Piwik\Date;
+use Piwik\ScheduledTask;
 use Piwik\Plugin;
 
 /**
@@ -36,19 +37,19 @@ class Piwik_CoreAdminHome extends Plugin
     public function getScheduledTasks(&$tasks)
     {
         // general data purge on older archive tables, executed daily
-        $purgeArchiveTablesTask = new Piwik_ScheduledTask ($this,
+        $purgeArchiveTablesTask = new ScheduledTask ($this,
             'purgeOutdatedArchives',
             null,
             new Piwik_ScheduledTime_Daily(),
-            Piwik_ScheduledTask::HIGH_PRIORITY);
+            ScheduledTask::HIGH_PRIORITY);
         $tasks[] = $purgeArchiveTablesTask;
 
         // lowest priority since tables should be optimized after they are modified
-        $optimizeArchiveTableTask = new Piwik_ScheduledTask ($this,
+        $optimizeArchiveTableTask = new ScheduledTask ($this,
             'optimizeArchiveTable',
             null,
             new Piwik_ScheduledTime_Daily(),
-            Piwik_ScheduledTask::LOWEST_PRIORITY);
+            ScheduledTask::LOWEST_PRIORITY);
         $tasks[] = $optimizeArchiveTableTask;
     }
 
@@ -104,6 +105,6 @@ class Piwik_CoreAdminHome extends Plugin
     function optimizeArchiveTable()
     {
         $archiveTables = ArchiveTableCreator::getTablesArchivesInstalled();
-        Piwik_OptimizeTables($archiveTables);
+        Db::optimizeTables($archiveTables);
     }
 }