From 4f983b756519d1e3c85b5fe6fb7467e812ef53e7 Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Thu, 11 Oct 2018 15:14:33 +0200 Subject: Backport https://github.com/nextcloud/server/pull/11446 Signed-off-by: Daniel Kesselberg --- lib/private/Setup.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/private/Setup.php b/lib/private/Setup.php index 25e0b4d8817..1b36a7ee0cd 100644 --- a/lib/private/Setup.php +++ b/lib/private/Setup.php @@ -438,16 +438,15 @@ class Setup { $config = \OC::$server->getSystemConfig(); // For CLI read the value from overwrite.cli.url - if(\OC::$CLI) { + if (\OC::$CLI) { $webRoot = $config->getValue('overwrite.cli.url', ''); - if($webRoot === '') { + if ($webRoot === '') { return false; } - $webRoot = parse_url($webRoot, PHP_URL_PATH); - if ($webRoot === null) { + if (!filter_var($webRoot, FILTER_VALIDATE_URL)) { return false; } - $webRoot = rtrim($webRoot, '/'); + $webRoot = rtrim(parse_url($webRoot, PHP_URL_PATH), '/'); } else { $webRoot = !empty(\OC::$WEBROOT) ? \OC::$WEBROOT : '/'; } -- cgit v1.2.3