Merge pull request #7400 from MrPetovan/bug/7397-frio-settings-fallback

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

diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index 994d0efa61959b7e757c441f3f317f348baefc4c..bcfe13f5372e4330a2650f15caa8225a3109ab66 100644 (file)
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -6,6 +6,7 @@
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Model\Photo as MPhoto;
@@ -25,8 +26,9 @@ class Photo extends BaseModule
        public static function init()
        {
                $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"])) {
@@ -46,34 +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);
-                       if ($photo === false) {
-                               $photo = MPhoto::createPhotoForSystemResource("images/nosign.jpg");
-                       }
-                       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) {
-                       // not using System::httpExit() because we don't want html here.
-                       header($_SERVER["SERVER_PROTOCOL"] . " 404 Not Found" , true, 404);
-                       exit();
+                       System::httpExit('404', 'Not Found');
                }
 
                $cacheable = ($photo["allow_cid"] . $photo["allow_gid"] . $photo["deny_cid"] . $photo["deny_gid"] === "") && (isset($photo["cacheable"]) ? $photo["cacheable"] : true);
@@ -82,7 +84,7 @@ class Photo extends BaseModule
 
                if (is_null($img) || !$img->isValid()) {
                        Logger::log("Invalid photo with id {$photo["id"]}.");
-                       System::httpExit(500, ["description" => "Invalid photo with id {$photo["id"]}."]);
+                       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