Bugfixing PConfig

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

diff --git a/src/Module/Proxy.php b/src/Module/Proxy.php
index 4387cc7ec2b82c928fe2ba73ca8a94cf52e26ac4..1c980fe11e7fcb6d6f33341d4ea86938d9c5e408 100644 (file)
--- a/src/Module/Proxy.php
+++ b/src/Module/Proxy.php
@@ -5,15 +5,11 @@
  */
 namespace Friendica\Module;
 
-use Friendica\App;
 use Friendica\BaseModule;
-use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBA;
 use Friendica\Model\Photo;
 use Friendica\Object\Image;
-use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\Proxy as ProxyUtils;
 
@@ -32,7 +28,6 @@ class Proxy extends BaseModule
         *
         * Sets application instance and checks if /proxy/ path is writable.
         *
-        * @param \Friendica\App $app Application instance
         */
        public static function init()
        {
@@ -106,13 +101,13 @@ class Proxy extends BaseModule
 
                // If there is an error then return a blank image
                if ((substr($fetchResult->getReturnCode(), 0, 1) == '4') || (!$img_str)) {
-                       self::responseError($request);
+                       self::responseError();
                        // stop.
                }
 
                $image = new Image($img_str, $mime);
                if (!$image->isValid()) {
-                       self::responseError($request);
+                       self::responseError();
                        // stop.
                }
                
@@ -157,11 +152,11 @@ class Proxy extends BaseModule
         *      'size' => requested image size (int)
         *      'sizetype' => requested image size (string): ':micro', ':thumb', ':small', ':medium', ':large'
         *    ]
+        * @throws \Exception
         */
        private static function getRequestInfo()
        {
                $a = self::getApp();
-               $url = '';
                $size = 1024;
                $sizetype = '';
                
@@ -224,12 +219,13 @@ class Proxy extends BaseModule
                        'sizetype' => $sizetype,
                ];
        }
-       
-       
+
+
        /**
         * @brief 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()
        {
@@ -248,16 +244,18 @@ class Proxy extends BaseModule
                
                return $direct_cache;
        }
-       
-       
+
+
        /**
         * @brief Try to reply with image in cachefile
         *
-        * @param array $request  Array from getRequestInfo
+        * @param array $request Array from getRequestInfo
         *
         * @return string  Cache file name, empty string if cache is not enabled.
-        * 
+        *
         * If cachefile exists, script ends here and this function will never returns
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
        private static function responseFromCache(&$request)
        {
@@ -269,13 +267,15 @@ class Proxy extends BaseModule
                }
                return $cachefile;
        }
-       
+
        /**
         * @brief Try to reply with image in database
         *
-        * @param array $request  Array from getRequestInfo
+        * @param array $request Array from getRequestInfo
         *
         * If the image exists in database, then script ends here and this function will never returns
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
        private static function responseFromDB(&$request) {
        
@@ -293,15 +293,16 @@ class Proxy extends BaseModule
         *
         */
        private static function responseError() {
-               header('Content-type: ' . $img->getType());
+               header('Content-type: image/png');
                echo file_get_contents('images/blank.png');
                exit();
        }
-       
+
        /**
         * @brief Output the image with cache headers
         *
-        * @param Image $image
+        * @param Image $img
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        private static function responseImageHttpCache(Image $img)
        {