"getUserId" is now "getLoggedInUserId"

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

diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index 57ccd1bddb51870e340f0bd306cee3ab458676f1..06a369df77d5e67bd81e9d8218eeb239c8641e56 100644 (file)
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -33,8 +33,8 @@ use Friendica\Model\Storage\ExternalResource;
 use Friendica\Model\Storage\SystemResource;
 use Friendica\Util\Proxy;
 use Friendica\Object\Image;
-use Friendica\Util\HTTPSignature;
 use Friendica\Util\Images;
+use Friendica\Util\Network;
 
 /**
  * Photo Module
@@ -67,10 +67,7 @@ class Photo extends BaseModule
                        exit;
                }
 
-               $requester = HTTPSignature::getSigner('', $_SERVER);
-               if (!empty($requester)) {
-                       Profile::addVisitorCookieForHandle($requester);
-               }
+               Profile::addVisitorCookieForHTTPSigner();
 
                $customsize = 0;
                $square_resize = true;
@@ -121,8 +118,14 @@ class Photo extends BaseModule
                $data = microtime(true) - $stamp;
 
                if (empty($imgdata)) {
-                       Logger::warning("Invalid photo with id {$photo["id"]}.");
-                       throw new \Friendica\Network\HTTPException\InternalServerErrorException(DI::l10n()->t('Invalid photo with id %s.', $photo["id"]));
+                       Logger::warning('Invalid photo', ['id' => $photo['id']]);
+                       if (in_array($photo['backend-class'], [ExternalResource::NAME])) {
+                               $reference = json_decode($photo['backend-ref'], true);
+                               $error = DI::l10n()->t('Invalid external resource with url %s.', $reference['url']);
+                       } else {
+                               $error = DI::l10n()->t('Invalid photo with id %s.', $photo['id']);
+                       }
+                       throw new \Friendica\Network\HTTPException\InternalServerErrorException($error);
                }
 
                // if customsize is set and image is not a gif, resize it
@@ -179,7 +182,7 @@ class Photo extends BaseModule
        {
                switch($type) {
                        case "preview":
-                               $media = DBA::selectFirst('post-media', ['preview', 'url', 'type', 'uri-id'], ['id' => $uid]);
+                               $media = DBA::selectFirst('post-media', ['preview', 'url', 'mimetype', 'type', 'uri-id'], ['id' => $uid]);
                                if (empty($media)) {
                                        return false;
                                }
@@ -193,14 +196,29 @@ class Photo extends BaseModule
                                        return false;
                                }
 
-                               return MPhoto::createPhotoForExternalResource($url, (int)local_user());
+                               if (Network::isLocalLink($url) && preg_match('|.*?/photo/(.*[a-fA-F0-9])\-(.*[0-9])\..*[\w]|', $url, $matches)) {
+                                       return MPhoto::getPhoto($matches[1], $matches[2]);
+                               }
+               
+                               return MPhoto::createPhotoForExternalResource($url, (int)local_user(), $media['mimetype']);
                        case "media":
-                               $media = DBA::selectFirst('post-media', ['url', 'uri-id'], ['id' => $uid, 'type' => Post\Media::IMAGE]);
+                               $media = DBA::selectFirst('post-media', ['url', 'mimetype', 'uri-id'], ['id' => $uid, 'type' => Post\Media::IMAGE]);
                                if (empty($media)) {
                                        return false;
                                }
 
-                               return MPhoto::createPhotoForExternalResource($media['url'], (int)local_user());
+                               if (Network::isLocalLink($media['url']) && preg_match('|.*?/photo/(.*[a-fA-F0-9])\-(.*[0-9])\..*[\w]|', $media['url'], $matches)) {
+                                       return MPhoto::getPhoto($matches[1], $matches[2]);
+                               }
+
+                               return MPhoto::createPhotoForExternalResource($media['url'], (int)local_user(), $media['mimetype']);
+                       case "link":
+                               $link = DBA::selectFirst('post-link', ['url', 'mimetype'], ['id' => $uid]);
+                               if (empty($link)) {
+                                       return false;
+                               }
+
+                               return MPhoto::createPhotoForExternalResource($link['url'], (int)local_user(), $link['mimetype']);
                        case "contact":
                                $contact = Contact::getById($uid, ['uid', 'url', 'avatar', 'photo', 'xmpp', 'addr']);
                                if (empty($contact)) {
@@ -209,7 +227,7 @@ class Photo extends BaseModule
                                If (($contact['uid'] != 0) && empty($contact['photo']) && empty($contact['avatar'])) {
                                        $contact = Contact::getByURL($contact['url'], false, ['avatar', 'photo', 'xmpp', 'addr']);
                                }
-                               if (!empty($contact['photo'])) {
+                               if (!empty($contact['photo']) && !empty($contact['avatar'])) {
                                        // Fetch photo directly
                                        $resourceid = MPhoto::ridFromURI($contact['photo']);
                                        if (!empty($resourceid)) {
@@ -218,7 +236,8 @@ class Photo extends BaseModule
                                                        return $photo;
                                                }
                                        }
-                                       $url = $contact['photo'];
+                                       // We continue with the avatar link when the photo link is invalid
+                                       $url = $contact['avatar'];
                                } elseif (!empty($contact['avatar'])) {
                                        $url = $contact['avatar'];
                                } elseif ($customsize <= Proxy::PIXEL_MICRO) {