Merge branch 'stable' into develop

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

diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index f61a4564d61c79441e6b6fea4b7fa55550c9f067..44be9a31a277cf36e41547583f41bcf6857d7eee 100644 (file)
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -28,8 +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
@@ -62,7 +67,10 @@ class Photo extends BaseModule
                        exit;
                }
 
+               Profile::addVisitorCookieForHTTPSigner();
+
                $customsize = 0;
+               $square_resize = true;
                $photo = false;
                $scale = null;
                $stamp = microtime(true);
@@ -70,6 +78,7 @@ class Photo extends BaseModule
                        $customsize = intval($parameters['customsize']);
                        $uid = MPhoto::stripExtension($parameters['name']);
                        $photo = self::getAvatar($uid, $parameters['type'], $customsize);
+                       $square_resize = !in_array($parameters['type'], ['media', 'preview']);
                } elseif (!empty($parameters['type'])) {
                        $uid = MPhoto::stripExtension($parameters['name']);
                        $photo = self::getAvatar($uid, $parameters['type'], Proxy::PIXEL_SMALL);
@@ -97,6 +106,15 @@ class Photo extends BaseModule
 
                $stamp = microtime(true);
                $imgdata = MPhoto::getImageDataForPhoto($photo);
+
+               // 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;
+                       }
+               }
+
                $data = microtime(true) - $stamp;
 
                if (empty($imgdata)) {
@@ -105,10 +123,14 @@ class Photo extends BaseModule
                }
 
                // if customsize is set and image is not a gif, resize it
-               if ($photo['type'] !== "image/gif" && $customsize > 0 && $customsize < 501) {
+               if ($photo['type'] !== "image/gif" && $customsize > 0 && $customsize <= Proxy::PIXEL_THUMB && $square_resize) {
                        $img = new Image($imgdata, $photo['type']);
                        $img->scaleToSquare($customsize);
                        $imgdata = $img->asString();
+               } elseif ($photo['type'] !== "image/gif" && $customsize > 0) {
+                       $img = new Image($imgdata, $photo['type']);
+                       $img->scaleDown($customsize);
+                       $imgdata = $img->asString();
                }
 
                if (function_exists("header_remove")) {
@@ -168,9 +190,10 @@ class Photo extends BaseModule
                                        return false;
                                }
 
-                               $author = Contact::selectFirst([], ["`id` IN (SELECT `author-id` FROM `post` WHERE `uri-id` = ?)", $media['uri-id']]);
-                               $url = Contact::magicLinkByContact($author, $url);
-
+                               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]);
@@ -178,10 +201,11 @@ class Photo extends BaseModule
                                        return false;
                                }
 
-                               $author = Contact::selectFirst([], ["`id` IN (SELECT `author-id` FROM `post` WHERE `uri-id` = ?)", $media['uri-id']]);
-                               $url = Contact::magicLinkByContact($author, $media['url']);
+                               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($url, (int)local_user());
+                               return MPhoto::createPhotoForExternalResource($media['url'], (int)local_user());
                        case "contact":
                                $contact = Contact::getById($uid, ['uid', 'url', 'avatar', 'photo', 'xmpp', 'addr']);
                                if (empty($contact)) {
@@ -190,8 +214,17 @@ 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'])) {
-                                       $url = $contact['photo'];
+                               if (!empty($contact['photo']) && !empty($contact['avatar'])) {
+                                       // Fetch photo directly
+                                       $resourceid = MPhoto::ridFromURI($contact['photo']);
+                                       if (!empty($resourceid)) {
+                                               $photo = MPhoto::selectFirst([], ['resource-id' => $resourceid], ['order' => ['scale']]);
+                                               if (!empty($photo)) {
+                                                       return $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) {