diff options
author | Fabian Becker <fabian.becker@uni-tuebingen.de> | 2013-07-18 13:25:08 +0400 |
---|---|---|
committer | Fabian Becker <fabian.becker@uni-tuebingen.de> | 2013-07-18 13:25:08 +0400 |
commit | 879d0e094824bd6d46ca1ecbba1cda945394bb05 (patch) | |
tree | 038ad7cbfe1e6441ada4e5a979ec54331d910f42 /plugins/UsersManager | |
parent | df0fd261c9172926a8a2a9a05fd4b30bd840d5f7 (diff) |
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
Diffstat (limited to 'plugins/UsersManager')
-rw-r--r-- | plugins/UsersManager/API.php | 5 | ||||
-rw-r--r-- | plugins/UsersManager/Controller.php | 7 |
2 files changed, 7 insertions, 5 deletions
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); |