Merge pull request #7828 from nupplaphil/task/move_enotify

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

diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index b20c2657a57f401878e6061f0342f60ae19cf87b..9987c38f517041224be88a2895ed961e0b83dbb9 100644 (file)
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -6,32 +6,29 @@
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Model\Photo as MPhoto;
 use Friendica\Object\Image;
-use Friendica\Util\Security;
-use Friendica\Network\HTTPException\NotFoundException;
-use Friendica\Network\HTTPException\BadRequestException;
-use Friendica\Network\HTTPException\InternalServerErrorException;
 
 /**
  * @brief Photo Module
  */
 class Photo extends BaseModule
 {
-
        /**
         * @brief Module initializer
         *
         * Fetch a photo or an avatar, in optional size, check for permissions and
         * return the image
         */
-       public static function init()
+       public static function init(array $parameters = [])
        {
                $a = self::getApp();
+               // @TODO: Replace with parameter from router
                if ($a->argc <= 1 || $a->argc > 4) {
-                       System::httpExit(400, "Bad Request");
+                       throw new \Friendica\Network\HTTPException\BadRequestException();
                }
 
                if (isset($_SERVER["HTTP_IF_MODIFIED_SINCE"])) {
@@ -51,31 +48,34 @@ class Photo extends BaseModule
                }
 
                $customsize = 0;
+               $photo = false;
+               // @TODO: Replace with parameter from router
                switch($a->argc) {
-               case 4:
-                       $customsize = intval($a->argv[2]);
-                       $uid = self::stripExtension($a->argv[3]);
-                       $photo = self::getAvatar($uid, $a->argv[1]);
-                       break;
-               case 3:
-                       $uid = self::stripExtension($a->argv[2]);
-                       $photo = self::getAvatar($uid, $a->argv[1]);
-                       break;
-               case 2:
-                       $photoid = self::stripExtension($a->argv[1]);
-                       $scale = 0;
-                       if (substr($photoid, -2, 1) == "-") {
-                               $scale = intval(substr($photoid, -1, 1));
-                               $photoid = substr($photoid, 0, -2);
-                       }
-                       $photo = MPhoto::getPhoto($photoid, $scale);
-                       break;
+                       case 4:
+                               $customsize = intval($a->argv[2]);
+                               $uid = MPhoto::stripExtension($a->argv[3]);
+                               $photo = self::getAvatar($uid, $a->argv[1]);
+                               break;
+                       case 3:
+                               $uid = MPhoto::stripExtension($a->argv[2]);
+                               $photo = self::getAvatar($uid, $a->argv[1]);
+                               break;
+                       case 2:
+                               $photoid = MPhoto::stripExtension($a->argv[1]);
+                               $scale = 0;
+                               if (substr($photoid, -2, 1) == "-") {
+                                       $scale = intval(substr($photoid, -1, 1));
+                                       $photoid = substr($photoid, 0, -2);
+                               }
+                               $photo = MPhoto::getPhoto($photoid, $scale);
+                               if ($photo === false) {
+                                       $photo = MPhoto::createPhotoForSystemResource("images/nosign.jpg");
+                               }
+                               break;
                }
 
                if ($photo === false) {
-                       // not using System::httpExit() because we don't want html here.
-                       header($_SERVER["SERVER_PROTOCOL"] . " 404 Not Found" , true, 404);
-                       killme();
+                       System::httpExit('404', 'Not Found');
                }
 
                $cacheable = ($photo["allow_cid"] . $photo["allow_gid"] . $photo["deny_cid"] . $photo["deny_gid"] === "") && (isset($photo["cacheable"]) ? $photo["cacheable"] : true);
@@ -84,16 +84,14 @@ class Photo extends BaseModule
 
                if (is_null($img) || !$img->isValid()) {
                        Logger::log("Invalid photo with id {$photo["id"]}.");
-                       System::httpExit(500, "Internal Server Error");
+                       throw new \Friendica\Network\HTTPException\InternalServerErrorException(L10n::t('Invalid photo with id %s.', $photo["id"]));
                }
 
-
                // if customsize is set and image is not a gif, resize it
                if ($img->getType() !== "image/gif" && $customsize > 0 && $customsize < 501) {
                        $img->scaleToSquare($customsize);
                }
 
-
                if (function_exists("header_remove")) {
                        header_remove("Pragma");
                        header_remove("pragma");
@@ -114,20 +112,9 @@ class Photo extends BaseModule
                        header("Cache-Control: max-age=31536000");
                }
 
-
                echo $img->asString();
 
-
-               killme();
-       }
-
-       private static function stripExtension($name)
-       {
-               $name = str_replace([".jpg", ".png", ".gif"], ["", "", ""], $name);
-               foreach (Image::supportedTypes() as $m => $e) {
-                       $name = str_replace("." . $e, "", $name);
-               }
-               return $name;
+               exit();
        }
 
        private static function getAvatar($uid, $type="avatar")