Refs #4059 Converting dozens of plugins/* classes to use Namespaces, \Piwik\Plugins\*

Added namespaces to functions.php files in the five plugins that had one
Work in progress

3 files changed, 32 insertions, 23 deletions

diff --git a/plugins/LanguagesManager/API.php b/plugins/LanguagesManager/API.php
index ee6dd2aaa9..332b68cc9c 100644
--- a/plugins/LanguagesManager/API.php
+++ b/plugins/LanguagesManager/API.php
@@ -6,9 +6,11 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  * @category Piwik_Plugins
- * @package Piwik_LanguagesManager
+ * @package LanguagesManager
  *
  */
+namespace Piwik\Plugins\LanguagesManager;
+
 use Piwik\Piwik;
 use Piwik\Common;
 use Piwik\Db;
@@ -23,14 +25,14 @@ use Piwik\Db;
  * You can also request the default language to load for a user via "getLanguageForUser",
  * or update it via "setLanguageForUser".
  *
- * @package Piwik_LanguagesManager
+ * @package LanguagesManager
  */
-class Piwik_LanguagesManager_API
+class API
 {
     static private $instance = null;
 
     /**
-     * @return Piwik_LanguagesManager_API
+     * @return \Piwik\Plugins\LanguagesManager\API
      */
     static public function getInstance()
     {
diff --git a/plugins/LanguagesManager/Controller.php b/plugins/LanguagesManager/Controller.php
index 212293ce79..3eba8c5097 100644
--- a/plugins/LanguagesManager/Controller.php
+++ b/plugins/LanguagesManager/Controller.php
@@ -6,18 +6,22 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  * @category Piwik_Plugins
- * @package Piwik_LanguagesManager
+ * @package LanguagesManager
  *
  */
+namespace Piwik\Plugins\LanguagesManager;
+
 use Piwik\Piwik;
 use Piwik\Common;
-use Piwik\Controller;
+use Piwik\Plugins\LanguagesManager\API;
 use Piwik\Url;
+use Piwik\Plugins\LanguagesManager\LanguagesManager;
+use Zend_Registry;
 
 /**
- * @package Piwik_LanguagesManager
+ * @package LanguagesManager
  */
-class Piwik_LanguagesManager_Controller extends Controller
+class Controller extends \Piwik\Controller
 {
     /**
      * anonymous = in the session
@@ -31,11 +35,11 @@ class Piwik_LanguagesManager_Controller extends Controller
         if (Piwik::isInstalled()) {
             $this->checkTokenInUrl();
         }
-        Piwik_LanguagesManager::setLanguageForSession($language);
+        LanguagesManager::setLanguageForSession($language);
         if (Zend_Registry::isRegistered('access')) {
             $currentUser = Piwik::getCurrentUserLogin();
             if ($currentUser && $currentUser !== 'anonymous') {
-                Piwik_LanguagesManager_API::getInstance()->setLanguageForUser($currentUser, $language);
+                API::getInstance()->setLanguageForUser($currentUser, $language);
             }
         }
         Url::redirectToReferer();
diff --git a/plugins/LanguagesManager/LanguagesManager.php b/plugins/LanguagesManager/LanguagesManager.php
index 6bd1bf553c..004d82ade6 100644
--- a/plugins/LanguagesManager/LanguagesManager.php
+++ b/plugins/LanguagesManager/LanguagesManager.php
@@ -6,23 +6,27 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  * @category Piwik_Plugins
- * @package Piwik_LanguagesManager
+ * @package LanguagesManager
  *
  */
+namespace Piwik\Plugins\LanguagesManager;
+
+use Exception;
 use Piwik\Config;
 use Piwik\Piwik;
 use Piwik\Common;
 use Piwik\Cookie;
+use Piwik\Plugins\LanguagesManager\API;
 use Piwik\View;
-use Piwik\Plugin;
 use Piwik\Db;
 use Piwik\Translate;
+use Zend_Registry;
 
 /**
  *
- * @package Piwik_LanguagesManager
+ * @package LanguagesManager
  */
-class Piwik_LanguagesManager extends Plugin
+class LanguagesManager extends \Piwik\Plugin
 {
     /**
      * @see Piwik_Plugin::getListHooksRegistered
@@ -75,7 +79,7 @@ class Piwik_LanguagesManager extends Plugin
     private function getLanguagesSelector()
     {
         $view = new View("@LanguagesManager/getLanguagesSelector");
-        $view->languages = Piwik_LanguagesManager_API::getInstance()->getAvailableLanguageNames();
+        $view->languages = API::getInstance()->getAvailableLanguageNames();
         $view->currentLanguageCode = self::getLanguageCodeForCurrentUser();
         $view->currentLanguageName = self::getLanguageNameForCurrentUser();
         return $view->render();
@@ -86,7 +90,7 @@ class Piwik_LanguagesManager extends Plugin
         if (empty($language)) {
             $language = self::getLanguageCodeForCurrentUser();
         }
-        if (!Piwik_LanguagesManager_API::getInstance()->isLanguageAvailable($language)) {
+        if (!API::getInstance()->isLanguageAvailable($language)) {
             $language = Translate::getInstance()->getLanguageDefault();
         }
     }
@@ -132,10 +136,10 @@ class Piwik_LanguagesManager extends Plugin
     static public function getLanguageCodeForCurrentUser()
     {
         $languageCode = self::getLanguageFromPreferences();
-        if (!Piwik_LanguagesManager_API::getInstance()->isLanguageAvailable($languageCode)) {
-            $languageCode = Common::extractLanguageCodeFromBrowserLanguage(Common::getBrowserLanguage(), Piwik_LanguagesManager_API::getInstance()->getAvailableLanguages());
+        if (!API::getInstance()->isLanguageAvailable($languageCode)) {
+            $languageCode = Common::extractLanguageCodeFromBrowserLanguage(Common::getBrowserLanguage(), API::getInstance()->getAvailableLanguages());
         }
-        if (!Piwik_LanguagesManager_API::getInstance()->isLanguageAvailable($languageCode)) {
+        if (!API::getInstance()->isLanguageAvailable($languageCode)) {
             $languageCode = Translate::getInstance()->getLanguageDefault();
         }
         return $languageCode;
@@ -147,7 +151,7 @@ class Piwik_LanguagesManager extends Plugin
     static public function getLanguageNameForCurrentUser()
     {
         $languageCode = self::getLanguageCodeForCurrentUser();
-        $languages = Piwik_LanguagesManager_API::getInstance()->getAvailableLanguageNames();
+        $languages = API::getInstance()->getAvailableLanguageNames();
         foreach ($languages as $language) {
             if ($language['code'] === $languageCode) {
                 return $language['name'];
@@ -166,13 +170,12 @@ class Piwik_LanguagesManager extends Plugin
 
         try {
             $currentUser = Piwik::getCurrentUserLogin();
-            return Piwik_LanguagesManager_API::getInstance()->getLanguageForUser($currentUser);
+            return API::getInstance()->getLanguageForUser($currentUser);
         } catch (Exception $e) {
             return false;
         }
     }
 
-
     /**
      * Returns the language for the session
      *
@@ -196,7 +199,7 @@ class Piwik_LanguagesManager extends Plugin
      */
     static public function setLanguageForSession($languageCode)
     {
-        if (!Piwik_LanguagesManager_API::getInstance()->isLanguageAvailable($languageCode)) {
+        if (!API::getInstance()->isLanguageAvailable($languageCode)) {
             return false;
         }