Refactor Piwik_Config to \Piwik\Core\Config

2 steps required:

1. Refactor > Move > \Piwik\Core\Config (uncheck "Create new File")
2. Refactor > Rename > Piwik_Config to Config

31 files changed, 122 insertions, 86 deletions

diff --git a/plugins/API/API.php b/plugins/API/API.php
index cbaa9b0ec0..c8b784fd39 100644
--- a/plugins/API/API.php
+++ b/plugins/API/API.php
@@ -8,6 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_API
  */
+use Piwik\Core\Config;
 
 /**
  * @package Piwik_API
@@ -102,7 +103,7 @@ class Piwik_API_API
      */
     public function getSettings()
     {
-        return Piwik_Config::getInstance()->APISettings;
+        return Config::getInstance()->APISettings;
     }
 
     /**
@@ -301,7 +302,7 @@ class Piwik_API_API
     public function getLogoUrl($pathOnly = false)
     {
         $logo = 'plugins/Zeitgeist/images/logo.png';
-        if (Piwik_Config::getInstance()->branding['use_custom_logo'] == 1
+        if (Config::getInstance()->branding['use_custom_logo'] == 1
             && file_exists(Piwik_Common::getPathToPiwikRoot() . '/misc/user/logo.png')
         ) {
             $logo = 'misc/user/logo.png';
@@ -321,7 +322,7 @@ class Piwik_API_API
     public function getHeaderLogoUrl($pathOnly = false)
     {
         $logo = 'plugins/Zeitgeist/images/logo-header.png';
-        if (Piwik_Config::getInstance()->branding['use_custom_logo'] == 1
+        if (Config::getInstance()->branding['use_custom_logo'] == 1
             && file_exists(Piwik_Common::getPathToPiwikRoot() . '/misc/user/logo-header.png')
         ) {
             $logo = 'misc/user/logo-header.png';
@@ -342,7 +343,7 @@ class Piwik_API_API
     public function getSVGLogoUrl($pathOnly = false)
     {
         $logo = 'plugins/Zeitgeist/images/logo.svg';
-        if (Piwik_Config::getInstance()->branding['use_custom_logo'] == 1
+        if (Config::getInstance()->branding['use_custom_logo'] == 1
             && file_exists(Piwik_Common::getPathToPiwikRoot() . '/misc/user/logo.svg')
         ) {
             $logo = 'misc/user/logo.svg';
@@ -360,10 +361,10 @@ class Piwik_API_API
      */
     public function hasSVGLogo()
     {
-        if (Piwik_Config::getInstance()->branding['use_custom_logo'] == 0) {
+        if (Config::getInstance()->branding['use_custom_logo'] == 0) {
             /* We always have our application logo */
             return true;
-        } else if (Piwik_Config::getInstance()->branding['use_custom_logo'] == 1
+        } else if (Config::getInstance()->branding['use_custom_logo'] == 1
             && file_exists(Piwik_Common::getPathToPiwikRoot() . '/misc/user/logo.svg')
         ) {
             return true;
diff --git a/plugins/API/Controller.php b/plugins/API/Controller.php
index 0ed49180a6..a586b43b1a 100644
--- a/plugins/API/Controller.php
+++ b/plugins/API/Controller.php
@@ -8,6 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_API
  */
+use Piwik\Core\Config;
 
 /**
  *
@@ -19,7 +20,7 @@ class Piwik_API_Controller extends Piwik_Controller
     {
         // when calling the API through http, we limit the number of returned results
         if (!isset($_GET['filter_limit'])) {
-            $_GET['filter_limit'] = Piwik_Config::getInstance()->General['API_datatable_default_limit'];
+            $_GET['filter_limit'] = Config::getInstance()->General['API_datatable_default_limit'];
         }
         $request = new Piwik_API_Request('token_auth=' . Piwik_Common::getRequestVar('token_auth', 'anonymous', 'string'));
         echo $request->process();
diff --git a/plugins/Actions/Archiver.php b/plugins/Actions/Archiver.php
index 61f9cc3a86..0fa1f4f0e2 100644
--- a/plugins/Actions/Archiver.php
+++ b/plugins/Actions/Archiver.php
@@ -8,6 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_Actions
  */
+use Piwik\Core\Config;
 
 /**
  * Class encapsulating logic to process Day/Period Archiving for the Actions reports
@@ -130,7 +131,7 @@ class Piwik_Actions_Archiver extends Piwik_PluginsArchiver
      */
     private static function getRankingQueryLimit()
     {
-        $configGeneral = Piwik_Config::getInstance()->General;
+        $configGeneral = Config::getInstance()->General;
         $configLimit = $configGeneral['archiving_ranking_query_row_limit'];
         return $configLimit == 0 ? 0 : max(
             $configLimit,
diff --git a/plugins/Actions/ArchivingHelper.php b/plugins/Actions/ArchivingHelper.php
index 0f7744522c..37e9e99122 100644
--- a/plugins/Actions/ArchivingHelper.php
+++ b/plugins/Actions/ArchivingHelper.php
@@ -8,6 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_Actions
  */
+use Piwik\Core\Config;
 
 /**
  * This static class provides:
@@ -205,18 +206,18 @@ class Piwik_Actions_ArchivingHelper
     static public function reloadConfig()
     {
         // for BC, we read the old style delimiter first (see #1067)Row
-        $actionDelimiter = @Piwik_Config::getInstance()->General['action_category_delimiter'];
+        $actionDelimiter = @Config::getInstance()->General['action_category_delimiter'];
         if (empty($actionDelimiter)) {
-            self::$actionUrlCategoryDelimiter = Piwik_Config::getInstance()->General['action_url_category_delimiter'];
-            self::$actionTitleCategoryDelimiter = Piwik_Config::getInstance()->General['action_title_category_delimiter'];
+            self::$actionUrlCategoryDelimiter = Config::getInstance()->General['action_url_category_delimiter'];
+            self::$actionTitleCategoryDelimiter = Config::getInstance()->General['action_title_category_delimiter'];
         } else {
             self::$actionUrlCategoryDelimiter = self::$actionTitleCategoryDelimiter = $actionDelimiter;
         }
 
-        self::$defaultActionName = Piwik_Config::getInstance()->General['action_default_name'];
+        self::$defaultActionName = Config::getInstance()->General['action_default_name'];
         self::$columnToSortByBeforeTruncation = Piwik_Metrics::INDEX_NB_VISITS;
-        self::$maximumRowsInDataTableLevelZero = Piwik_Config::getInstance()->General['datatable_archiving_maximum_rows_actions'];
-        self::$maximumRowsInSubDataTable = Piwik_Config::getInstance()->General['datatable_archiving_maximum_rows_subtable_actions'];
+        self::$maximumRowsInDataTableLevelZero = Config::getInstance()->General['datatable_archiving_maximum_rows_actions'];
+        self::$maximumRowsInSubDataTable = Config::getInstance()->General['datatable_archiving_maximum_rows_subtable_actions'];
 
         Piwik_DataTable::setMaximumDepthLevelAllowedAtLeast(self::getSubCategoryLevelLimit() + 1);
     }
@@ -412,7 +413,7 @@ class Piwik_Actions_ArchivingHelper
      */
     public static function getSubCategoryLevelLimit()
     {
-        return Piwik_Config::getInstance()->General['action_category_level_limit'];
+        return Config::getInstance()->General['action_category_level_limit'];
     }
 
     /**
diff --git a/plugins/AnonymizeIP/AnonymizeIP.php b/plugins/AnonymizeIP/AnonymizeIP.php
index 382faa329a..4e14459fd7 100644
--- a/plugins/AnonymizeIP/AnonymizeIP.php
+++ b/plugins/AnonymizeIP/AnonymizeIP.php
@@ -8,6 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_AnonymizeIP
  */
+use Piwik\Core\Config;
 
 /**
  * Anonymize visitor IP addresses to comply with the privacy laws/guidelines in countries, such as Germany.
@@ -65,6 +66,6 @@ class Piwik_AnonymizeIP extends Piwik_Plugin
      */
     public function setVisitorIpAddress(&$ip)
     {
-        $ip = self::applyIPMask($ip, Piwik_Config::getInstance()->Tracker['ip_address_mask_length']);
+        $ip = self::applyIPMask($ip, Config::getInstance()->Tracker['ip_address_mask_length']);
     }
 }
diff --git a/plugins/CoreAdminHome/API.php b/plugins/CoreAdminHome/API.php
index a2e272ffb3..917b2f4e14 100644
--- a/plugins/CoreAdminHome/API.php
+++ b/plugins/CoreAdminHome/API.php
@@ -8,6 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_CoreAdminHome
  */
+use Piwik\Core\Config;
 
 /**
  * @package Piwik_CoreAdminHome
@@ -95,8 +96,8 @@ class Piwik_CoreAdminHome_API
 
 
         // If using the feature "Delete logs older than N days"...
-        $logsAreDeletedBeforeThisDate = Piwik_Config::getInstance()->Deletelogs['delete_logs_schedule_lowest_interval'];
-        $logsDeleteEnabled = Piwik_Config::getInstance()->Deletelogs['delete_logs_enable'];
+        $logsAreDeletedBeforeThisDate = Config::getInstance()->Deletelogs['delete_logs_schedule_lowest_interval'];
+        $logsDeleteEnabled = Config::getInstance()->Deletelogs['delete_logs_enable'];
         $minimumDateWithLogs = false;
         if ($logsDeleteEnabled
             && $logsAreDeletedBeforeThisDate
diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php
index 2a971d6cf9..11035cb3ad 100644
--- a/plugins/CoreAdminHome/Controller.php
+++ b/plugins/CoreAdminHome/Controller.php
@@ -8,6 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_CoreAdminHome
  */
+use Piwik\Core\Config;
 
 /**
  *
@@ -43,7 +44,7 @@ class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin
 
             $this->displayWarningIfConfigFileNotWritable($view);
 
-            $config = Piwik_Config::getInstance();
+            $config = Config::getInstance();
 
             $debug = $config->Debug;
             $view->enableBetaReleaseCheck = $debug['allow_upgrades_to_beta'];
@@ -92,7 +93,7 @@ class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin
             $mail['password'] = Piwik_Common::unsanitizeInputValue(Piwik_Common::getRequestVar('mailPassword', ''));
             $mail['encryption'] = Piwik_Common::getRequestVar('mailEncryption', '');
 
-            $config = Piwik_Config::getInstance();
+            $config = Config::getInstance();
             $config->mail = $mail;
 
             // update branding settings
diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php
index d9e6f0fca9..a0b741c7ac 100644
--- a/plugins/CorePluginsAdmin/Controller.php
+++ b/plugins/CorePluginsAdmin/Controller.php
@@ -8,6 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_CorePluginsAdmin
  */
+use Piwik\Core\Config;
 
 /**
  *
@@ -50,7 +51,7 @@ class Piwik_CorePluginsAdmin_Controller extends Piwik_Controller_Admin
 
         $listPlugins = array_merge(
             Piwik_PluginsManager::getInstance()->readPluginsDirectory(),
-            Piwik_Config::getInstance()->Plugins['Plugins']
+            Config::getInstance()->Plugins['Plugins']
         );
         $listPlugins = array_unique($listPlugins);
         foreach ($listPlugins as $pluginName) {
diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php
index f60e2041a8..59d9c846fb 100644
--- a/plugins/CoreUpdater/Controller.php
+++ b/plugins/CoreUpdater/Controller.php
@@ -8,6 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_CoreUpdater
  */
+use Piwik\Core\Config;
 
 /**
  *
@@ -25,10 +26,10 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller
 
     static protected function getLatestZipUrl($newVersion)
     {
-        if (@Piwik_Config::getInstance()->Debug['allow_upgrades_to_beta']) {
+        if (@Config::getInstance()->Debug['allow_upgrades_to_beta']) {
             return 'http://builds.piwik.org/piwik-' . $newVersion . '.zip';
         }
-        return Piwik_Config::getInstance()->General['latest_version_url'];
+        return Config::getInstance()->General['latest_version_url'];
     }
 
     public function newVersionAvailable()
@@ -277,7 +278,7 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller
 
         // handle case of existing database with no tables
         if (!Piwik::isInstalled()) {
-            $this->errorMessages[] = Piwik_Translate('CoreUpdater_EmptyDatabaseError', Piwik_Config::getInstance()->database['dbname']);
+            $this->errorMessages[] = Piwik_Translate('CoreUpdater_EmptyDatabaseError', Config::getInstance()->database['dbname']);
             $this->coreError = true;
             $currentVersion = 'N/A';
         } else {
diff --git a/plugins/CustomVariables/Archiver.php b/plugins/CustomVariables/Archiver.php
index 8b2e0a516f..8d8d018d67 100644
--- a/plugins/CustomVariables/Archiver.php
+++ b/plugins/CustomVariables/Archiver.php
@@ -1,4 +1,6 @@
 <?php
+use Piwik\Core\Config;
+
 /**
  * Piwik - Open source web analytics
  *
@@ -25,8 +27,8 @@ class Piwik_CustomVariables_Archiver extends Piwik_PluginsArchiver
     function __construct($processor)
     {
         parent::__construct($processor);
-        $this->maximumRowsInDataTableLevelZero = Piwik_Config::getInstance()->General['datatable_archiving_maximum_rows_custom_variables'];
-        $this->maximumRowsInSubDataTable = Piwik_Config::getInstance()->General['datatable_archiving_maximum_rows_subtable_custom_variables'];
+        $this->maximumRowsInDataTableLevelZero = Config::getInstance()->General['datatable_archiving_maximum_rows_custom_variables'];
+        $this->maximumRowsInSubDataTable = Config::getInstance()->General['datatable_archiving_maximum_rows_subtable_custom_variables'];
     }
 
     public function archiveDay()
diff --git a/plugins/DBStats/MySQLMetadataProvider.php b/plugins/DBStats/MySQLMetadataProvider.php
index f9405b02de..e114bf3eeb 100755
--- a/plugins/DBStats/MySQLMetadataProvider.php
+++ b/plugins/DBStats/MySQLMetadataProvider.php
@@ -8,6 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_DBStats
  */
+use Piwik\Core\Config;
 
 /**
  * Utility class that provides general information about databases, including the size of
@@ -41,7 +42,7 @@ class Piwik_DBStats_MySQLMetadataProvider
     public function getDBStatus()
     {
         if (function_exists('mysql_connect')) {
-            $configDb = Piwik_Config::getInstance()->database;
+            $configDb = Config::getInstance()->database;
             $link = mysql_connect($configDb['host'], $configDb['username'], $configDb['password']);
             $status = mysql_stat($link);
             mysql_close($link);
diff --git a/plugins/DevicesDetection/DevicesDetection.php b/plugins/DevicesDetection/DevicesDetection.php
index e86c5d9a98..85324d7cbd 100644
--- a/plugins/DevicesDetection/DevicesDetection.php
+++ b/plugins/DevicesDetection/DevicesDetection.php
@@ -9,6 +9,8 @@
  * @category Piwik_Plugins
  * @package Piwik_DevicesDetection
  */
+use Piwik\Core\Config;
+
 require_once PIWIK_INCLUDE_PATH . "/plugins/DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.php";
 require_once PIWIK_INCLUDE_PATH . '/plugins/DevicesDetection/functions.php';
 
@@ -191,7 +193,7 @@ class Piwik_DevicesDetection extends Piwik_Plugin
                 ADD `config_device_model` VARCHAR( 100 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `config_device_brand`";
             Piwik_Exec($q1);
             // conditionaly add this column
-            if (@Piwik_Config::getInstance()->Debug['store_user_agent_in_visit']) {
+            if (@Config::getInstance()->Debug['store_user_agent_in_visit']) {
                 $q2 = "ALTER TABLE `" . Piwik_Common::prefixTable("log_visit") . "` 
                 ADD `config_debug_ua` VARCHAR( 512 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `config_device_model`";
                 Piwik_Exec($q2);
@@ -217,7 +219,7 @@ class Piwik_DevicesDetection extends Piwik_Plugin
         $deviceInfo['config_device_model'] = $UAParser->getModel();
         $deviceInfo['config_device_brand'] = $UAParser->getBrand();
 
-        if (@Piwik_Config::getInstance()->Debug['store_user_agent_in_visit']) {
+        if (@Config::getInstance()->Debug['store_user_agent_in_visit']) {
             $deviceInfo['config_debug_ua'] = $userAgent;
         }
 
diff --git a/plugins/Feedback/Controller.php b/plugins/Feedback/Controller.php
index 7a30d38302..e2b457a22d 100644
--- a/plugins/Feedback/Controller.php
+++ b/plugins/Feedback/Controller.php
@@ -8,6 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_Feedback
  */
+use Piwik\Core\Config;
 
 /**
  *
@@ -34,7 +35,7 @@ class Piwik_Feedback_Controller extends Piwik_Controller
         $nonce = Piwik_Common::getRequestVar('nonce', '', 'string');
 
         $view = new Piwik_View('@Feedback/sendFeedback');
-        $view->feedbackEmailAddress = Piwik_Config::getInstance()->General['feedback_email_address'];
+        $view->feedbackEmailAddress = Config::getInstance()->General['feedback_email_address'];
         try {
             $minimumBodyLength = 40;
             if (strlen($body) < $minimumBodyLength
diff --git a/plugins/ImageGraph/ImageGraph.php b/plugins/ImageGraph/ImageGraph.php
index 4dd048827d..0604942cde 100644
--- a/plugins/ImageGraph/ImageGraph.php
+++ b/plugins/ImageGraph/ImageGraph.php
@@ -1,4 +1,6 @@
 <?php
+use Piwik\Core\Config;
+
 /**
  * Piwik - Open source web analytics
  *
@@ -80,7 +82,7 @@ class Piwik_ImageGraph extends Piwik_Plugin
 
             $piwikSite = new Piwik_Site($idSite);
             if ($periodForSinglePeriodGraph == 'range') {
-                $periodForMultiplePeriodGraph = Piwik_Config::getInstance()->General['graphs_default_period_to_plot_when_period_range'];
+                $periodForMultiplePeriodGraph = Config::getInstance()->General['graphs_default_period_to_plot_when_period_range'];
                 $dateForMultiplePeriodGraph = $dateForSinglePeriodGraph;
             } else {
                 $periodForMultiplePeriodGraph = $periodForSinglePeriodGraph;
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index 33760871fb..e0ada880c7 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -8,6 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_Installation
  */
+use Piwik\Core\Config;
 
 /**
  * Installation controller
@@ -76,7 +77,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin
             $this->getInstallationSteps(),
             __FUNCTION__
         );
-        $view->newInstall = !file_exists(Piwik_Config::getLocalConfigPath());
+        $view->newInstall = !file_exists(Config::getLocalConfigPath());
         $view->errorMessage = $message;
         $this->skipThisStep(__FUNCTION__);
         $view->showNextStep = $view->newInstall;
@@ -316,7 +317,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin
 
             $this->session->superuser_infos = $superUserInfos;
 
-            $url = Piwik_Config::getInstance()->General['api_service_url'];
+            $url = Config::getInstance()->General['api_service_url'];
             $url .= '/1.0/subscribeNewsletter/';
             $params = array(
                 'email'     => $form->getSubmitValue('email'),
@@ -449,7 +450,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin
         );
         $this->skipThisStep(__FUNCTION__);
 
-        if (!file_exists(Piwik_Config::getLocalConfigPath())) {
+        if (!file_exists(Config::getLocalConfigPath())) {
 //			$this->addTrustedHosts();
             $this->writeConfigFileFromSession();
         }
@@ -505,7 +506,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin
     protected function createDbFromSessionInformation()
     {
         $dbInfos = $this->session->db_infos;
-        Piwik_Config::getInstance()->database = $dbInfos;
+        Config::getInstance()->database = $dbInfos;
         Piwik::createDatabaseObject($dbInfos);
     }
 
@@ -520,7 +521,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin
             return;
         }
 
-        $config = Piwik_Config::getInstance();
+        $config = Config::getInstance();
         try {
             // expect exception since config.ini.php doesn't exist yet
             $config->init();
@@ -567,7 +568,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin
         } else if ($currentStep == 'finished' && $this->session->currentStepDone == 'finished') {
             // ok to refresh this page or use language selector
         } else {
-            if (file_exists(Piwik_Config::getLocalConfigPath())) {
+            if (file_exists(Config::getLocalConfigPath())) {
                 $error = true;
             }
 
@@ -669,7 +670,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin
     public static function getSystemInformation()
     {
         global $piwik_minimumPHPVersion;
-        $minimumMemoryLimit = Piwik_Config::getInstance()->General['minimum_memory_limit'];
+        $minimumMemoryLimit = Config::getInstance()->General['minimum_memory_limit'];
 
         $infos = array();
 
diff --git a/plugins/LanguagesManager/LanguagesManager.php b/plugins/LanguagesManager/LanguagesManager.php
index 2afe21d209..6ff458d4a7 100644
--- a/plugins/LanguagesManager/LanguagesManager.php
+++ b/plugins/LanguagesManager/LanguagesManager.php
@@ -9,6 +9,7 @@
  * @package Piwik_LanguagesManager
  *
  */
+use Piwik\Core\Config;
 
 /**
  *
@@ -172,7 +173,7 @@ class Piwik_LanguagesManager extends Piwik_Plugin
      */
     static public function getLanguageForSession()
     {
-        $cookieName = Piwik_Config::getInstance()->General['language_cookie_name'];
+        $cookieName = Config::getInstance()->General['language_cookie_name'];
         $cookie = new Piwik_Cookie($cookieName);
         if ($cookie->isCookieFound()) {
             return $cookie->get('language');
@@ -192,7 +193,7 @@ class Piwik_LanguagesManager extends Piwik_Plugin
             return false;
         }
 
-        $cookieName = Piwik_Config::getInstance()->General['language_cookie_name'];
+        $cookieName = Config::getInstance()->General['language_cookie_name'];
         $cookie = new Piwik_Cookie($cookieName, 0);
         $cookie->set('language', $languageCode);
         $cookie->save();
diff --git a/plugins/Live/API.php b/plugins/Live/API.php
index 074f1f7a05..23cbea6ce9 100644
--- a/plugins/Live/API.php
+++ b/plugins/Live/API.php
@@ -8,6 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_Live
  */
+use Piwik\Core\Config;
 
 /**
  * @see plugins/Referers/functions.php
@@ -159,7 +160,7 @@ class Piwik_Live_API
      */
     private function getCleanedVisitorsFromDetails($visitorDetails, $idSite, $flat = false, $doNotFetchActions = false)
     {
-        $actionsLimit = (int)Piwik_Config::getInstance()->General['visitor_log_maximum_actions_per_visit'];
+        $actionsLimit = (int)Config::getInstance()->General['visitor_log_maximum_actions_per_visit'];
 
         $table = new Piwik_DataTable();
 
diff --git a/plugins/Live/Controller.php b/plugins/Live/Controller.php
index 53e7083d61..7ecf378809 100644
--- a/plugins/Live/Controller.php
+++ b/plugins/Live/Controller.php
@@ -8,6 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_Live
  */
+use Piwik\Core\Config;
 
 /**
  * @package Piwik_Live
@@ -26,7 +27,7 @@ class Piwik_Live_Controller extends Piwik_Controller
         $view = new Piwik_View('@Live/index');
         $view->idSite = $this->idSite;
         $view = $this->setCounters($view);
-        $view->liveRefreshAfterMs = (int)Piwik_Config::getInstance()->General['live_widget_refresh_after_seconds'] * 1000;
+        $view->liveRefreshAfterMs = (int)Config::getInstance()->General['live_widget_refresh_after_seconds'] * 1000;
         $view->visitors = $this->getLastVisitsStart($fetchPlease = true);
         $view->liveTokenAuth = Piwik::getCurrentUserTokenAuth();
         return $this->render($view, $fetch);
@@ -34,7 +35,7 @@ class Piwik_Live_Controller extends Piwik_Controller
 
     public function getSimpleLastVisitCount($fetch = false)
     {
-        $lastMinutes = Piwik_Config::getInstance()->General[self::SIMPLE_VISIT_COUNT_WIDGET_LAST_MINUTES_CONFIG_KEY];
+        $lastMinutes = Config::getInstance()->General[self::SIMPLE_VISIT_COUNT_WIDGET_LAST_MINUTES_CONFIG_KEY];
 
         $lastNData = Piwik_API_Request::processRequest('Live.getCounters', array('lastMinutes' => $lastMinutes));
 
@@ -43,7 +44,7 @@ class Piwik_Live_Controller extends Piwik_Controller
         $view->visitors = Piwik::getPrettyNumber($lastNData[0]['visitors']);
         $view->visits = Piwik::getPrettyNumber($lastNData[0]['visits']);
         $view->actions = Piwik::getPrettyNumber($lastNData[0]['actions']);
-        $view->refreshAfterXSecs = Piwik_Config::getInstance()->General['live_widget_refresh_after_seconds'];
+        $view->refreshAfterXSecs = Config::getInstance()->General['live_widget_refresh_after_seconds'];
         $view->translations = array(
             'one_visitor' => Piwik_Translate('Live_NbVisitor'),
             'visitors'    => Piwik_Translate('Live_NbVisitors'),
diff --git a/plugins/Login/Auth.php b/plugins/Login/Auth.php
index a7a8a2e490..4bcfe24d06 100644
--- a/plugins/Login/Auth.php
+++ b/plugins/Login/Auth.php
@@ -8,6 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_Login
  */
+use Piwik\Core\Config;
 
 /**
  *
@@ -35,8 +36,8 @@ class Piwik_Login_Auth implements Piwik_Auth
      */
     public function authenticate()
     {
-        $rootLogin = Piwik_Config::getInstance()->superuser['login'];
-        $rootPassword = Piwik_Config::getInstance()->superuser['password'];
+        $rootLogin = Config::getInstance()->superuser['login'];
+        $rootPassword = Config::getInstance()->superuser['password'];
         $rootToken = Piwik_UsersManager_API::getInstance()->getTokenAuth($rootLogin, $rootPassword);
 
         if (is_null($this->login)) {
diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php
index dede4bee21..d5d988d648 100644
--- a/plugins/Login/Controller.php
+++ b/plugins/Login/Controller.php
@@ -8,6 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_Login
  */
+use Piwik\Core\Config;
 
 /**
  * Login controller
@@ -95,7 +96,7 @@ class Piwik_Login_Controller extends Piwik_Controller
 
         $view->linkTitle = Piwik::getRandomTitle();
 
-        $view->forceSslLogin = Piwik_Config::getInstance()->General['force_ssl_login'];
+        $view->forceSslLogin = Config::getInstance()->General['force_ssl_login'];
 
         // crsf token: don't trust the submitted value; generate/fetch it from session data
         $view->nonce = Piwik_Nonce::getNonce('Piwik_Login.login');
@@ -117,7 +118,7 @@ class Piwik_Login_Controller extends Piwik_Controller
         }
 
         $login = Piwik_Common::getRequestVar('login', null, 'string');
-        if ($login == Piwik_Config::getInstance()->superuser['login']) {
+        if ($login == Config::getInstance()->superuser['login']) {
             throw new Exception(Piwik_TranslateException('Login_ExceptionInvalidSuperUserAuthenticationMethod', array("logme")));
         }
 
@@ -273,8 +274,8 @@ class Piwik_Login_Controller extends Piwik_Controller
         ) . "\n";
         $mail->setBodyText($bodyText);
 
-        $fromEmailName = Piwik_Config::getInstance()->General['login_password_recovery_email_name'];
-        $fromEmailAddress = Piwik_Config::getInstance()->General['login_password_recovery_email_address'];
+        $fromEmailName = Config::getInstance()->General['login_password_recovery_email_name'];
+        $fromEmailAddress = Config::getInstance()->General['login_password_recovery_email_address'];
         $mail->setFrom($fromEmailAddress, $fromEmailName);
         @$mail->send();
     }
@@ -334,13 +335,13 @@ class Piwik_Login_Controller extends Piwik_Controller
         }
 
         if ($user['email'] == Piwik::getSuperUserEmail()) {
-            if (!Piwik_Config::getInstance()->isFileWritable()) {
+            if (!Config::getInstance()->isFileWritable()) {
                 throw new Exception(Piwik_Translate('General_ConfigFileIsNotWritable', array("(config/config.ini.php)", "<br/>")));
             }
 
             $user['password'] = $passwordHash;
-            Piwik_Config::getInstance()->superuser = $user;
-            Piwik_Config::getInstance()->forceSave();
+            Config::getInstance()->superuser = $user;
+            Config::getInstance()->forceSave();
         } else {
             Piwik_UsersManager_API::getInstance()->updateUser(
                 $user['login'], $passwordHash, $email = false, $alias = false, $isPasswordHashed = true);
@@ -369,12 +370,12 @@ class Piwik_Login_Controller extends Piwik_Controller
 
         $user = null;
         if ($loginMail == Piwik::getSuperUserEmail()
-            || $loginMail == Piwik_Config::getInstance()->superuser['login']
+            || $loginMail == Config::getInstance()->superuser['login']
         ) {
             $user = array(
-                'login'    => Piwik_Config::getInstance()->superuser['login'],
+                'login'    => Config::getInstance()->superuser['login'],
                 'email'    => Piwik::getSuperUserEmail(),
-                'password' => Piwik_Config::getInstance()->superuser['password'],
+                'password' => Config::getInstance()->superuser['password'],
             );
         } else if (Piwik_UsersManager_API::getInstance()->userExists($loginMail)) {
             $user = Piwik_UsersManager_API::getInstance()->getUser($loginMail);
@@ -441,7 +442,7 @@ class Piwik_Login_Controller extends Piwik_Controller
      */
     static public function clearSession()
     {
-        $authCookieName = Piwik_Config::getInstance()->General['login_cookie_name'];
+        $authCookieName = Config::getInstance()->General['login_cookie_name'];
         $cookie = new Piwik_Cookie($authCookieName);
         $cookie->delete();
 
@@ -458,7 +459,7 @@ class Piwik_Login_Controller extends Piwik_Controller
     {
         self::clearSession();
 
-        $logoutUrl = @Piwik_Config::getInstance()->General['login_logout_url'];
+        $logoutUrl = @Config::getInstance()->General['login_logout_url'];
         if (empty($logoutUrl)) {
             Piwik::redirectToModule('CoreHome');
         } else {
@@ -474,7 +475,7 @@ class Piwik_Login_Controller extends Piwik_Controller
      */
     protected function checkForceSslLogin()
     {
-        $forceSslLogin = Piwik_Config::getInstance()->General['force_ssl_login'];
+        $forceSslLogin = Config::getInstance()->General['force_ssl_login'];
         if ($forceSslLogin
             && !Piwik::isHttps()
         ) {
diff --git a/plugins/Login/Login.php b/plugins/Login/Login.php
index 62336764f1..accc865eeb 100644
--- a/plugins/Login/Login.php
+++ b/plugins/Login/Login.php
@@ -8,6 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_Login
  */
+use Piwik\Core\Config;
 
 /**
  *
@@ -68,9 +69,9 @@ class Piwik_Login extends Piwik_Plugin
             return;
         }
 
-        $authCookieName = Piwik_Config::getInstance()->General['login_cookie_name'];
+        $authCookieName = Config::getInstance()->General['login_cookie_name'];
         $authCookieExpiry = 0;
-        $authCookiePath = Piwik_Config::getInstance()->General['login_cookie_path'];
+        $authCookiePath = Config::getInstance()->General['login_cookie_path'];
         $authCookie = new Piwik_Cookie($authCookieName, $authCookieExpiry, $authCookiePath);
         $defaultLogin = 'anonymous';
         $defaultTokenAuth = 'anonymous';
@@ -101,9 +102,9 @@ class Piwik_Login extends Piwik_Plugin
         $auth->setTokenAuth($tokenAuth);
         $authResult = $auth->authenticate();
 
-        $authCookieName = Piwik_Config::getInstance()->General['login_cookie_name'];
-        $authCookieExpiry = $rememberMe ? time() + Piwik_Config::getInstance()->General['login_cookie_expire'] : 0;
-        $authCookiePath = Piwik_Config::getInstance()->General['login_cookie_path'];
+        $authCookieName = Config::getInstance()->General['login_cookie_name'];
+        $authCookieExpiry = $rememberMe ? time() + Config::getInstance()->General['login_cookie_expire'] : 0;
+        $authCookiePath = Config::getInstance()->General['login_cookie_path'];
         $cookie = new Piwik_Cookie($authCookieName, $authCookieExpiry, $authCookiePath);
         if (!$authResult->isValid()) {
             $cookie->delete();
diff --git a/plugins/MultiSites/Controller.php b/plugins/MultiSites/Controller.php
index 46bf83848f..ec31a095f9 100644
--- a/plugins/MultiSites/Controller.php
+++ b/plugins/MultiSites/Controller.php
@@ -8,6 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_MultiSites
  */
+use Piwik\Core\Config;
 
 /**
  *
@@ -27,7 +28,7 @@ class Piwik_MultiSites_Controller extends Piwik_Controller
     {
         parent::__construct();
 
-        $this->limit = Piwik_Config::getInstance()->General['all_websites_website_per_page'];
+        $this->limit = Config::getInstance()->General['all_websites_website_per_page'];
     }
 
     function index()
@@ -152,12 +153,12 @@ class Piwik_MultiSites_Controller extends Piwik_Controller
                                   Piwik_Date::factory('now', 'UTC+14')->toString('Y-m-d')))
         ) {
 
-            $view->autoRefreshTodayReport = Piwik_Config::getInstance()->General['multisites_refresh_after_seconds'];
+            $view->autoRefreshTodayReport = Config::getInstance()->General['multisites_refresh_after_seconds'];
         }
         $this->setGeneralVariablesView($view);
         $this->setMinDateView($minDate, $view);
         $this->setMaxDateView($maxDate, $view);
-        $view->show_sparklines = Piwik_Config::getInstance()->General['show_multisites_sparklines'];
+        $view->show_sparklines = Config::getInstance()->General['show_multisites_sparklines'];
 
         echo $view->render();
     }
diff --git a/plugins/Overlay/API.php b/plugins/Overlay/API.php
index 70f55adf6c..9ba98a900d 100644
--- a/plugins/Overlay/API.php
+++ b/plugins/Overlay/API.php
@@ -1,4 +1,6 @@
 <?php
+use Piwik\Core\Config;
+
 /**
  * Piwik - Open source web analytics
  *
@@ -80,7 +82,7 @@ class Piwik_Overlay_API
         $resultDataTable = new Piwik_DataTable;
 
         try {
-            $limitBeforeGrouping = Piwik_Config::getInstance()->General['overlay_following_pages_limit'];
+            $limitBeforeGrouping = Config::getInstance()->General['overlay_following_pages_limit'];
             $transitionsReport = Piwik_Transitions_API::getInstance()->getTransitionsForAction(
                 $url, $type = 'url', $idSite, $period, $date, $segment, $limitBeforeGrouping,
                 $part = 'followingActions', $returnNormalizedUrls = true);
diff --git a/plugins/PDFReports/PDFReports.php b/plugins/PDFReports/PDFReports.php
index eb07f07f0b..8b68d8c377 100644
--- a/plugins/PDFReports/PDFReports.php
+++ b/plugins/PDFReports/PDFReports.php
@@ -8,6 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_PDFReports
  */
+use Piwik\Core\Config;
 
 /**
  *
@@ -258,10 +259,10 @@ class Piwik_PDFReports extends Piwik_Plugin
 
             $mail = new Piwik_Mail();
             $mail->setSubject($subject);
-            $fromEmailName = Piwik_Config::getInstance()->branding['use_custom_logo']
+            $fromEmailName = Config::getInstance()->branding['use_custom_logo']
                 ? Piwik_Translate('CoreHome_WebAnalyticsReports')
                 : Piwik_Translate('PDFReports_PiwikReports');
-            $fromEmailAddress = Piwik_Config::getInstance()->General['noreply_email_address'];
+            $fromEmailAddress = Config::getInstance()->General['noreply_email_address'];
             $attachmentName = $subject;
             $mail->setFrom($fromEmailAddress, $fromEmailName);
 
diff --git a/plugins/PrivacyManager/Controller.php b/plugins/PrivacyManager/Controller.php
index 583fcd4afa..e9b62e1482 100644
--- a/plugins/PrivacyManager/Controller.php
+++ b/plugins/PrivacyManager/Controller.php
@@ -8,6 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_PrivacyManager
  */
+use Piwik\Core\Config;
 
 /**
  *
@@ -27,10 +28,10 @@ class Piwik_PrivacyManager_Controller extends Piwik_Controller_Admin
             switch (Piwik_Common::getRequestVar('form')) {
                 case("formMaskLength"):
                     $this->handlePluginState(Piwik_Common::getRequestVar("anonymizeIPEnable", 0));
-                    $trackerConfig = Piwik_Config::getInstance()->Tracker;
+                    $trackerConfig = Config::getInstance()->Tracker;
                     $trackerConfig['ip_address_mask_length'] = Piwik_Common::getRequestVar("maskLength", 1);
-                    Piwik_Config::getInstance()->Tracker = $trackerConfig;
-                    Piwik_Config::getInstance()->forceSave();
+                    Config::getInstance()->Tracker = $trackerConfig;
+                    Config::getInstance()->forceSave();
                     break;
 
                 case("formDeleteSettings"):
@@ -115,7 +116,7 @@ class Piwik_PrivacyManager_Controller extends Piwik_Controller_Admin
             $view->anonymizeIP = $this->getAnonymizeIPInfo();
             $view->dntSupport = self::isDntSupported();
             $view->canDeleteLogActions = Piwik::isLockPrivilegeGranted();
-            $view->dbUser = Piwik_Config::getInstance()->database['username'];
+            $view->dbUser = Config::getInstance()->database['username'];
         }
         $view->language = Piwik_LanguagesManager::getLanguageCodeForCurrentUser();
         $this->displayWarningIfConfigFileNotWritable($view);
@@ -160,7 +161,7 @@ class Piwik_PrivacyManager_Controller extends Piwik_Controller_Admin
             $settings = Piwik_PrivacyManager::getPurgeDataSettings();
         }
 
-        $doDatabaseSizeEstimate = Piwik_Config::getInstance()->Deletelogs['enable_auto_database_size_estimate'];
+        $doDatabaseSizeEstimate = Config::getInstance()->Deletelogs['enable_auto_database_size_estimate'];
 
         // determine the DB size & purged DB size
         $metadataProvider = new Piwik_DBStats_MySQLMetadataProvider();
@@ -215,7 +216,7 @@ class Piwik_PrivacyManager_Controller extends Piwik_Controller_Admin
 
         $anonymizeIP["name"] = self::ANONYMIZE_IP_PLUGIN_NAME;
         $anonymizeIP["enabled"] = Piwik_PluginsManager::getInstance()->isPluginActivated(self::ANONYMIZE_IP_PLUGIN_NAME);
-        $anonymizeIP["maskLength"] = Piwik_Config::getInstance()->Tracker['ip_address_mask_length'];
+        $anonymizeIP["maskLength"] = Config::getInstance()->Tracker['ip_address_mask_length'];
         $anonymizeIP["info"] = Piwik_PluginsManager::getInstance()->getLoadedPlugin(self::ANONYMIZE_IP_PLUGIN_NAME)->getInformation();
 
         return $anonymizeIP;
diff --git a/plugins/PrivacyManager/PrivacyManager.php b/plugins/PrivacyManager/PrivacyManager.php
index c3ec627713..5a2d6f2f93 100644
--- a/plugins/PrivacyManager/PrivacyManager.php
+++ b/plugins/PrivacyManager/PrivacyManager.php
@@ -8,6 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_PrivacyManager
  */
+use Piwik\Core\Config;
 
 /**
  * @see plugins/PrivacyManager/LogDataPurger.php
@@ -108,7 +109,7 @@ class Piwik_PrivacyManager extends Piwik_Plugin
                 'delete_logs_older_than',
             );
 
-            $deleteLogsSettings = Piwik_Config::getInstance()->Deletelogs;
+            $deleteLogsSettings = Config::getInstance()->Deletelogs;
             foreach ($oldSettings as $settingName) {
                 $settings[$settingName] = $deleteLogsSettings[$settingName];
             }
diff --git a/plugins/Referers/Archiver.php b/plugins/Referers/Archiver.php
index 5d31a3d421..6c37226e26 100644
--- a/plugins/Referers/Archiver.php
+++ b/plugins/Referers/Archiver.php
@@ -1,4 +1,6 @@
 <?php
+use Piwik\Core\Config;
+
 /**
  * Piwik - Open source web analytics
  *
@@ -32,8 +34,8 @@ class Piwik_Referers_Archiver extends Piwik_PluginsArchiver
     {
         parent::__construct($processor);
         $this->columnToSortByBeforeTruncation = Piwik_Metrics::INDEX_NB_VISITS;
-        $this->maximumRowsInDataTableLevelZero = Piwik_Config::getInstance()->General['datatable_archiving_maximum_rows_referers'];
-        $this->maximumRowsInSubDataTable = Piwik_Config::getInstance()->General['datatable_archiving_maximum_rows_subtable_referers'];
+        $this->maximumRowsInDataTableLevelZero = Config::getInstance()->General['datatable_archiving_maximum_rows_referers'];
+        $this->maximumRowsInSubDataTable = Config::getInstance()->General['datatable_archiving_maximum_rows_subtable_referers'];
     }
 
     public function archiveDay()
diff --git a/plugins/UserCountry/LocationProvider/Default.php b/plugins/UserCountry/LocationProvider/Default.php
index f19fc47641..b7467e71d3 100755
--- a/plugins/UserCountry/LocationProvider/Default.php
+++ b/plugins/UserCountry/LocationProvider/Default.php
@@ -8,6 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_UserCountry
  */
+use Piwik\Core\Config;
 
 /**
  * The default LocationProvider, this LocationProvider guesses a visitor's country
@@ -28,7 +29,7 @@ class Piwik_UserCountry_LocationProvider_Default extends Piwik_UserCountry_Locat
      */
     public function getLocation($info)
     {
-        $enableLanguageToCountryGuess = Piwik_Config::getInstance()->Tracker['enable_language_to_country_guess'];
+        $enableLanguageToCountryGuess = Config::getInstance()->Tracker['enable_language_to_country_guess'];
 
         if (empty($info['lang'])) {
             $info['lang'] = Piwik_Common::getBrowserLanguage();
diff --git a/plugins/UserCountryMap/Controller.php b/plugins/UserCountryMap/Controller.php
index 9a02b6ff9f..002d3145c2 100644
--- a/plugins/UserCountryMap/Controller.php
+++ b/plugins/UserCountryMap/Controller.php
@@ -8,6 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_UserCountryMap
  */
+use Piwik\Core\Config;
 
 /**
  *
@@ -109,7 +110,7 @@ class Piwik_UserCountryMap_Controller extends Piwik_Controller
 
         $view->metrics = $this->getMetrics($idSite, 'range', self::REAL_TIME_WINDOW, $token_auth);
         $view->defaultMetric = 'nb_visits';
-        $view->liveRefreshAfterMs = (int)Piwik_Config::getInstance()->General['live_widget_refresh_after_seconds'] * 1000;
+        $view->liveRefreshAfterMs = (int)Config::getInstance()->General['live_widget_refresh_after_seconds'] * 1000;
 
         $goals = Piwik_Goals_API::getInstance()->getGoals($idSite);
         $site = new Piwik_Site($idSite);
diff --git a/plugins/UsersManager/API.php b/plugins/UsersManager/API.php
index bfb273e1d1..32d47cf48d 100644
--- a/plugins/UsersManager/API.php
+++ b/plugins/UsersManager/API.php
@@ -8,6 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_UsersManager
  */
+use Piwik\Core\Config;
 
 /**
  * The UsersManager API lets you Manage Users and their permissions to access specific websites.
@@ -97,7 +98,7 @@ class Piwik_UsersManager_API
                 $viewableSiteIds = Piwik_SitesManager_API::getInstance()->getSitesIdWithAtLeastViewAccess($login);
                 return reset($viewableSiteIds);
             case self::PREFERENCE_DEFAULT_REPORT_DATE:
-                return Piwik_Config::getInstance()->General['default_day'];
+                return Config::getInstance()->General['default_day'];
             default:
                 return false;
         }
@@ -498,7 +499,7 @@ class Piwik_UsersManager_API
 								FROM " . Piwik_Common::prefixTable("user") . "
 								WHERE email = ?", $userEmail);
         return $count != 0
-            || Piwik_Config::getInstance()->superuser['email'] == $userEmail;
+            || Config::getInstance()->superuser['email'] == $userEmail;
     }
 
     /**
diff --git a/plugins/UsersManager/Controller.php b/plugins/UsersManager/Controller.php
index 661b625cf2..8f8c69f666 100644
--- a/plugins/UsersManager/Controller.php
+++ b/plugins/UsersManager/Controller.php
@@ -8,6 +8,7 @@
  * @category Piwik_Plugins
  * @package Piwik_UsersManager
  */
+use Piwik\Core\Config;
 
 /**
  *
@@ -279,7 +280,7 @@ class Piwik_UsersManager_Controller extends Piwik_Controller_Admin
 
             $userLogin = Piwik::getCurrentUserLogin();
             if (Piwik::isUserIsSuperUser()) {
-                $superUser = Piwik_Config::getInstance()->superuser;
+                $superUser = Config::getInstance()->superuser;
                 $updatedSuperUser = false;
 
                 if ($newPassword !== false) {
@@ -293,8 +294,8 @@ class Piwik_UsersManager_Controller extends Piwik_Controller_Admin
                     $updatedSuperUser = true;
                 }
                 if ($updatedSuperUser) {
-                    Piwik_Config::getInstance()->superuser = $superUser;
-                    Piwik_Config::getInstance()->forceSave();
+                    Config::getInstance()->superuser = $superUser;
+                    Config::getInstance()->forceSave();
                 }
             } else {
                 Piwik_UsersManager_API::getInstance()->updateUser($userLogin, $newPassword, $email, $alias);