X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FProxy.php;h=aa0f66bbffbc274fae80eef7e9ebb6564c14e54f;hb=0a45bdd3b71ec0f8744abb3830858a91a4bca146;hp=ed0ae8affce648a21441503e7b0ce2c36de6274a;hpb=8db0e090d7afc3fbfeaf7a587140c80c98233484;p=friendica.git

diff --git a/src/Util/Proxy.php b/src/Util/Proxy.php
index ed0ae8affc..aa0f66bbff 100644
--- a/src/Util/Proxy.php
+++ b/src/Util/Proxy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -24,6 +24,7 @@ namespace Friendica\Util;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\DI;
+use GuzzleHttp\Psr7\Uri;
 
 /**
  * Proxy utilities class
@@ -74,9 +75,9 @@ class Proxy
 	 * This function only performs the URL replacement on http URL and if the
 	 * provided URL isn't local
 	 *
-	 * @param string $url       The URL to proxyfy
+	 * @param string $url       The URL to proxify
 	 * @param string $size      One of the Proxy::SIZE_* constants
-	 * @return string The proxyfied URL or relative path
+	 * @return string The proxified URL or relative path
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function proxifyUrl(string $url, string $size = ''): string
@@ -132,6 +133,7 @@ class Proxy
 	 * proxy storage directory.
 	 *
 	 * @param string $html Un-proxified HTML code
+	 *
 	 * @return string Proxified HTML code
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
@@ -139,13 +141,14 @@ class Proxy
 	{
 		$html = str_replace(Strings::normaliseLink(DI::baseUrl()) . '/', DI::baseUrl() . '/', $html);
 
-		return preg_replace_callback('/(<img [^>]*src *= *["\'])([^"\']+)(["\'][^>]*>)/siU', 'self::replaceUrl', $html);
+		return preg_replace_callback('/(<img [^>]*src *= *["\'])([^"\']+)(["\'][^>]*>)/siU', [self::class, 'replaceUrl'], $html);
 	}
 
 	/**
 	 * Checks if the URL is a local URL.
 	 *
 	 * @param string $url
+	 *
 	 * @return boolean
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
@@ -166,22 +169,27 @@ class Proxy
 	 * Return the array of query string parameters from a URL
 	 *
 	 * @param string $url URL to parse
+	 *
 	 * @return array Associative array of query string parameters
 	 */
 	private static function parseQuery(string $url): array
 	{
-		$query = parse_url($url, PHP_URL_QUERY);
-		$query = html_entity_decode($query);
+		try {
+			$uri = new Uri($url);
 
-		parse_str($query, $arr);
+			parse_str($uri->getQuery(), $arr);
 
-		return $arr;
+			return $arr;
+		} catch (\Throwable $e) {
+			return [];
+		}
 	}
 
 	/**
 	 * Call-back method to replace the UR
 	 *
 	 * @param array $matches Matches from preg_replace_callback()
+	 *
 	 * @return string Proxified HTML image tag
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */