Simplified proxy handling

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

diff --git a/src/Util/Proxy.php b/src/Util/Proxy.php
index 87f7c983e1acb4498d08834e9c5f7a02ec2860c9..839442797ef8ed3b7a29bb3df63874266952fe7e 100644 (file)
--- a/src/Util/Proxy.php
+++ b/src/Util/Proxy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -37,11 +37,20 @@ class Proxy
        /**
         * Sizes constants
         */
-       const SIZE_MICRO  = 'micro';
-       const SIZE_THUMB  = 'thumb';
-       const SIZE_SMALL  = 'small';
-       const SIZE_MEDIUM = 'medium';
-       const SIZE_LARGE  = 'large';
+       const SIZE_MICRO  = 'micro'; // 48
+       const SIZE_THUMB  = 'thumb'; // 80
+       const SIZE_SMALL  = 'small'; // 300
+       const SIZE_MEDIUM = 'medium'; // 600
+       const SIZE_LARGE  = 'large'; // 1024
+
+       /**
+        * Pixel Sizes
+        */
+       const PIXEL_MICRO  = 48;
+       const PIXEL_THUMB  = 80;
+       const PIXEL_SMALL  = 300;
+       const PIXEL_MEDIUM = 600;
+       const PIXEL_LARGE  = 1024;
 
        /**
         * Accepted extensions
@@ -71,13 +80,12 @@ class Proxy
         * system.proxy_disabled is set to false.
         *
         * @param string $url       The URL to proxyfy
-        * @param bool   $writemode Returns a local path the remote URL should be saved to
         * @param string $size      One of the ProxyUtils::SIZE_* constants
         *
         * @return string The proxyfied URL or relative path
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function proxifyUrl($url, $writemode = false, $size = '')
+       public static function proxifyUrl($url, $size = '')
        {
                // Get application instance
                $a = DI::app();
@@ -105,17 +113,9 @@ class Proxy
                // Image URL may have encoded ampersands for display which aren't desirable for proxy
                $url = html_entity_decode($url, ENT_NOQUOTES, 'utf-8');
 
-               // Creating a sub directory to reduce the amount of files in the cache directory
-               $basepath = $a->getBasePath() . '/proxy';
-
                $shortpath = hash('md5', $url);
                $longpath = substr($shortpath, 0, 2);
 
-               if (is_dir($basepath) && $writemode && !is_dir($basepath . '/' . $longpath)) {
-                       mkdir($basepath . '/' . $longpath);
-                       chmod($basepath . '/' . $longpath, 0777);
-               }
-
                $longpath .= '/' . strtr(base64_encode($url), '+/', '-_');
 
                // Extract the URL extension
@@ -133,13 +133,8 @@ class Proxy
                }
 
                // Too long files aren't supported by Apache
-               // Writemode in combination with long files shouldn't be possible
-               if ((strlen($proxypath) > 250) && $writemode) {
-                       return $shortpath;
-               } elseif (strlen($proxypath) > 250) {
+               if (strlen($proxypath) > 250) {
                        return DI::baseUrl() . '/proxy/' . $shortpath . '?url=' . urlencode($url);
-               } elseif ($writemode) {
-                       return $longpath;
                } else {
                        return $proxypath . $size;
                }