Merge pull request #9509 from MrPetovan/task/5616-clear-notifications-display

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

diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index 0c2baeac4019155cbfdc969bcdb1f118b42ed2e0..0a0b6d3208399d1f44c3fc70242e57477174d786 100644 (file)
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -1,25 +1,39 @@
 <?php
 /**
- * @file src/Module/Photo.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\System;
 use Friendica\DI;
+use Friendica\Model\Contact;
 use Friendica\Model\Photo as MPhoto;
-use Friendica\Object\Image;
 
 /**
- * @brief Photo Module
+ * Photo Module
  */
 class Photo extends BaseModule
 {
        /**
-        * @brief Module initializer
+        * Module initializer
         *
         * Fetch a photo or an avatar, in optional size, check for permissions and
         * return the image
@@ -70,13 +84,13 @@ class Photo extends BaseModule
                                }
                                $photo = MPhoto::getPhoto($photoid, $scale);
                                if ($photo === false) {
-                                       $photo = MPhoto::createPhotoForSystemResource("images/nosign.jpg");
+                                       throw new \Friendica\Network\HTTPException\NotFoundException(DI::l10n()->t('The Photo with id %s is not available.', $photoid));
                                }
                                break;
                }
 
                if ($photo === false) {
-                       System::httpExit('404', 'Not Found');
+                       throw new \Friendica\Network\HTTPException\NotFoundException();
                }
 
                $cacheable = ($photo["allow_cid"] . $photo["allow_gid"] . $photo["deny_cid"] . $photo["deny_gid"] === "") && (isset($photo["cacheable"]) ? $photo["cacheable"] : true);
@@ -85,7 +99,7 @@ class Photo extends BaseModule
 
                if (is_null($img) || !$img->isValid()) {
                        Logger::log("Invalid photo with id {$photo["id"]}.");
-                       throw new \Friendica\Network\HTTPException\InternalServerErrorException(L10n::t('Invalid photo with id %s.', $photo["id"]));
+                       throw new \Friendica\Network\HTTPException\InternalServerErrorException(DI::l10n()->t('Invalid photo with id %s.', $photo["id"]));
                }
 
                // if customsize is set and image is not a gif, resize it
@@ -125,16 +139,16 @@ class Photo extends BaseModule
                case "profile":
                case "custom":
                        $scale = 4;
-                       $default = "images/person-300.jpg";
+                       $default = Contact::DEFAULT_AVATAR_PHOTO;
                        break;
                case "micro":
                        $scale = 6;
-                       $default = "images/person-48.jpg";
+                       $default = Contact::DEFAULT_AVATAR_MICRO;
                        break;
                case "avatar":
                default:
                        $scale = 5;
-                       $default = "images/person-80.jpg";
+                       $default = Contact::DEFAULT_AVATAR_THUMB;
                }
 
                $photo = MPhoto::selectFirst([], ["scale" => $scale, "uid" => $uid, "profile" => 1]);