From 8f9fa9ee13bcbf134901d35ce94945386d5f4647 Mon Sep 17 00:00:00 2001 From: Patrik Kernstock Date: Tue, 4 Sep 2018 00:58:44 +0200 Subject: [PATCH] Remove filter_var flags due to PHP 7.3 deprecation, fixes #10894 Signed-off-by: Patrik Kernstock --- apps/oauth2/lib/Controller/SettingsController.php | 2 +- apps/theming/lib/ThemingDefaults.php | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/apps/oauth2/lib/Controller/SettingsController.php b/apps/oauth2/lib/Controller/SettingsController.php index 499969b93b..ecf3179e1b 100644 --- a/apps/oauth2/lib/Controller/SettingsController.php +++ b/apps/oauth2/lib/Controller/SettingsController.php @@ -74,7 +74,7 @@ class SettingsController extends Controller { public function addClient(string $name, string $redirectUri): JSONResponse { - if (filter_var($redirectUri, FILTER_VALIDATE_URL, FILTER_FLAG_SCHEME_REQUIRED|FILTER_FLAG_HOST_REQUIRED) === false) { + if (filter_var($redirectUri, FILTER_VALIDATE_URL) === false) { return new JSONResponse(['message' => $this->l->t('Your redirect URL needs to be a full URL for example: https://yourdomain.com/path')], Http::STATUS_BAD_REQUEST); } diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php index fe1b1d4c17..1df7a9f17b 100644 --- a/apps/theming/lib/ThemingDefaults.php +++ b/apps/theming/lib/ThemingDefaults.php @@ -174,9 +174,7 @@ class ThemingDefaults extends \OC_Defaults { $legalLinks = ''; $divider = ''; foreach($links as $link) { if($link['url'] !== '' - && filter_var($link['url'], FILTER_VALIDATE_URL, [ - 'flags' => FILTER_FLAG_SCHEME_REQUIRED | FILTER_FLAG_HOST_REQUIRED - ]) + && filter_var($link['url'], FILTER_VALIDATE_URL) ) { $legalLinks .= $divider . '' . $link['text'] . ''; @@ -339,7 +337,7 @@ class ThemingDefaults extends \OC_Defaults { } return false; } - + /** * Increases the cache buster key */