Refs #4059 Work in progress: Conversion to use Namespaces: Period*, Metrics, Segment, SegmentExpression, PluginsManager.

Removed some deprecated code.

3 files changed, 15 insertions, 11 deletions

diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php
index c9a12e710c..edc66625e6 100644
--- a/plugins/SitesManager/API.php
+++ b/plugins/SitesManager/API.php
@@ -11,6 +11,7 @@
 use Piwik\Piwik;
 use Piwik\Common;
 use Piwik\Access;
+use Piwik\Date;
 use Piwik\Site;
 
 /**
@@ -223,7 +224,7 @@ class Piwik_SitesManager_API
 
         if (empty($timestamp)) $timestamp = time();
 
-        $time = Piwik_Date::factory((int)$timestamp)->getDatetime();
+        $time = Date::factory((int)$timestamp)->getDatetime();
         $result = Piwik_FetchAll("
             SELECT
                 idsite
@@ -236,7 +237,7 @@ class Piwik_SitesManager_API
                 AND visit_last_action_time > ?
                 AND visit_last_action_time <= ?
                 LIMIT 1)
-        ", array($time, $now = Piwik_Date::now()->addHour(1)->getDatetime()));
+        ", array($time, $now = Date::now()->addHour(1)->getDatetime()));
         $idSites = array();
         foreach ($result as $idSite) {
             $idSites[] = $idSite['idsite'];
@@ -516,8 +517,8 @@ class Piwik_SitesManager_API
         $bind['sitesearch_keyword_parameters'] = $searchKeywordParameters;
         $bind['sitesearch_category_parameters'] = $searchCategoryParameters;
         $bind['ts_created'] = !is_null($startDate)
-            ? Piwik_Date::factory($startDate)->getDatetime()
-            : Piwik_Date::now()->getDatetime();
+            ? Date::factory($startDate)->getDatetime()
+            : Date::now()->getDatetime();
 
         if (!empty($group)
             && Piwik::isUserIsSuperUser()
@@ -692,7 +693,7 @@ class Piwik_SitesManager_API
      * Sets IPs to be excluded from all websites. IPs can contain wildcards.
      * Will also apply to websites created in the future.
      *
-     * @param string Comma separated list of IPs to exclude from being tracked (allows wildcards)
+     * @param string $excludedIps Comma separated list of IPs to exclude from being tracked (allows wildcards)
      * @return bool
      */
     public function setGlobalExcludedIps($excludedIps)
@@ -853,7 +854,7 @@ class Piwik_SitesManager_API
      * Sets list of URL query parameters to be excluded on all websites.
      * Will also apply to websites created in the future.
      *
-     * @param string Comma separated list of URL query parameters to exclude from URLs
+     * @param string $excludedQueryParameters Comma separated list of URL query parameters to exclude from URLs
      * @return bool
      */
     public function setGlobalExcludedQueryParameters($excludedQueryParameters)
@@ -1015,7 +1016,7 @@ class Piwik_SitesManager_API
             $bind['ecommerce'] = (int)(bool)$ecommerce;
         }
         if (!is_null($startDate)) {
-            $bind['ts_created'] = Piwik_Date::factory($startDate)->getDatetime();
+            $bind['ts_created'] = Date::factory($startDate)->getDatetime();
         }
         $bind['excluded_ips'] = $this->checkAndReturnExcludedIps($excludedIps);
         $bind['excluded_parameters'] = $this->checkAndReturnCommaSeparatedStringList($excludedQueryParameters);
diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php
index d5dd1c8be0..afbd9d21ed 100644
--- a/plugins/SitesManager/Controller.php
+++ b/plugins/SitesManager/Controller.php
@@ -8,8 +8,10 @@
  * @category Piwik_Plugins
  * @package Piwik_SitesManager
  */
+use Piwik\DataTable\Renderer\Json;
 use Piwik\Piwik;
 use Piwik\Common;
+use Piwik\Date;
 use Piwik\Site;
 
 /**
@@ -51,7 +53,7 @@ class Piwik_SitesManager_Controller extends Piwik_Controller_Admin
         $view->currencies = Common::json_encode(Piwik_SitesManager_API::getInstance()->getCurrencyList());
         $view->defaultCurrency = Piwik_SitesManager_API::getInstance()->getDefaultCurrency();
 
-        $view->utcTime = Piwik_Date::now()->getDatetime();
+        $view->utcTime = Date::now()->getDatetime();
         $excludedIpsGlobal = Piwik_SitesManager_API::getInstance()->getExcludedIpsGlobal();
         $view->globalExcludedIps = str_replace(',', "\n", $excludedIpsGlobal);
         $excludedQueryParametersGlobal = Piwik_SitesManager_API::getInstance()->getExcludedQueryParametersGlobal();
@@ -62,7 +64,7 @@ class Piwik_SitesManager_Controller extends Piwik_Controller_Admin
 
         $view->globalSearchKeywordParameters = Piwik_SitesManager_API::getInstance()->getSearchKeywordParametersGlobal();
         $view->globalSearchCategoryParameters = Piwik_SitesManager_API::getInstance()->getSearchCategoryParametersGlobal();
-        $view->isSearchCategoryTrackingEnabled = PluginsManager::getInstance()->isPluginActivated('CustomVariables');
+        $view->isSearchCategoryTrackingEnabled = \Piwik\PluginsManager::getInstance()->isPluginActivated('CustomVariables');
         $view->allowSiteSpecificUserAgentExclude =
             Piwik_SitesManager_API::getInstance()->isSiteSpecificUserAgentExcludeEnabled();
 
@@ -187,7 +189,7 @@ class Piwik_SitesManager_Controller extends Piwik_Controller_Admin
             }
         }
 
-        Piwik_DataTable_Renderer_Json::sendHeaderJSON();
+        Json::sendHeaderJSON();
         print Common::json_encode($results);
     }
 }
diff --git a/plugins/SitesManager/SitesManager.php b/plugins/SitesManager/SitesManager.php
index 8fbad87b00..7b21bbafd1 100644
--- a/plugins/SitesManager/SitesManager.php
+++ b/plugins/SitesManager/SitesManager.php
@@ -9,12 +9,13 @@
  * @package Piwik_SitesManager
  */
 use Piwik\Piwik;
+use Piwik\Plugin;
 
 /**
  *
  * @package Piwik_SitesManager
  */
-class Piwik_SitesManager extends Piwik_Plugin
+class Piwik_SitesManager extends Plugin
 {
     const KEEP_URL_FRAGMENT_USE_DEFAULT = 0;
     const KEEP_URL_FRAGMENT_YES = 1;