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
exit;
}
+ Profile::addVisitorCookieForHTTPSigner();
+
$customsize = 0;
+ $square_resize = true;
$photo = false;
$scale = null;
$stamp = microtime(true);
$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);
$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)) {
}
// 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")) {
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]);
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']);
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) {