Merge branch 'stable' into develop

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

diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index e5042fad4e8b1d2b5747c913fe04f4509e9edfb9..44be9a31a277cf36e41547583f41bcf6857d7eee 100644 (file)
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -28,10 +28,13 @@ use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Photo as MPhoto;
 use Friendica\Model\Post;
+use Friendica\Model\Profile;
 use Friendica\Model\Storage\ExternalResource;
+use Friendica\Model\Storage\SystemResource;
 use Friendica\Util\Proxy;
 use Friendica\Object\Image;
 use Friendica\Util\Images;
+use Friendica\Util\Network;
 
 /**
  * Photo Module
@@ -64,6 +67,8 @@ class Photo extends BaseModule
                        exit;
                }
 
+               Profile::addVisitorCookieForHTTPSigner();
+
                $customsize = 0;
                $square_resize = true;
                $photo = false;
@@ -102,8 +107,8 @@ class Photo extends BaseModule
                $stamp = microtime(true);
                $imgdata = MPhoto::getImageDataForPhoto($photo);
 
-               // The mimetype for an external resource can only be known after it had been fetched
-               if ($photo['backend-class'] == ExternalResource::NAME) {
+               // The mimetype for an external or system resource can only be known reliably after it had been fetched
+               if (in_array($photo['backend-class'], [ExternalResource::NAME, SystemResource::NAME])) {
                        $mimetype = Images::getMimeTypeByData($imgdata);
                        if (!empty($mimetype)) {
                                $photo['type'] = $mimetype;
@@ -185,6 +190,10 @@ class Photo extends BaseModule
                                        return false;
                                }
 
+                               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());
                        case "media":
                                $media = DBA::selectFirst('post-media', ['url', 'uri-id'], ['id' => $uid, 'type' => Post\Media::IMAGE]);
@@ -192,6 +201,10 @@ class Photo extends BaseModule
                                        return false;
                                }
 
+                               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());
                        case "contact":
                                $contact = Contact::getById($uid, ['uid', 'url', 'avatar', 'photo', 'xmpp', 'addr']);
@@ -201,7 +214,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)) {
@@ -210,7 +223,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) {