1 files changed, 17 insertions, 16 deletions

diff --git a/plugins/SitesManager/SitesManager.php b/plugins/SitesManager/SitesManager.php
index 7b21bbafd1..cdc3a92f2b 100644
--- a/plugins/SitesManager/SitesManager.php
+++ b/plugins/SitesManager/SitesManager.php
@@ -6,16 +6,17 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  * @category Piwik_Plugins
- * @package Piwik_SitesManager
+ * @package SitesManager
  */
+namespace Piwik\Plugins\SitesManager;
+
 use Piwik\Piwik;
-use Piwik\Plugin;
 
 /**
  *
- * @package Piwik_SitesManager
+ * @package SitesManager
  */
-class Piwik_SitesManager extends Plugin
+class SitesManager extends \Piwik\Plugin
 {
     const KEEP_URL_FRAGMENT_USE_DEFAULT = 0;
     const KEEP_URL_FRAGMENT_YES = 1;
@@ -64,17 +65,17 @@ class Piwik_SitesManager extends Plugin
      * Will record in the tracker config file all data needed for this website in Tracker.
      *
      * @param array $array
-     * @param int   $idSite
+     * @param int $idSite
      * @return void
      */
     public function recordWebsiteDataInCache(&$array, $idSite)
     {
         $idSite = (int)$idSite;
-        
+
         // add the 'hosts' entry in the website array
         $array['hosts'] = $this->getTrackerHosts($idSite);
 
-        $website = Piwik_SitesManager_API::getInstance()->getSiteFromId($idSite);
+        $website = API::getInstance()->getSiteFromId($idSite);
         $array['excluded_ips'] = $this->getTrackerExcludedIps($website);
         $array['excluded_parameters'] = self::getTrackerExcludedQueryParameters($website);
         $array['excluded_user_agents'] = self::getExcludedUserAgents($website);
@@ -98,14 +99,14 @@ class Piwik_SitesManager extends Plugin
             return false;
         }
 
-        return Piwik_SitesManager_API::getInstance()->getKeepURLFragmentsGlobal();
+        return API::getInstance()->getKeepURLFragmentsGlobal();
     }
 
     private function getTrackerSearchKeywordParameters($website)
     {
         $searchParameters = $website['sitesearch_keyword_parameters'];
         if (empty($searchParameters)) {
-            $searchParameters = Piwik_SitesManager_API::getInstance()->getSearchKeywordParametersGlobal();
+            $searchParameters = API::getInstance()->getSearchKeywordParametersGlobal();
         }
         return explode(",", $searchParameters);
     }
@@ -114,7 +115,7 @@ class Piwik_SitesManager extends Plugin
     {
         $searchParameters = $website['sitesearch_category_parameters'];
         if (empty($searchParameters)) {
-            $searchParameters = Piwik_SitesManager_API::getInstance()->getSearchCategoryParametersGlobal();
+            $searchParameters = API::getInstance()->getSearchCategoryParametersGlobal();
         }
         return explode(",", $searchParameters);
     }
@@ -128,13 +129,13 @@ class Piwik_SitesManager extends Plugin
     private function getTrackerExcludedIps($website)
     {
         $excludedIps = $website['excluded_ips'];
-        $globalExcludedIps = Piwik_SitesManager_API::getInstance()->getExcludedIpsGlobal();
+        $globalExcludedIps = API::getInstance()->getExcludedIpsGlobal();
 
         $excludedIps .= ',' . $globalExcludedIps;
 
         $ipRanges = array();
         foreach (explode(',', $excludedIps) as $ip) {
-            $ipRange = Piwik_SitesManager_API::getInstance()->getIpsForRange($ip);
+            $ipRange = API::getInstance()->getIpsForRange($ip);
             if ($ipRange !== false) {
                 $ipRanges[] = $ipRange;
             }
@@ -151,8 +152,8 @@ class Piwik_SitesManager extends Plugin
      */
     private static function getExcludedUserAgents($website)
     {
-        $excludedUserAgents = Piwik_SitesManager_API::getInstance()->getExcludedUserAgentsGlobal();
-        if (Piwik_SitesManager_API::getInstance()->isSiteSpecificUserAgentExcludeEnabled()) {
+        $excludedUserAgents = API::getInstance()->getExcludedUserAgentsGlobal();
+        if (API::getInstance()->isSiteSpecificUserAgentExcludeEnabled()) {
             $excludedUserAgents .= ',' . $website['excluded_user_agents'];
         }
         return self::filterBlankFromCommaSepList($excludedUserAgents);
@@ -167,7 +168,7 @@ class Piwik_SitesManager extends Plugin
     public static function getTrackerExcludedQueryParameters($website)
     {
         $excludedQueryParameters = $website['excluded_parameters'];
-        $globalExcludedQueryParameters = Piwik_SitesManager_API::getInstance()->getExcludedQueryParametersGlobal();
+        $globalExcludedQueryParameters = API::getInstance()->getExcludedQueryParametersGlobal();
 
         $excludedQueryParameters .= ',' . $globalExcludedQueryParameters;
         return self::filterBlankFromCommaSepList($excludedQueryParameters);
@@ -195,7 +196,7 @@ class Piwik_SitesManager extends Plugin
      */
     private function getTrackerHosts($idSite)
     {
-        $urls = Piwik_SitesManager_API::getInstance()->getSiteUrlsFromId($idSite);
+        $urls = API::getInstance()->getSiteUrlsFromId($idSite);
         $hosts = array();
         foreach ($urls as $url) {
             $url = parse_url($url);