Use parameters

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

diff --git a/src/Module/Proxy.php b/src/Module/Proxy.php
index 38a9b17e014b631b718f0d29a7db4a5f30a931c4..e0d5716d69cf490fdad9e32a8b58c1fe274fed88 100644 (file)
--- a/src/Module/Proxy.php
+++ b/src/Module/Proxy.php
@@ -1,21 +1,20 @@
 <?php
 /**
  * @file src/Module/Proxy.php
- * @brief Based upon "Privacy Image Cache" by Tobias Hößl <https://github.com/CatoTH/>
+ * Based upon "Privacy Image Cache" by Tobias Hößl <https://github.com/CatoTH/>
  */
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
-use Friendica\Core\L10n;
-use Friendica\Core\System;
 use Friendica\Core\Logger;
+use Friendica\DI;
 use Friendica\Model\Photo;
 use Friendica\Object\Image;
 use Friendica\Util\HTTPSignature;
 use Friendica\Util\Proxy as ProxyUtils;
 
 /**
- * @brief Module Proxy
+ * Module Proxy
  *
  * urls:
  * /proxy/[sub1/[sub2/]]<base64url image url>[.ext][:size]
@@ -25,15 +24,15 @@ class Proxy extends BaseModule
 {
 
        /**
-        * @brief Initializer method for this class.
+        * Initializer method for this class.
         *
         * Sets application instance and checks if /proxy/ path is writable.
         *
         */
-       public static function init()
+       public static function init(array $parameters = [])
        {
                // Set application instance here
-               $a = self::getApp();
+               $a = DI::app();
 
                /*
                 * Pictures are stored in one of the following ways:
@@ -143,7 +142,7 @@ class Proxy extends BaseModule
 
 
        /**
-        * @brief Build info about requested image to be proxied
+        * Build info about requested image to be proxied
         *
         * @return array
         *    [
@@ -156,7 +155,7 @@ class Proxy extends BaseModule
         */
        private static function getRequestInfo()
        {
-               $a = self::getApp();
+               $a = DI::app();
                $size = 1024;
                $sizetype = '';
 
@@ -210,7 +209,7 @@ class Proxy extends BaseModule
                        $url = base64_decode(strtr($url, '-_', '+/'), true);
 
                } else {
-                       $url = defaults($_REQUEST, 'url', '');
+                       $url = $_REQUEST['url'] ?? '';
                }
 
                return [
@@ -223,14 +222,14 @@ class Proxy extends BaseModule
 
 
        /**
-        * @brief setup ./proxy folder for direct cache
+        * setup ./proxy folder for direct cache
         *
         * @return bool  False if direct cache can't be used.
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        private static function setupDirectCache()
        {
-               $a = self::getApp();
+               $a = DI::app();
                $basepath = $a->getBasePath();
 
                // If the cache path isn't there, try to create it
@@ -248,7 +247,7 @@ class Proxy extends BaseModule
 
 
        /**
-        * @brief Try to reply with image in cachefile
+        * Try to reply with image in cachefile
         *
         * @param array $request Array from getRequestInfo
         *
@@ -270,7 +269,7 @@ class Proxy extends BaseModule
        }
 
        /**
-        * @brief Try to reply with image in database
+        * Try to reply with image in database
         *
         * @param array $request Array from getRequestInfo
         *
@@ -300,7 +299,7 @@ class Proxy extends BaseModule
        }
 
        /**
-        * @brief Output the image with cache headers
+        * Output the image with cache headers
         *
         * @param Image $img
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException