simplify

flarum · Jan 5, 2024 · 743f4ea · 743f4ea
1 parent 947645d
commit 743f4ea
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/framework/core/src/Forum/Controller/LogOutController.php b/framework/core/src/Forum/Controller/LogOutController.php
@@ -21,6 +21,7 @@
 use Illuminate\Support\Arr;
 use Laminas\Diactoros\Response\HtmlResponse;
 use Laminas\Diactoros\Response\RedirectResponse;
+use Laminas\Diactoros\Uri;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Server\RequestHandlerInterface;
@@ -129,13 +130,9 @@ protected function sanitizeReturnUrl(string $url, string $base): string
             return $base; // Return base URL for empty return URL
         }
 
-        $parsed = parse_url($url);
+        $parsed = new Uri($url);
 
-        if (!$parsed || !isset($parsed['host'])) {
-            return $base; // Return early for invalid URLs
-        }
-
-        $host = $parsed['host'];
+        $host = $parsed->getHost();
 
         if (in_array($host, $this->getWhitelistedRedirectDomains())) {
             return $url;
@@ -146,14 +143,10 @@ protected function sanitizeReturnUrl(string $url, string $base): string
 
     protected function getWhitelistedRedirectDomains(): array
     {
-        $forumUrl = $this->config->url();
-        $parsedForumUrl = parse_url($forumUrl);
-
-        // Extract the host from the parsed forum URL
-        $forumHost = isset($parsedForumUrl['host']) ? $parsedForumUrl['host'] : '';
-
+        $forumUri = new Uri($this->config->url());
+
         return array_merge(
-            [$forumHost],
+            [$forumUri->getHost()],
             $this->config->offsetGet('redirectDomains') ?? []
         );
     }