Standards

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

diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index 2cb29af5f6b348c45f730fbf8927cf2a78373828..165391cd3ca2aa67cfacbde652657a8488ea214b 100644 (file)
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -23,9 +23,11 @@ namespace Friendica\Module;
 
 use Friendica\BaseModule;
 use Friendica\Core\Logger;
-use Friendica\Core\System;
+use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\Contact;
 use Friendica\Model\Photo as MPhoto;
+use Friendica\Util\Proxy;
 
 /**
  * Photo Module
@@ -84,13 +86,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);
@@ -134,28 +136,38 @@ class Photo extends BaseModule
 
        private static function getAvatar($uid, $type="avatar")
        {
-
                switch($type) {
-               case "profile":
-               case "custom":
-                       $scale = 4;
-                       $default = "images/person-300.jpg";
-                       break;
-               case "micro":
-                       $scale = 6;
-                       $default = "images/person-48.jpg";
-                       break;
-               case "avatar":
-               default:
-                       $scale = 5;
-                       $default = "images/person-80.jpg";
+                       case "profile":
+                       case "custom":
+                               $scale = 4;
+                               break;
+                       case "micro":
+                               $scale = 6;
+                               break;
+                       case "avatar":
+                       default:
+                               $scale = 5;
                }
 
                $photo = MPhoto::selectFirst([], ["scale" => $scale, "uid" => $uid, "profile" => 1]);
-               if ($photo === false) {
+               if (empty($photo)) {
+                       $contact = DBA::selectFirst('contact', [], ['uid' => $uid, 'self' => true]) ?: [];
+
+                       switch($type) {
+                               case "profile":
+                               case "custom":
+                                       $default = Contact::getDefaultAvatar($contact, Proxy::SIZE_SMALL);
+                                       break;
+                               case "micro":
+                                       $default = Contact::getDefaultAvatar($contact, Proxy::SIZE_MICRO);
+                                       break;
+                               case "avatar":
+                               default:
+                                       $default = Contact::getDefaultAvatar($contact, Proxy::SIZE_THUMB);
+                       }
+       
                        $photo = MPhoto::createPhotoForSystemResource($default);
                }
                return $photo;
        }
-
 }