diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-02-17 13:17:04 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-02-17 13:17:04 +0100 |
| commit | 76c511de92f1b4dc6dcc31ac5ae15ffade29bb18 (patch) | |
| tree | afa1983f7e1d9ad6bf180321eb2408c19082cac4 /settings | |
| parent | e8f16db49d3da864bf3d919918b79dcf59e0c10c (diff) | |
| parent | cebf9f6a5a2d75ea682f109486ada3d5558fb6a2 (diff) | |
| download | nextcloud-server-76c511de92f1b4dc6dcc31ac5ae15ffade29bb18.tar.gz nextcloud-server-76c511de92f1b4dc6dcc31ac5ae15ffade29bb18.zip | |
Merge pull request #14056 from owncloud/refactor/13976
Refactor OC_Request into TrustedDomainHelper and IRequest
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/admin.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/settings/admin.php b/settings/admin.php index bb20c665f56..cdbc2700a8d 100644 --- a/settings/admin.php +++ b/settings/admin.php @@ -20,6 +20,7 @@ $doesLogFileExist = file_exists($logFilePath); $logFileSize = filesize($logFilePath); $config = \OC::$server->getConfig(); $appConfig = \OC::$server->getAppConfig(); +$request = \OC::$server->getRequest(); // Should we display sendmail as an option? $template->assign('sendmail_is_available', (bool) \OC_Helper::findBinaryPath('sendmail')); @@ -59,7 +60,7 @@ $excludedGroupsList = explode(',', $excludedGroupsList); // FIXME: this should b $template->assign('shareExcludedGroupsList', implode('|', $excludedGroupsList)); // Check if connected using HTTPS -$template->assign('isConnectedViaHTTPS', OC_Request::serverProtocol() === 'https'); +$template->assign('isConnectedViaHTTPS', $request->getServerProtocol() === 'https'); $template->assign('enforceHTTPSEnabled', $config->getSystemValue('forcessl', false)); $template->assign('forceSSLforSubdomainsEnabled', $config->getSystemValue('forceSSLforSubdomains', false)); @@ -88,7 +89,7 @@ $template->assign('WindowsWarning', OC_Util::runningOnWindows()); $forms = OC_App::getForms('admin'); $l = OC_L10N::get('settings'); $formsAndMore = array(); -if (OC_Request::serverProtocol() !== 'https' || !OC_Util::isAnnotationsWorking() || +if ($request->getServerProtocol() !== 'https' || !OC_Util::isAnnotationsWorking() || $suggestedOverwriteCliUrl || !OC_Util::isSetLocaleWorking() || !OC_Util::isPhpCharSetUtf8() || !OC_Util::fileInfoLoaded() || $databaseOverload ) { |