diff options
author | mattab <matthieu.aubry@gmail.com> | 2013-09-14 06:37:21 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2013-09-14 06:37:21 +0400 |
commit | 8d11a25fa7f41212584a58998c59884a4b9836d4 (patch) | |
tree | 39d6e3892346288619987f32a562f7e102c6f34c /plugins/Installation | |
parent | 4e910af4d770e19bcc7f953840662ee8a4c08b20 (diff) |
Moving PHP/server settings getter/setter to SettingsServer class
Diffstat (limited to 'plugins/Installation')
-rw-r--r-- | plugins/Installation/Controller.php | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php index 467e02dc33..ea1ce67b70 100644 --- a/plugins/Installation/Controller.php +++ b/plugins/Installation/Controller.php @@ -27,6 +27,7 @@ use Piwik\Plugins\SitesManager\API as SitesManagerAPI; use Piwik\Plugins\UsersManager\API as UsersManagerAPI; use Piwik\ProxyHeaders; use Piwik\Session\SessionNamespace; +use Piwik\SettingsServer; use Piwik\Updater; use Piwik\Url; use Piwik\Version; @@ -67,7 +68,7 @@ class Controller extends \Piwik\Controller\Admin protected static function initServerFilesForSecurity() { - if (Common::isIIS()) { + if (SettingsServer::isIIS()) { ServerFilesGenerator::createWebConfigFiles(); } else { ServerFilesGenerator::createHtAccessFiles(); @@ -808,7 +809,7 @@ class Controller extends \Piwik\Controller\Admin $infos['openurl'] = Http::getTransportMethod(); - $infos['gd_ok'] = Piwik::isGdExtensionEnabled(); + $infos['gd_ok'] = SettingsServer::isGdExtensionEnabled(); $infos['hasMbstring'] = false; $infos['multibyte_ok'] = true; @@ -830,13 +831,13 @@ class Controller extends \Piwik\Controller\Admin $infos['memory_ok'] = true; $infos['memoryCurrent'] = ''; - $raised = Piwik::raiseMemoryLimitIfNecessary(); - if (($memoryValue = Piwik::getMemoryLimitValue()) > 0) { + $raised = SettingsServer::raiseMemoryLimitIfNecessary(); + if (($memoryValue = SettingsServer::getMemoryLimitValue()) > 0) { $infos['memoryCurrent'] = $memoryValue . 'M'; $infos['memory_ok'] = $memoryValue >= $minimumMemoryLimit; } - $infos['isWindows'] = Common::isWindows(); + $infos['isWindows'] = SettingsServer::isWindows(); $integrityInfo = Filechecks::getFileIntegrityInformation(); $infos['integrity'] = $integrityInfo[0]; @@ -849,7 +850,7 @@ class Controller extends \Piwik\Controller\Admin $infos['integrityErrorMessages'] = array_merge($infos['integrityErrorMessages'], array_slice($integrityInfo, 1)); } - $infos['timezone'] = Piwik::isTimezoneSupportEnabled(); + $infos['timezone'] = SettingsServer::isTimezoneSupportEnabled(); $infos['tracker_status'] = Common::getRequestVar('trackerStatus', 0, 'int'); |