X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FProxy.php;h=aa0f66bbffbc274fae80eef7e9ebb6564c14e54f;hb=0a45bdd3b71ec0f8744abb3830858a91a4bca146;hp=27480900008859cfb612e54ac8d7f62717285a5f;hpb=19c3e55ca88e43d4dee6ba49f4b435034b660ecd;p=friendica.git
diff --git a/src/Util/Proxy.php b/src/Util/Proxy.php
index 2748090000..aa0f66bbff 100644
--- a/src/Util/Proxy.php
+++ b/src/Util/Proxy.php
@@ -1,6 +1,6 @@
get('system', 'proxify_content')) {
return $url;
@@ -137,21 +137,22 @@ class Proxy
* @return string Proxified HTML code
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public static function proxifyHtml($html)
+ public static function proxifyHtml(string $html): string
{
$html = str_replace(Strings::normaliseLink(DI::baseUrl()) . '/', DI::baseUrl() . '/', $html);
- return preg_replace_callback('/(
]*src *= *["\'])([^"\']+)(["\'][^>]*>)/siU', 'self::replaceUrl', $html);
+ return preg_replace_callback('/(
]*src *= *["\'])([^"\']+)(["\'][^>]*>)/siU', [self::class, 'replaceUrl'], $html);
}
/**
* Checks if the URL is a local URL.
*
* @param string $url
+ *
* @return boolean
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public static function isLocalImage($url)
+ public static function isLocalImage(string $url): bool
{
if (substr($url, 0, 1) == '/') {
return true;
@@ -168,26 +169,31 @@ 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($url)
+ 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
*/
- private static function replaceUrl(array $matches)
+ private static function replaceUrl(array $matches): string
{
// if the picture seems to be from another picture cache then take the original source
$queryvar = self::parseQuery($matches[2]);