Converting to namespace: Period, Site

31 files changed, 99 insertions, 62 deletions

diff --git a/plugins/API/ProcessedReport.php b/plugins/API/ProcessedReport.php
index 70b51f91a5..1788ce79c8 100644
--- a/plugins/API/ProcessedReport.php
+++ b/plugins/API/ProcessedReport.php
@@ -1,6 +1,8 @@
 <?php
+use Piwik\Period;
 use Piwik\Piwik;
 use Piwik\Common;
+use Piwik\Site;
 
 /**
  * Piwik - Open source web analytics
@@ -64,7 +66,7 @@ class Piwik_API_ProcessedReport
      */
     public function getReportMetadata($idSites, $period = false, $date = false, $hideMetricsDoc = false, $showSubtableReports = false)
     {
-        $idSites = Piwik_Site::getIdSitesFromIdSitesString($idSites);
+        $idSites = Site::getIdSitesFromIdSitesString($idSites);
         if (!empty($idSites)) {
             Piwik::checkUserHasViewAccess($idSites);
         }
@@ -279,9 +281,9 @@ class Piwik_API_ProcessedReport
         foreach ($columns as $columnId => &$name) {
             $name = ucfirst($name);
         }
-        $website = new Piwik_Site($idSite);
+        $website = new Site($idSite);
 
-        $period = Piwik_Period::advancedFactory($period, $date);
+        $period = Period::advancedFactory($period, $date);
         $period = $period->getLocalizedLongString();
 
         $return = array(
diff --git a/plugins/API/RowEvolution.php b/plugins/API/RowEvolution.php
index ba6a63bdb8..cd7f469b94 100644
--- a/plugins/API/RowEvolution.php
+++ b/plugins/API/RowEvolution.php
@@ -8,6 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_API
  */
+use Piwik\Period;
 use Piwik\Piwik;
 use Piwik\Common;
 
@@ -27,7 +28,7 @@ class Piwik_API_RowEvolution
             $period = 'day';
         }
 
-        if (!Piwik_Period::isMultiplePeriod($date, $period)) {
+        if (!Period::isMultiplePeriod($date, $period)) {
             throw new Exception("Row evolutions can not be processed with this combination of \'date\' and \'period\' parameters.");
         }
 
diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php
index 103672f37b..cb8716aba0 100644
--- a/plugins/Actions/Actions.php
+++ b/plugins/Actions/Actions.php
@@ -10,6 +10,7 @@
  */
 use Piwik\Piwik;
 use Piwik\Common;
+use Piwik\Site;
 
 /**
  * Actions plugin
@@ -561,7 +562,7 @@ class Piwik_Actions extends Piwik_Plugin
         if ($idSite == 0) {
             return false;
         }
-        return Piwik_Site::isSiteSearchEnabledFor($idSite);
+        return Site::isSiteSearchEnabledFor($idSite);
     }
 
     /**
diff --git a/plugins/Annotations/API.php b/plugins/Annotations/API.php
index 92dd4f18e4..faa7d76c97 100755
--- a/plugins/Annotations/API.php
+++ b/plugins/Annotations/API.php
@@ -8,6 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_Annotations
  */
+use Piwik\Period;
 use Piwik\Piwik;
 
 /**
@@ -318,7 +319,7 @@ class Piwik_Annotations_API
             if ($period == 'range') {
                 $oPeriod = new Piwik_Period_Range('day', $date);
             } else {
-                $oPeriod = Piwik_Period::factory($period, Piwik_Date::factory($date));
+                $oPeriod = Period::factory($period, Piwik_Date::factory($date));
             }
 
             $startDate = $oPeriod->getDateStart();
diff --git a/plugins/Annotations/AnnotationList.php b/plugins/Annotations/AnnotationList.php
index 0b0ca1ea44..4d15e91e50 100755
--- a/plugins/Annotations/AnnotationList.php
+++ b/plugins/Annotations/AnnotationList.php
@@ -9,6 +9,7 @@
  * @package Piwik_Annotations
  */
 use Piwik\Piwik;
+use Piwik\Site;
 
 /**
  * This class can be used to query & modify annotations for multiple sites
@@ -52,7 +53,7 @@ class Piwik_Annotations_AnnotationList
      */
     public function __construct($idSites)
     {
-        $this->idSites = Piwik_Site::getIdSitesFromIdSitesString($idSites);
+        $this->idSites = Site::getIdSitesFromIdSitesString($idSites);
         $this->annotations = $this->getAnnotationsForSite();
     }
 
@@ -214,7 +215,7 @@ class Piwik_Annotations_AnnotationList
     public function search($startDate, $endDate, $idSite = false)
     {
         if ($idSite) {
-            $idSites = Piwik_Site::getIdSitesFromIdSitesString($idSite);
+            $idSites = Site::getIdSitesFromIdSitesString($idSite);
         } else {
             $idSites = array_keys($this->annotations);
         }
diff --git a/plugins/CoreAdminHome/API.php b/plugins/CoreAdminHome/API.php
index d192c17ca7..d9bf9b4cee 100644
--- a/plugins/CoreAdminHome/API.php
+++ b/plugins/CoreAdminHome/API.php
@@ -8,8 +8,10 @@
  * @category Piwik_Plugins
  * @package Piwik_CoreAdminHome
  */
+use Piwik\Period;
 use Piwik\Piwik;
 use Piwik\Common;
+use Piwik\Site;
 
 /**
  * @package Piwik_CoreAdminHome
@@ -71,7 +73,7 @@ class Piwik_CoreAdminHome_API
      */
     public function invalidateArchivedReports($idSites, $dates)
     {
-        $idSites = Piwik_Site::getIdSitesFromIdSitesString($idSites);
+        $idSites = Site::getIdSitesFromIdSitesString($idSites);
         if (empty($idSites)) {
             throw new Exception("Specify a value for &idSites= as a comma separated list of website IDs, for which your token_auth has 'admin' permission");
         }
@@ -130,7 +132,7 @@ class Piwik_CoreAdminHome_API
 
             // but also weeks overlapping several months stored in the month where the week is starting
             /* @var $week Piwik_Period_Week */
-            $week = Piwik_Period::factory('week', $date);
+            $week = Period::factory('week', $date);
             $weekAsString = $week->getDateStart()->toString('Y_m');
             $datesByMonth[$weekAsString][] = $date->toString();
 
@@ -186,7 +188,7 @@ class Piwik_CoreAdminHome_API
         $invalidatedIdSites = array_values($invalidatedIdSites);
         Piwik_SetOption(self::OPTION_INVALIDATED_IDSITES, serialize($invalidatedIdSites));
 
-        Piwik_Site::clearCache();
+        Site::clearCache();
 
         $output = array();
         // output logs
diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php
index 1cc8afb6c4..612a9e1c3e 100644
--- a/plugins/CoreAdminHome/Controller.php
+++ b/plugins/CoreAdminHome/Controller.php
@@ -11,6 +11,7 @@
 use Piwik\Config;
 use Piwik\Piwik;
 use Piwik\Common;
+use Piwik\Site;
 
 /**
  *
@@ -137,7 +138,7 @@ class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin
         $defaultIdSite = reset($viewableIdSites);
         $view->idSite = Common::getRequestVar('idSite', $defaultIdSite, 'int');
 
-        $view->defaultReportSiteName = Piwik_Site::getNameFor($view->idSite);
+        $view->defaultReportSiteName = Site::getNameFor($view->idSite);
         $view->defaultSiteRevenue = Piwik::getCurrency($view->idSite);
 
         $allUrls = Piwik_SitesManager_API::getInstance()->getSiteUrlsFromId($view->idSite);
@@ -148,7 +149,7 @@ class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin
         }
         $view->defaultReportSiteAlias = $aliasUrl;
 
-        $mainUrl = Piwik_Site::getMainUrlFor($view->idSite);
+        $mainUrl = Site::getMainUrlFor($view->idSite);
         $view->defaultReportSiteDomain = @parse_url($mainUrl, PHP_URL_HOST);
 
         // get currencies for each viewable site
diff --git a/plugins/CoreHome/Controller.php b/plugins/CoreHome/Controller.php
index d6afe9e354..ded8a80658 100644
--- a/plugins/CoreHome/Controller.php
+++ b/plugins/CoreHome/Controller.php
@@ -10,6 +10,7 @@
  */
 use Piwik\Piwik;
 use Piwik\Common;
+use Piwik\Site;
 
 /**
  *
@@ -73,7 +74,7 @@ class Piwik_CoreHome_Controller extends Piwik_Controller
         }
         $websiteId = Common::getRequestVar('idSite', false, 'int');
         if ($websiteId) {
-            $website = new Piwik_Site($websiteId);
+            $website = new Site($websiteId);
             $datetimeCreationDate = $this->site->getCreationDate()->getDatetime();
             $creationDateLocalTimezone = Piwik_Date::factory($datetimeCreationDate, $website->getTimezone())->toString('Y-m-d');
             $todayLocalTimezone = Piwik_Date::factory('now', $website->getTimezone())->toString('Y-m-d');
diff --git a/plugins/Dashboard/Dashboard.php b/plugins/Dashboard/Dashboard.php
index 6c8a4830b1..7548104be9 100644
--- a/plugins/Dashboard/Dashboard.php
+++ b/plugins/Dashboard/Dashboard.php
@@ -10,6 +10,7 @@
  */
 use Piwik\Piwik;
 use Piwik\Common;
+use Piwik\Site;
 
 /**
  * @package Piwik_Dashboard
@@ -212,7 +213,7 @@ class Piwik_Dashboard extends Piwik_Plugin
         $tooltip = false;
         try {
             $idSite = Common::getRequestVar('idSite');
-            $tooltip = Piwik_Translate('Dashboard_TopLinkTooltip', Piwik_Site::getNameFor($idSite));
+            $tooltip = Piwik_Translate('Dashboard_TopLinkTooltip', Site::getNameFor($idSite));
         } catch (Exception $ex) {
             // if no idSite parameter, show no tooltip
         }
diff --git a/plugins/ExamplePlugin/Controller.php b/plugins/ExamplePlugin/Controller.php
index 33b8e1d605..7ff7a79042 100644
--- a/plugins/ExamplePlugin/Controller.php
+++ b/plugins/ExamplePlugin/Controller.php
@@ -76,7 +76,7 @@ class Piwik_ExamplePlugin_Controller extends Piwik_Controller
         $out .= '<code>$this->date</code> = current selected <b>Piwik_Date</b> object (<a href="https://github.com/piwik/piwik/blob/master/core/Date.php">class</a>)<br />';
         $out .= '<code>$period = Common::getRequestVar("period");</code> - Get the current selected period<br />';
         $out .= '<code>$idSite = Common::getRequestVar("idSite");</code> - Get the selected idSite<br />';
-        $out .= '<code>$site = new Piwik_Site($idSite);</code> - Build the Piwik_Site object (<a href="https://github.com/piwik/piwik/tree/master/core/Site.php">class</a>)<br />';
+        $out .= '<code>$site = new Site($idSite);</code> - Build the Site object (<a href="https://github.com/piwik/piwik/tree/master/core/Site.php">class</a>)<br />';
         $out .= '<code>$this->str_date</code> = current selected date in YYYY-MM-DD format<br />';
 
         $out .= '<h3>Misc</h3>';
diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php
index 98bfacd0b6..aeffa5583b 100644
--- a/plugins/Goals/API.php
+++ b/plugins/Goals/API.php
@@ -11,6 +11,7 @@
 use Piwik\Archive;
 use Piwik\Piwik;
 use Piwik\Common;
+use Piwik\Site;
 
 /**
  * Goals API lets you Manage existing goals, via "updateGoal" and "deleteGoal", create new Goals via "addGoal",
@@ -57,7 +58,7 @@ class Piwik_Goals_API
     {
         //TODO calls to this function could be cached as static
         // would help UI at least, since some UI requests would call this 2-3 times..
-        $idSite = Piwik_Site::getIdSitesFromIdSitesString($idSite);
+        $idSite = Site::getIdSitesFromIdSitesString($idSite);
         if (empty($idSite)) {
             return array();
         }
diff --git a/plugins/Goals/Goals.php b/plugins/Goals/Goals.php
index e612295dc1..dc3445cb88 100644
--- a/plugins/Goals/Goals.php
+++ b/plugins/Goals/Goals.php
@@ -10,6 +10,7 @@
  */
 use Piwik\Piwik;
 use Piwik\Common;
+use Piwik\Site;
 
 /**
  *
@@ -216,7 +217,7 @@ class Piwik_Goals extends Piwik_Plugin
                 );
             }
 
-            $site = new Piwik_Site($idSite);
+            $site = new Site($idSite);
             if ($site->isEcommerceEnabled()) {
                 $category = Piwik_Translate('Goals_Ecommerce');
                 $ecommerceMetrics = array_merge($goalMetrics, array(
@@ -413,7 +414,7 @@ class Piwik_Goals extends Piwik_Plugin
         $idSite = Common::getRequestVar('idSite', null, 'int');
 
         // Ecommerce widgets
-        $site = new Piwik_Site($idSite);
+        $site = new Site($idSite);
         if ($site->isEcommerceEnabled()) {
             Piwik_AddWidget('Goals_Ecommerce', 'Goals_EcommerceOverview', 'Goals', 'widgetGoalReport', array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER));
             Piwik_AddWidget('Goals_Ecommerce', 'Goals_EcommerceLog', 'Goals', 'getEcommerceLog');
@@ -437,7 +438,7 @@ class Piwik_Goals extends Piwik_Plugin
         $idSite = Common::getRequestVar('idSite', null, 'int');
         $goals = Piwik_Goals_API::getInstance()->getGoals($idSite);
         $mainGoalMenu = $this->getGoalCategoryName($idSite);
-        $site = new Piwik_Site($idSite);
+        $site = new Site($idSite);
         if (count($goals) == 0) {
             Piwik_AddMenu($mainGoalMenu, '', array(
                                                   'module' => 'Goals',
@@ -469,7 +470,7 @@ class Piwik_Goals extends Piwik_Plugin
 
     protected function getGoalCategoryName($idSite)
     {
-        $site = new Piwik_Site($idSite);
+        $site = new Site($idSite);
         return $site->isEcommerceEnabled() ? 'Goals_EcommerceAndGoalsMenu' : 'Goals_Goals';
     }
 
diff --git a/plugins/ImageGraph/API.php b/plugins/ImageGraph/API.php
index 4087b7a18d..dd6967b56b 100644
--- a/plugins/ImageGraph/API.php
+++ b/plugins/ImageGraph/API.php
@@ -8,6 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_ImageGraph
  */
+use Piwik\Period;
 use Piwik\Piwik;
 use Piwik\Common;
 
@@ -171,7 +172,7 @@ class Piwik_ImageGraph_API
             $reportHasDimension = !empty($metadata['dimension']);
             $constantRowsCount = !empty($metadata['constantRowsCount']);
 
-            $isMultiplePeriod = Piwik_Period::isMultiplePeriod($date, $period);
+            $isMultiplePeriod = Period::isMultiplePeriod($date, $period);
             if (!$reportHasDimension && !$isMultiplePeriod) {
                 throw new Exception('The graph cannot be drawn for this combination of \'date\' and \'period\' parameters.');
             }
diff --git a/plugins/ImageGraph/ImageGraph.php b/plugins/ImageGraph/ImageGraph.php
index 60ff3dc27c..73743ccbba 100644
--- a/plugins/ImageGraph/ImageGraph.php
+++ b/plugins/ImageGraph/ImageGraph.php
@@ -1,5 +1,7 @@
 <?php
 use Piwik\Common;
+use Piwik\Period;
+use Piwik\Site;
 
 /**
  * Piwik - Open source web analytics
@@ -70,7 +72,7 @@ class Piwik_ImageGraph extends Piwik_Plugin
         }
 
         // need two sets of period & date, one for single period graphs, one for multiple periods graphs
-        if (Piwik_Period::isMultiplePeriod($info['date'], $info['period'])) {
+        if (Period::isMultiplePeriod($info['date'], $info['period'])) {
             $periodForMultiplePeriodGraph = $info['period'];
             $dateForMultiplePeriodGraph = $info['date'];
 
@@ -80,7 +82,7 @@ class Piwik_ImageGraph extends Piwik_Plugin
             $periodForSinglePeriodGraph = $info['period'];
             $dateForSinglePeriodGraph = $info['date'];
 
-            $piwikSite = new Piwik_Site($idSite);
+            $piwikSite = new Site($idSite);
             if ($periodForSinglePeriodGraph == 'range') {
                 $periodForMultiplePeriodGraph = Config::getInstance()->General['graphs_default_period_to_plot_when_period_range'];
                 $dateForMultiplePeriodGraph = $dateForSinglePeriodGraph;
diff --git a/plugins/Live/API.php b/plugins/Live/API.php
index 27652141d1..78bc6802bd 100644
--- a/plugins/Live/API.php
+++ b/plugins/Live/API.php
@@ -9,8 +9,10 @@
  * @package Piwik_Live
  */
 use Piwik\Config;
+use Piwik\Period;
 use Piwik\Piwik;
 use Piwik\Common;
+use Piwik\Site;
 
 /**
  * @see plugins/Referers/functions.php
@@ -166,7 +168,7 @@ class Piwik_Live_API
 
         $table = new Piwik_DataTable();
 
-        $site = new Piwik_Site($idSite);
+        $site = new Site($idSite);
         $timezone = $site->getTimezone();
         $currencies = Piwik_SitesManager_API::getInstance()->getCurrencySymbols();
         foreach ($visitorDetails as $visitorDetail) {
@@ -345,7 +347,7 @@ class Piwik_Live_API
 
         // SQL Filter with provided period
         if (!empty($period) && !empty($date)) {
-            $currentSite = new Piwik_Site($idSite);
+            $currentSite = new Site($idSite);
             $currentTimezone = $currentSite->getTimezone();
 
             $dateString = $date;
@@ -362,7 +364,7 @@ class Piwik_Live_API
                 ) {
                     $processedDate = $processedDate->subDay(1);
                 }
-                $processedPeriod = Piwik_Period::factory($period, $processedDate);
+                $processedPeriod = Period::factory($period, $processedDate);
             }
             $dateStart = $processedPeriod->getDateStart()->setTimezone($currentTimezone);
             $where[] = "log_visit.visit_last_action_time >= ?";
diff --git a/plugins/MobileMessaging/ReportRenderer/Sms.php b/plugins/MobileMessaging/ReportRenderer/Sms.php
index d752b50e84..68bc22691a 100644
--- a/plugins/MobileMessaging/ReportRenderer/Sms.php
+++ b/plugins/MobileMessaging/ReportRenderer/Sms.php
@@ -9,7 +9,7 @@
  * @package Piwik_MobileMessaging_ReportRenderer
  */
 use Piwik\Common;
-
+use Piwik\Site;
 
 /**
  *
@@ -111,7 +111,7 @@ class Piwik_MobileMessaging_ReportRenderer_Sms extends Piwik_ReportRenderer
         $siteHasECommerce = array();
         foreach ($reportRowsMetadata as $rowMetadata) {
             $idSite = $rowMetadata->getColumn('idsite');
-            $siteHasECommerce[$idSite] = Piwik_Site::isEcommerceEnabledFor($idSite);
+            $siteHasECommerce[$idSite] = Site::isEcommerceEnabledFor($idSite);
         }
 
         $view = new Piwik_View('@MobileMessaging/SMSReport');
diff --git a/plugins/MultiSites/API.php b/plugins/MultiSites/API.php
index 92d56adea7..16a5440916 100755
--- a/plugins/MultiSites/API.php
+++ b/plugins/MultiSites/API.php
@@ -11,6 +11,7 @@
 use Piwik\Archive;
 use Piwik\Piwik;
 use Piwik\Common;
+use Piwik\Site;
 
 /**
  * The MultiSites API lets you request the key metrics (visits, page views, revenue) for all Websites in Piwik.
@@ -178,11 +179,11 @@ class Piwik_MultiSites_API
                 // Instead, we make sure that only the right set of data is returned
                 && !Piwik_TaskScheduler::isTaskBeingExecuted()
             ) {
-                Piwik_Site::setSites(
+                Site::setSites(
                     Piwik_SitesManager_API::getInstance()->getAllSites()
                 );
             } else {
-                Piwik_Site::setSitesFromArray(
+                Site::setSitesFromArray(
                     Piwik_SitesManager_API::getInstance()->getSitesWithAtLeastViewAccess($limit = false, $_restrictSitesToLogin)
                 );
             }
@@ -267,7 +268,7 @@ class Piwik_MultiSites_API
 
             foreach ($dataTableRows as $dataTableRow) {
                 $siteId = $dataTableRow->getColumn('label');
-                if (!Piwik_Site::isEcommerceEnabledFor($siteId)) {
+                if (!Site::isEcommerceEnabledFor($siteId)) {
                     foreach ($apiECommerceMetrics as $metricSettings) {
                         $dataTableRow->deleteColumn($metricSettings[self::METRIC_RECORD_NAME_KEY]);
                         $dataTableRow->deleteColumn($metricSettings[self::METRIC_EVOLUTION_COL_NAME_KEY]);
@@ -281,7 +282,7 @@ class Piwik_MultiSites_API
 
         // set the label of each row to the site name
         if ($multipleWebsitesRequested) {
-            $getNameFor = array('Piwik_Site', 'getNameFor');
+            $getNameFor = array('Site', 'getNameFor');
             $dataTable->filter('ColumnCallbackReplace', array('label', $getNameFor));
         } else {
             $dataTable->filter('ColumnDelete', array('label'));
diff --git a/plugins/MultiSites/Controller.php b/plugins/MultiSites/Controller.php
index 107f1923ce..992cfa6be0 100644
--- a/plugins/MultiSites/Controller.php
+++ b/plugins/MultiSites/Controller.php
@@ -8,9 +8,11 @@
  * @category Piwik_Plugins
  * @package Piwik_MultiSites
  */
+use Piwik\Period;
 use Piwik\Piwik;
 use Piwik\Common;
 use Piwik\Config;
+use Piwik\Site;
 
 /**
  *
@@ -69,12 +71,12 @@ class Piwik_MultiSites_Controller extends Piwik_Controller
         // put data into a form the template will understand better
         $digestableData = array();
         foreach ($siteIds as $idSite) {
-            $isEcommerceEnabled = Piwik_Site::isEcommerceEnabledFor($idSite);
+            $isEcommerceEnabled = Site::isEcommerceEnabledFor($idSite);
 
             $digestableData[$idSite] = array(
                 'idsite'    => $idSite,
-                'main_url'  => Piwik_Site::getMainUrlFor($idSite),
-                'name'      => Piwik_Site::getNameFor($idSite),
+                'main_url'  => Site::getMainUrlFor($idSite),
+                'name'      => Site::getNameFor($idSite),
                 'visits'    => 0,
                 'pageviews' => 0
             );
@@ -140,7 +142,7 @@ class Piwik_MultiSites_Controller extends Piwik_Controller
         }
 
         if ($period != 'range') {
-            $lastPeriod = Piwik_Period::factory($period, $dataTable->getMetadata('last_period_date'));
+            $lastPeriod = Period::factory($period, $dataTable->getMetadata('last_period_date'));
             $view->pastPeriodPretty = self::getCalendarPrettyDate($lastPeriod);
         }
 
@@ -180,14 +182,14 @@ class Piwik_MultiSites_Controller extends Piwik_Controller
         $maxDate = $now->subDay(1)->getTimestamp();
         foreach ($siteIds as $idsite) {
             // look for 'now' in the website's timezone
-            $timezone = Piwik_Site::getTimezoneFor($idsite);
+            $timezone = Site::getTimezoneFor($idsite);
             $date = Piwik_Date::adjustForTimezone($now->getTimestamp(), $timezone);
             if ($date > $maxDate) {
                 $maxDate = $date;
             }
 
             // look for the absolute minimum date
-            $creationDate = Piwik_Site::getCreationDateFor($idsite);
+            $creationDate = Site::getCreationDateFor($idsite);
             $date = Piwik_Date::adjustForTimezone(strtotime($creationDate), $timezone);
             if (is_null($minDate) || $date < $minDate) {
                 $minDate = $date;
diff --git a/plugins/PDFReports/API.php b/plugins/PDFReports/API.php
index f177eaf4e7..b8a3d1b8dd 100644
--- a/plugins/PDFReports/API.php
+++ b/plugins/PDFReports/API.php
@@ -10,6 +10,7 @@
  */
 use Piwik\Piwik;
 use Piwik\Common;
+use Piwik\Site;
 
 /**
  * The PDFReports API lets you manage Scheduled Email reports, as well as generate, download or email any existing report.
@@ -379,7 +380,7 @@ class Piwik_PDFReports_API
 
             $processedReport['segment'] = $segment;
 
-            // TODO add static method getPrettyDate($period, $date) in Piwik_Period
+            // TODO add static method getPrettyDate($period, $date) in Period
             $prettyDate = $processedReport['prettyDate'];
 
             if ($mustRestoreGET) {
@@ -419,7 +420,7 @@ class Piwik_PDFReports_API
         // render report
         $description = str_replace(array("\r", "\n"), ' ', $report['description']);
 
-        list($reportSubject, $reportTitle) = self::getReportSubjectAndReportTitle(Piwik_Site::getNameFor($idSite), $report['reports']);
+        list($reportSubject, $reportTitle) = self::getReportSubjectAndReportTitle(Site::getNameFor($idSite), $report['reports']);
         $filename = "$reportTitle - $prettyDate - $description";
 
         $reportRenderer->renderFrontPage($reportTitle, $prettyDate, $description, $reportMetadata, $segment);
diff --git a/plugins/PDFReports/PDFReports.php b/plugins/PDFReports/PDFReports.php
index 9130c2e291..2dde8fb0bb 100644
--- a/plugins/PDFReports/PDFReports.php
+++ b/plugins/PDFReports/PDFReports.php
@@ -10,6 +10,7 @@
  */
 use Piwik\Piwik;
 use Piwik\Common;
+use Piwik\Site;
 
 /**
  *
@@ -416,7 +417,7 @@ class Piwik_PDFReports extends Piwik_Plugin
                         'H',
                         Piwik_Date::factory(
                             $arbitraryDateInUTC,
-                            Piwik_Site::getTimezoneFor($report['idsite'])
+                            Site::getTimezoneFor($report['idsite'])
                         )->getTimestamp()
                     );
 
diff --git a/plugins/SEO/Controller.php b/plugins/SEO/Controller.php
index c09ce235d1..b33aac8986 100644
--- a/plugins/SEO/Controller.php
+++ b/plugins/SEO/Controller.php
@@ -9,6 +9,7 @@
  * @package Piwik_SEO
  */
 use Piwik\Common;
+use Piwik\Site;
 
 /**
  * @package Piwik_SEO
@@ -18,7 +19,7 @@ class Piwik_SEO_Controller extends Piwik_Controller
     function getRank()
     {
         $idSite = Common::getRequestVar('idSite');
-        $site = new Piwik_Site($idSite);
+        $site = new Site($idSite);
 
         $url = urldecode(Common::getRequestVar('url', '', 'string'));
 
diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php
index 667258c327..c9a12e710c 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\Site;
 
 /**
  * The SitesManager API gives you full control on Websites in Piwik (create, update and delete), and many methods to retrieve websites based on various attributes.
@@ -155,7 +156,7 @@ class Piwik_SitesManager_API
     public function getSiteUrlsFromId($idSite)
     {
         Piwik::checkUserHasViewAccess($idSite);
-        $site = new Piwik_Site($idSite);
+        $site = new Site($idSite);
         $urls = $this->getAliasSiteUrlsFromId($idSite);
         return array_merge(array($site->getMainUrl()), $urls);
     }
@@ -543,7 +544,7 @@ class Piwik_SitesManager_API
 
     private function postUpdateWebsite($idSite)
     {
-        Piwik_Site::clearCache();
+        Site::clearCache();
         Piwik_Tracker_Cache::regenerateCacheWebsiteAttributes($idSite);
     }
 
diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php
index c6e518dbc9..55a4e8383b 100644
--- a/plugins/SitesManager/Controller.php
+++ b/plugins/SitesManager/Controller.php
@@ -10,6 +10,7 @@
  */
 use Piwik\Piwik;
 use Piwik\Common;
+use Piwik\Site;
 
 /**
  *
@@ -26,11 +27,11 @@ class Piwik_SitesManager_Controller extends Piwik_Controller_Admin
 
         if (Piwik::isUserIsSuperUser()) {
             $sites = Piwik_SitesManager_API::getInstance()->getAllSites();
-            Piwik_Site::setSites($sites);
+            Site::setSites($sites);
             $sites = array_values($sites);
         } else {
             $sites = Piwik_SitesManager_API::getInstance()->getSitesWithAdminAccess();
-            Piwik_Site::setSitesFromArray($sites);
+            Site::setSitesFromArray($sites);
         }
 
         foreach ($sites as &$site) {
@@ -123,7 +124,7 @@ class Piwik_SitesManager_Controller extends Piwik_Controller_Admin
         $view = new Piwik_View('@SitesManager/displayJavascriptCode');
         $this->setBasicVariablesView($view);
         $view->idSite = $idSite;
-        $site = new Piwik_Site($idSite);
+        $site = new Site($idSite);
         $view->displaySiteName = $site->getName();
         $view->jsTag = $jsTag;
         echo $view->render();
diff --git a/plugins/Transitions/API.php b/plugins/Transitions/API.php
index 739d07af7d..ccb17fc875 100644
--- a/plugins/Transitions/API.php
+++ b/plugins/Transitions/API.php
@@ -8,8 +8,10 @@
  * @category Piwik_Plugins
  * @package Piwik_Transitions
  */
+use Piwik\Period;
 use Piwik\Piwik;
 use Piwik\Common;
+use Piwik\Site;
 
 /**
  * @package Piwik_Transitions
@@ -65,8 +67,8 @@ class Piwik_Transitions_API
 
         // prepare archive processing that can be used by the archiving code
         $segment = new Piwik_Segment($segment, $idSite);
-        $site = new Piwik_Site($idSite);
-        $period = Piwik_Period::advancedFactory($period, $date);
+        $site = new Site($idSite);
+        $period = Period::advancedFactory($period, $date);
         $archiveProcessor = new Piwik_ArchiveProcessor_Day($period, $site, $segment);
         $logAggregator = $archiveProcessor->getLogAggregator();
         // prepare the report
diff --git a/plugins/UserCountryMap/Controller.php b/plugins/UserCountryMap/Controller.php
index 08989db237..5230677287 100644
--- a/plugins/UserCountryMap/Controller.php
+++ b/plugins/UserCountryMap/Controller.php
@@ -10,6 +10,7 @@
  */
 use Piwik\Piwik;
 use Piwik\Common;
+use Piwik\Site;
 
 /**
  *
@@ -114,7 +115,7 @@ class Piwik_UserCountryMap_Controller extends Piwik_Controller
         $view->liveRefreshAfterMs = (int)Config::getInstance()->General['live_widget_refresh_after_seconds'] * 1000;
 
         $goals = Piwik_Goals_API::getInstance()->getGoals($idSite);
-        $site = new Piwik_Site($idSite);
+        $site = new Site($idSite);
         $view->hasGoals = !empty($goals) || $site->isEcommerceEnabled() ? 'true' : 'false';
 
         // maximum number of visits to be displayed in the map
diff --git a/plugins/UsersManager/API.php b/plugins/UsersManager/API.php
index 17a2c84c47..2337d76d63 100644
--- a/plugins/UsersManager/API.php
+++ b/plugins/UsersManager/API.php
@@ -12,6 +12,7 @@ use Piwik\Config;
 use Piwik\Piwik;
 use Piwik\Common;
 use Piwik\Access;
+use Piwik\Site;
 
 /**
  * The UsersManager API lets you Manage Users and their permissions to access specific websites.
@@ -540,7 +541,7 @@ class Piwik_UsersManager_API
             $idSites = Piwik_SitesManager_API::getInstance()->getSitesIdWithAdminAccess();
         } // in case the idSites is an integer we build an array
         else {
-            $idSites = Piwik_Site::getIdSitesFromIdSitesString($idSites);
+            $idSites = Site::getIdSitesFromIdSitesString($idSites);
         }
 
         if (empty($idSites)) {
diff --git a/plugins/UsersManager/Controller.php b/plugins/UsersManager/Controller.php
index 9c8cae77ca..29f567757c 100644
--- a/plugins/UsersManager/Controller.php
+++ b/plugins/UsersManager/Controller.php
@@ -10,6 +10,7 @@
  */
 use Piwik\Piwik;
 use Piwik\Common;
+use Piwik\Site;
 
 /**
  *
@@ -44,7 +45,7 @@ class Piwik_UsersManager_Controller extends Piwik_Controller_Admin
             $defaultReportSiteName = Piwik_Translate('UsersManager_ApplyToAllWebsites');
         } else {
             $usersAccessByWebsite = Piwik_UsersManager_API::getInstance()->getUsersAccessFromSite($idSiteSelected);
-            $defaultReportSiteName = Piwik_Site::getNameFor($idSiteSelected);
+            $defaultReportSiteName = Site::getNameFor($idSiteSelected);
         }
 
         // we dont want to display the user currently logged so that the user can't change his settings from admin to view...
@@ -142,9 +143,9 @@ class Piwik_UsersManager_Controller extends Piwik_Controller_Admin
         $view->defaultReport = $defaultReport;
 
         if ($defaultReport == 'MultiSites') {
-            $view->defaultReportSiteName = Piwik_Site::getNameFor($this->getDefaultWebsiteId());
+            $view->defaultReportSiteName = Site::getNameFor($this->getDefaultWebsiteId());
         } else {
-            $view->defaultReportSiteName = Piwik_Site::getNameFor($defaultReport);
+            $view->defaultReportSiteName = Site::getNameFor($defaultReport);
         }
 
         $view->defaultDate = $this->getDefaultDateForUser($userLogin);
diff --git a/plugins/VisitTime/API.php b/plugins/VisitTime/API.php
index 78a084aaf0..c8a3dd86e6 100644
--- a/plugins/VisitTime/API.php
+++ b/plugins/VisitTime/API.php
@@ -9,7 +9,9 @@
  * @package Piwik_VisitTime
  */
 use Piwik\Archive;
+use Piwik\Period;
 use Piwik\Piwik;
+use Piwik\Site;
 
 /**
  * VisitTime API lets you access reports by Hour (Server time), and by Hour Local Time of your visitors.
@@ -73,12 +75,12 @@ class Piwik_VisitTime_API
         unset($metrics[Piwik_Metrics::INDEX_MAX_ACTIONS]);
         
         // disabled for multiple dates
-        if (Piwik_Period::isMultiplePeriod($date, $period)) {
+        if (Period::isMultiplePeriod($date, $period)) {
             throw new Exception("VisitTime.getByDayOfWeek does not support multiple dates.");
         }
 
         // get metric data for every day within the supplied period
-        $oPeriod = Piwik_Period::makePeriodFromQueryParams(Piwik_Site::getTimezoneFor($idSite), $period, $date);
+        $oPeriod = Period::makePeriodFromQueryParams(Site::getTimezoneFor($idSite), $period, $date);
         $dateRange = $oPeriod->getDateStart()->toString() . ',' . $oPeriod->getDateEnd()->toString();
         $archive = Archive::build($idSite, 'day', $dateRange, $segment);
 
@@ -121,7 +123,7 @@ class Piwik_VisitTime_API
 
     protected function removeHoursInFuture($table, $idSite, $period, $date)
     {
-        $site = new Piwik_Site($idSite);
+        $site = new Site($idSite);
 
         if ($period == 'day'
             && ($date == 'today'
diff --git a/plugins/VisitTime/VisitTime.php b/plugins/VisitTime/VisitTime.php
index e8030b7e7d..abd69f7809 100644
--- a/plugins/VisitTime/VisitTime.php
+++ b/plugins/VisitTime/VisitTime.php
@@ -9,6 +9,8 @@
  * @package Piwik_VisitTime
  */
 use Piwik\Common;
+use Piwik\Period;
+use Piwik\Site;
 
 /**
  *
@@ -190,7 +192,7 @@ class Piwik_VisitTime extends Piwik_Plugin
         $period = Common::getRequestVar('period');
 
         // create a period instance
-        $oPeriod = Piwik_Period::makePeriodFromQueryParams(Piwik_Site::getTimezoneFor($idSite), $period, $date);
+        $oPeriod = Period::makePeriodFromQueryParams(Site::getTimezoneFor($idSite), $period, $date);
 
         // set the footer message using the period start & end date
         $start = $oPeriod->getDateStart()->toString();
diff --git a/plugins/VisitorGenerator/Controller.php b/plugins/VisitorGenerator/Controller.php
index 606e8784c7..de621bc6ea 100644
--- a/plugins/VisitorGenerator/Controller.php
+++ b/plugins/VisitorGenerator/Controller.php
@@ -10,6 +10,7 @@
  */
 use Piwik\Piwik;
 use Piwik\Common;
+use Piwik\Site;
 
 /**
  *
@@ -87,7 +88,7 @@ class Piwik_VisitorGenerator_Controller extends Piwik_Controller_Admin
         $view->assign('days', $daysToCompute);
         $view->assign('nbActionsTotal', $nbActionsTotal);
         $view->assign('nbRequestsPerSec', round($nbActionsTotal / $timer->getTime(), 0));
-        $view->assign('siteName', Piwik_Site::getNameFor($idSite));
+        $view->assign('siteName', Site::getNameFor($idSite));
         echo $view->render();
     }
 
diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php
index 8a4552f473..493acaab16 100644
--- a/plugins/VisitsSummary/Controller.php
+++ b/plugins/VisitsSummary/Controller.php
@@ -10,6 +10,7 @@
  */
 use Piwik\Piwik;
 use Piwik\Common;
+use Piwik\Site;
 
 /**
  *
@@ -76,7 +77,7 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller
         );
 
         $idSite = Common::getRequestVar('idSite');
-        $displaySiteSearch = Piwik_Site::isSiteSearchEnabledFor($idSite);
+        $displaySiteSearch = Site::isSiteSearchEnabledFor($idSite);
 
         if ($displaySiteSearch) {
             $selectableColumns[] = 'nb_searches';
@@ -122,7 +123,7 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller
 		$view->urlSparklineAvgGenerationTime = $this->getUrlSparkline('getEvolutionGraph', array('columns' => array('avg_time_generation')));
 
         $idSite = Common::getRequestVar('idSite');
-        $displaySiteSearch = Piwik_Site::isSiteSearchEnabledFor($idSite);
+        $displaySiteSearch = Site::isSiteSearchEnabledFor($idSite);
         if ($displaySiteSearch) {
             $view->urlSparklineNbSearches = $this->getUrlSparkline('getEvolutionGraph', array('columns' => array('nb_searches', 'nb_keywords')));
         }