Merge pull request #6554 from Ixiter/develop-bbcode-tags

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

diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index 8ce0c2674e619fbbefd29bfd70c1cf46ebf11e53..15ea261fb0cf6ac1093e2f940d6bbd6df36d54c4 100644 (file)
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -10,17 +10,12 @@ 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
         *
@@ -51,49 +46,51 @@ class Photo extends BaseModule
                }
 
                $customsize = 0;
+               $photo = false;
                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 = 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);
+                               if ($photo === false) {
+                                       $photo = MPhoto::createPhotoForSystemResource("images/nosign.jpg");
+                               }
+                               break;
                }
 
-               if ($photo===false) {
+               if ($photo === false) {
                        // not using System::httpExit() because we don't want html here.
                        header($_SERVER["SERVER_PROTOCOL"] . " 404 Not Found" , true, 404);
-                       killme();
+                       exit();
                }
 
-               $cacheable = ($photo["allow_cid"].$photo["allow_gid"].$photo["deny_cid"].$photo["deny_gid"] === "") && (isset($photo["cacheable"])?$photo["cacheable"]:true);
+               $cacheable = ($photo["allow_cid"] . $photo["allow_gid"] . $photo["deny_cid"] . $photo["deny_gid"] === "") && (isset($photo["cacheable"]) ? $photo["cacheable"] : true);
 
                $img = MPhoto::getImageForPhoto($photo);
 
                if (is_null($img) || !$img->isValid()) {
                        Logger::log("Invalid photo with id {$photo["id"]}.");
-                       System::httpExit(500, "Internal Server Error");
+                       System::httpExit(500, ["description" => "Invalid photo with id {$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,17 +111,15 @@ class Photo extends BaseModule
                        header("Cache-Control: max-age=31536000");
                }
 
-
                echo $img->asString();
 
-
-               killme();
+               exit();
        }
 
        private static function stripExtension($name)
        {
                $name = str_replace([".jpg", ".png", ".gif"], ["", "", ""], $name);
-               foreach (Image::supportedTypes() AS $m => $e) {
+               foreach (Image::supportedTypes() as $m => $e) {
                        $name = str_replace("." . $e, "", $name);
                }
                return $name;
@@ -150,7 +145,7 @@ class Photo extends BaseModule
                }
 
                $photo = MPhoto::selectFirst([], ["scale" => $scale, "uid" => $uid, "profile" => 1]);
-               if ($photo===false) {
+               if ($photo === false) {
                        $photo = MPhoto::createPhotoForSystemResource($default);
                }
                return $photo;