diff options
author | Lukas Reschke <lukas@owncloud.com> | 2015-02-10 13:02:48 +0100 |
---|---|---|
committer | Lukas Reschke <lukas@owncloud.com> | 2015-02-16 22:13:00 +0100 |
commit | 886bda5f81d52ba4443094e4c2fffac33c27bc4b (patch) | |
tree | 7915861a5d11f8f45d7a279c51e6bcc827c37367 /remote.php | |
parent | 7f624188a77534856ecd53ac1d303ce5358e681e (diff) | |
download | nextcloud-server-886bda5f81d52ba4443094e4c2fffac33c27bc4b.tar.gz nextcloud-server-886bda5f81d52ba4443094e4c2fffac33c27bc4b.zip |
Refactor OC_Request into TrustedDomainHelper and IRequest
This changeset removes the static class `OC_Request` and moves the functions either into `IRequest` which is accessible via `\OC::$server::->getRequest()` or into a separated `TrustedDomainHelper` class for some helper methods which should not be publicly exposed.
This changes only internal methods and nothing on the public API. Some public functions in `util.php` have been deprecated though in favour of the new non-static functions.
Unfortunately some part of this code uses things like `__DIR__` and thus is not completely unit-testable. Where tests where possible they ahve been added though.
Fixes https://github.com/owncloud/core/issues/13976 which was requested in https://github.com/owncloud/core/pull/13973#issuecomment-73492969
Diffstat (limited to 'remote.php')
-rw-r--r-- | remote.php | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/remote.php b/remote.php index 7993566afec..80173441e90 100644 --- a/remote.php +++ b/remote.php @@ -11,17 +11,18 @@ try { exit; } - $path_info = OC_Request::getPathInfo(); - if ($path_info === false || $path_info === '') { + $request = \OC::$server->getRequest(); + $pathInfo = $request->getPathInfo(); + if ($pathInfo === false || $pathInfo === '') { OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND); exit; } - if (!$pos = strpos($path_info, '/', 1)) { - $pos = strlen($path_info); + if (!$pos = strpos($pathInfo, '/', 1)) { + $pos = strlen($pathInfo); } - $service=substr($path_info, 1, $pos-1); + $service=substr($pathInfo, 1, $pos-1); - $file = \OC::$server->getAppConfig()->getValue('core', 'remote_' . $service); + $file = \OC::$server->getConfig()->getAppValue('core', 'remote_' . $service); if(is_null($file)) { OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND); |