bump version 2023.12

[friendica.git] / src / Util / Proxy.php

diff --git a/src/Util/Proxy.php b/src/Util/Proxy.php
index 27480900008859cfb612e54ac8d7f62717285a5f..8d79b05dd8542507aedf11103ec2b28fee5a19b3 100644 (file)
--- a/src/Util/Proxy.php
+++ b/src/Util/Proxy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, 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
@@ -35,8 +36,8 @@ class Proxy
         */
        const SIZE_MICRO  = 'micro'; // 48
        const SIZE_THUMB  = 'thumb'; // 80
-       const SIZE_SMALL  = 'small'; // 300
-       const SIZE_MEDIUM = 'medium'; // 600
+       const SIZE_SMALL  = 'small'; // 320
+       const SIZE_MEDIUM = 'medium'; // 640
        const SIZE_LARGE  = 'large'; // 1024
 
        /**
@@ -44,8 +45,8 @@ class Proxy
         */
        const PIXEL_MICRO  = 48;
        const PIXEL_THUMB  = 80;
-       const PIXEL_SMALL  = 300;
-       const PIXEL_MEDIUM = 600;
+       const PIXEL_SMALL  = 320;
+       const PIXEL_MEDIUM = 640;
        const PIXEL_LARGE  = 1024;
 
        /**
@@ -74,13 +75,12 @@ 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 $size      One of the ProxyUtils::SIZE_* constants
-        *
-        * @return string The proxyfied URL or relative path
+        * @param string $url       The URL to proxify
+        * @param string $size      One of the Proxy::SIZE_* constants
+        * @return string The proxified URL or relative path
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function proxifyUrl($url, $size = '')
+       public static function proxifyUrl(string $url, string $size = ''): string
        {
                if (!DI::config()->get('system', 'proxify_content')) {
                        return $url;
@@ -116,7 +116,7 @@ class Proxy
                        $size = ':' . $size;
                }
 
-               Logger::info('Created proxy link', ['url' => $url, 'callstack' => System::callstack(20)]);
+               Logger::info('Created proxy link', ['url' => $url]);
 
                // Too long files aren't supported by Apache
                if (strlen($proxypath) > 250) {
@@ -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('/(<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
         */
-       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]);
@@ -205,4 +211,21 @@ class Proxy
                return $matches[1] . self::proxifyUrl(htmlspecialchars_decode($matches[2])) . $matches[3];
        }
 
+       public static function getPixelsFromSize(string $size): int
+       {
+               switch ($size) {
+                       case Proxy::SIZE_MICRO:
+                               return Proxy::PIXEL_MICRO;
+                       case Proxy::SIZE_THUMB:
+                               return Proxy::PIXEL_THUMB;
+                       case Proxy::SIZE_SMALL:
+                               return Proxy::PIXEL_SMALL;
+                       case Proxy::SIZE_MEDIUM:
+                               return Proxy::PIXEL_MEDIUM;
+                       case Proxy::SIZE_LARGE:
+                               return Proxy::PIXEL_LARGE;
+                       default:
+                               return 0;
+               }
+       }
 }