<?php
/**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
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\Core\Storage\Type\ExternalResource;
+use Friendica\Core\Storage\Type\SystemResource;
use Friendica\Model\User;
use Friendica\Network\HTTPException;
+use Friendica\Network\HTTPException\NotModifiedException;
use Friendica\Object\Image;
use Friendica\Util\Images;
use Friendica\Util\Network;
+use Friendica\Util\ParseUrl;
use Friendica\Util\Proxy;
/**
* Fetch a photo or an avatar, in optional size, check for permissions and
* return the image
*/
- public static function rawContent(array $parameters = [])
+ protected function rawContent(array $request = [])
{
$totalstamp = microtime(true);
if (isset($_SERVER["HTTP_IF_MODIFIED_SINCE"])) {
- header("HTTP/1.1 304 Not Modified");
header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
if (!empty($_SERVER["HTTP_IF_NONE_MATCH"])) {
header("Etag: " . $_SERVER["HTTP_IF_NONE_MATCH"]);
header_remove("Expires");
header_remove("Cache-Control");
}
- exit;
+ throw new NotModifiedException();
}
Profile::addVisitorCookieForHTTPSigner();
$scale = null;
$stamp = microtime(true);
// User avatar
- if (!empty($parameters['type'])) {
- if (!empty($parameters['customsize'])) {
- $customsize = intval($parameters['customsize']);
- $square_resize = !in_array($parameters['type'], ['media', 'preview']);
+ if (!empty($this->parameters['type'])) {
+ if (!empty($this->parameters['customsize'])) {
+ $customsize = intval($this->parameters['customsize']);
+ $square_resize = !in_array($this->parameters['type'], ['media', 'preview']);
}
- if (!empty($parameters['nickname_ext'])) {
- $nickname = pathinfo($parameters['nickname_ext'], PATHINFO_FILENAME);
+ if (!empty($this->parameters['guid'])) {
+ $guid = $this->parameters['guid'];
+ $account = DBA::selectFirst('account-user-view', ['id'], ['guid' => $guid], ['order' => ['uid' => true]]);
+ if (empty($account)) {
+ throw new HTTPException\NotFoundException();
+ }
+
+ $id = $account['id'];
+ }
+
+ // Contact Id Fallback, to remove after version 2021.12
+ if (isset($this->parameters['contact_id'])) {
+ $id = intval($this->parameters['contact_id']);
+ }
+
+ if (!empty($this->parameters['nickname_ext'])) {
+ $nickname = pathinfo($this->parameters['nickname_ext'], PATHINFO_FILENAME);
$user = User::getByNickname($nickname, ['uid']);
if (empty($user)) {
throw new HTTPException\NotFoundException();
}
- $uid = $user['uid'];
+ $id = $user['uid'];
}
// User Id Fallback, to remove after version 2021.12
- if (!empty($parameters['uid_ext'])) {
- $uid = intval(pathinfo($parameters['uid_ext'], PATHINFO_FILENAME));
+ if (!empty($this->parameters['uid_ext'])) {
+ $id = intval(pathinfo($this->parameters['uid_ext'], PATHINFO_FILENAME));
}
- $photo = self::getAvatar($uid, $parameters['type'], $customsize ?: Proxy::PIXEL_SMALL);
+ // Please refactor this for the love of everything that's good
+ if (isset($this->parameters['id'])) {
+ $id = $this->parameters['id'];
+ }
+
+ if (empty($id)) {
+ Logger::notice('No picture id was detected', ['parameters' => $this->parameters, 'query' => DI::args()->getQueryString()]);
+ throw new HTTPException\NotFoundException(DI::l10n()->t('The Photo is not available.'));
+ }
+
+ $photo = self::getPhotoByid($id, $this->parameters['type'], $customsize ?: Proxy::PIXEL_SMALL);
} else {
- $photoid = MPhoto::stripExtension($parameters['name']);
+ $photoid = pathinfo($this->parameters['name'], PATHINFO_FILENAME);
$scale = 0;
if (substr($photoid, -2, 1) == "-") {
$scale = intval(substr($photoid, -1, 1));
exit();
}
- private static function getAvatar(int $uid, $type, $customsize)
+ private static function getPhotoByid(int $id, $type, $customsize)
{
switch($type) {
case "preview":
- $media = DBA::selectFirst('post-media', ['preview', 'url', 'mimetype', 'type', 'uri-id'], ['id' => $uid]);
+ $media = DBA::selectFirst('post-media', ['preview', 'url', 'mimetype', 'type', 'uri-id'], ['id' => $id]);
if (empty($media)) {
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(), $media['mimetype']);
case "media":
- $media = DBA::selectFirst('post-media', ['url', 'mimetype', 'uri-id'], ['id' => $uid, 'type' => Post\Media::IMAGE]);
+ $media = DBA::selectFirst('post-media', ['url', 'mimetype', 'uri-id'], ['id' => $id, 'type' => Post\Media::IMAGE]);
if (empty($media)) {
return false;
}
return MPhoto::createPhotoForExternalResource($media['url'], (int)local_user(), $media['mimetype']);
case "link":
- $link = DBA::selectFirst('post-link', ['url', 'mimetype'], ['id' => $uid]);
+ $link = DBA::selectFirst('post-link', ['url', 'mimetype'], ['id' => $id]);
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']);
+ $contact = Contact::getById($id, ['uid', 'url', 'avatar', 'photo', 'xmpp', 'addr']);
if (empty($contact)) {
return false;
}
$url = $contact['avatar'];
} elseif (!empty($contact['avatar'])) {
$url = $contact['avatar'];
- } elseif ($customsize <= Proxy::PIXEL_MICRO) {
- $url = Contact::getDefaultAvatar($contact, Proxy::SIZE_MICRO);
- } elseif ($customsize <= Proxy::PIXEL_THUMB) {
- $url = Contact::getDefaultAvatar($contact, Proxy::SIZE_THUMB);
- } else {
- $url = Contact::getDefaultAvatar($contact, Proxy::SIZE_SMALL);
}
- return MPhoto::createPhotoForExternalResource($url);
+ $mimetext = '';
+ if (!empty($url)) {
+ $mime = ParseUrl::getContentType($url);
+ if (!empty($mime)) {
+ $mimetext = $mime[0] . '/' . $mime[1];
+ } else {
+ Logger::info('Invalid file', ['url' => $url]);
+ }
+ if (!empty($mimetext) && ($mime[0] != 'image') && ($mimetext != 'application/octet-stream')) {
+ Logger::info('Unexpected Content-Type', ['mime' => $mimetext, 'url' => $url]);
+ $mimetext = '';
+ }
+ }
+ if (empty($mimetext)) {
+ if ($customsize <= Proxy::PIXEL_MICRO) {
+ $url = Contact::getDefaultAvatar($contact, Proxy::SIZE_MICRO);
+ } elseif ($customsize <= Proxy::PIXEL_THUMB) {
+ $url = Contact::getDefaultAvatar($contact, Proxy::SIZE_THUMB);
+ } else {
+ $url = Contact::getDefaultAvatar($contact, Proxy::SIZE_SMALL);
+ }
+ }
+ return MPhoto::createPhotoForExternalResource($url, 0, $mimetext);
case "header":
- $contact = Contact::getById($uid, ['uid', 'url', 'header']);
+ $contact = Contact::getById($id, ['uid', 'url', 'header']);
if (empty($contact)) {
return false;
}
$scale = 5;
}
- $photo = MPhoto::selectFirst([], ["scale" => $scale, "uid" => $uid, "profile" => 1]);
+ $photo = MPhoto::selectFirst([], ["scale" => $scale, "uid" => $id, "profile" => 1]);
if (empty($photo)) {
- $contact = DBA::selectFirst('contact', [], ['uid' => $uid, 'self' => true]) ?: [];
+ $contact = DBA::selectFirst('contact', [], ['uid' => $id, 'self' => true]) ?: [];
switch($type) {
case "profile":
projects / friendica.git / blobdiff