From 886bda5f81d52ba4443094e4c2fffac33c27bc4b Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Tue, 10 Feb 2015 13:02:48 +0100 Subject: 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 --- public.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'public.php') diff --git a/public.php b/public.php index c5c227ef460..f17052a6c87 100644 --- a/public.php +++ b/public.php @@ -13,12 +13,13 @@ try { OC::checkMaintenanceMode(); OC::checkSingleUserMode(); - $pathInfo = OC_Request::getPathInfo(); - if (!$pathInfo && !isset($_GET['service'])) { + $request = \OC::$server->getRequest(); + $pathInfo = $request->getPathInfo(); + if (!$pathInfo && !isset($request->server['service'])) { header('HTTP/1.0 404 Not Found'); exit; - } elseif (isset($_GET['service'])) { - $service = $_GET['service']; + } elseif (isset($request->server['service'])) { + $service = $request->server['service']; } else { $pathInfo = trim($pathInfo, '/'); list($service) = explode('/', $pathInfo); -- cgit v1.2.3