<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
use Friendica\Database\DBStructure;
use Friendica\DI;
use Friendica\Model\Storage\SystemResource;
-use Friendica\Network\HTTPRequest;
use Friendica\Object\Image;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Images;
-use Friendica\Util\Security;
+use Friendica\Security\Security;
+use Friendica\Util\Proxy;
use Friendica\Util\Strings;
require_once "include/dba.php";
*/
class Photo
{
+ const CONTACT_PHOTOS = 'Contact Photos';
+
/**
* Select rows from the photo table and returns them as array
*
/**
- * Get Image object for given row id. null if row id does not exist
+ * Get Image data for given row id. null if row id does not exist
*
* @param array $photo Photo data. Needs at least 'id', 'type', 'backend-class', 'backend-ref'
*
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function getImageForPhoto(array $photo)
+ public static function getImageDataForPhoto(array $photo)
{
+ if (!empty($photo['data'])) {
+ return $photo['data'];
+ }
+
$backendClass = DI::storageManager()->getByName($photo['backend-class'] ?? '');
- if ($backendClass === null) {
+ if (empty($backendClass)) {
// legacy data storage in "data" column
$i = self::selectFirst(['data'], ['id' => $photo['id']]);
if ($i === false) {
$backendRef = $photo['backend-ref'] ?? '';
$data = $backendClass->get($backendRef);
}
+ return $data;
+ }
+ /**
+ * Get Image object for given row id. null if row id does not exist
+ *
+ * @param array $photo Photo data. Needs at least 'id', 'type', 'backend-class', 'backend-ref'
+ *
+ * @return \Friendica\Object\Image
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
+ */
+ public static function getImageForPhoto(array $photo)
+ {
+ $data = self::getImageDataForPhoto($photo);
if (empty($data)) {
return null;
}
$storage = DI::storage();
}
- if ($storage === null) {
+ if (empty($storage)) {
$data = $Image->asString();
} else {
$backend_ref = $storage->put($Image->asString(), $backend_ref);
"contact-id" => $cid,
"guid" => $guid,
"resource-id" => $rid,
+ "hash" => md5($Image->asString()),
"created" => $created,
"edited" => DateTimeFormat::utcNow(),
"filename" => basename($filename),
public static function delete(array $conditions, array $options = [])
{
// get photo to delete data info
- $photos = self::selectToArray(['backend-class', 'backend-ref'], $conditions);
+ $photos = DBA::select('photo', ['id', 'backend-class', 'backend-ref'], $conditions);
- foreach($photos as $photo) {
+ while ($photo = DBA::fetch($photos)) {
$backend_class = DI::storageManager()->getByName($photo['backend-class'] ?? '');
- if ($backend_class !== null) {
- $backend_class->delete($photo["backend-ref"] ?? '');
+ if (!empty($backend_class)) {
+ if ($backend_class->delete($photo["backend-ref"] ?? '')) {
+ // Delete the photos after they had been deleted successfully
+ DBA::delete("photo", ['id' => $photo['id']]);
+ }
}
}
+ DBA::close($photos);
+
return DBA::delete("photo", $conditions, $options);
}
foreach($photos as $photo) {
$backend_class = DI::storageManager()->getByName($photo['backend-class'] ?? '');
- if ($backend_class !== null) {
+ if (!empty($backend_class)) {
$fields["backend-ref"] = $backend_class->put($img->asString(), $photo['backend-ref']);
} else {
$fields["data"] = $img->asString();
$micro = "";
$photo = DBA::selectFirst(
- "photo", ["resource-id"], ["uid" => $uid, "contact-id" => $cid, "scale" => 4, "album" => "Contact Photos"]
+ "photo", ["resource-id"], ["uid" => $uid, "contact-id" => $cid, "scale" => 4, "album" => self::CONTACT_PHOTOS]
);
if (!empty($photo['resource-id'])) {
$resource_id = $photo["resource-id"];
$filename = basename($image_url);
if (!empty($image_url)) {
- $ret = HTTPRequest::curl($image_url, true);
+ $ret = DI::httpRequest()->get($image_url);
$img_str = $ret->getBody();
$type = $ret->getContentType();
} else {
if ($Image->isValid()) {
$Image->scaleToSquare(300);
- $r = self::store($Image, $uid, $cid, $resource_id, $filename, "Contact Photos", 4);
+ $filesize = strlen($Image->asString());
+ $maximagesize = DI::config()->get('system', 'maximagesize');
+ if (!empty($maximagesize) && ($filesize > $maximagesize)) {
+ Logger::info('Avatar exceeds image limit', ['uid' => $uid, 'cid' => $cid, 'maximagesize' => $maximagesize, 'size' => $filesize, 'type' => $Image->getType()]);
+ if ($Image->getType() == 'image/gif') {
+ $Image->toStatic();
+ $Image = new Image($Image->asString(), 'image/png');
+
+ $filesize = strlen($Image->asString());
+ Logger::info('Converted gif to a static png', ['uid' => $uid, 'cid' => $cid, 'size' => $filesize, 'type' => $Image->getType()]);
+ }
+ if ($filesize > $maximagesize) {
+ foreach ([160, 80] as $pixels) {
+ if ($filesize > $maximagesize) {
+ Logger::info('Resize', ['uid' => $uid, 'cid' => $cid, 'size' => $filesize, 'max' => $maximagesize, 'pixels' => $pixels, 'type' => $Image->getType()]);
+ $Image->scaleDown($pixels);
+ $filesize = strlen($Image->asString());
+ }
+ }
+ }
+ Logger::info('Avatar is resized', ['uid' => $uid, 'cid' => $cid, 'size' => $filesize, 'type' => $Image->getType()]);
+ }
+
+ $r = self::store($Image, $uid, $cid, $resource_id, $filename, self::CONTACT_PHOTOS, 4);
if ($r === false) {
$photo_failure = true;
$Image->scaleDown(80);
- $r = self::store($Image, $uid, $cid, $resource_id, $filename, "Contact Photos", 5);
+ $r = self::store($Image, $uid, $cid, $resource_id, $filename, self::CONTACT_PHOTOS, 5);
if ($r === false) {
$photo_failure = true;
$Image->scaleDown(48);
- $r = self::store($Image, $uid, $cid, $resource_id, $filename, "Contact Photos", 6);
+ $r = self::store($Image, $uid, $cid, $resource_id, $filename, self::CONTACT_PHOTOS, 6);
if ($r === false) {
$photo_failure = true;
}
if ($photo_failure) {
- $image_url = DI::baseUrl() . "/images/person-300.jpg";
- $thumb = DI::baseUrl() . "/images/person-80.jpg";
- $micro = DI::baseUrl() . "/images/person-48.jpg";
+ $contact = Contact::getById($cid) ?: [];
+ $image_url = Contact::getDefaultAvatar($contact, Proxy::SIZE_SMALL);
+ $thumb = Contact::getDefaultAvatar($contact, Proxy::SIZE_THUMB);
+ $micro = Contact::getDefaultAvatar($contact, Proxy::SIZE_MICRO);
}
return [$image_url, $thumb, $micro];
WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' $sql_extra
GROUP BY `album` ORDER BY `created` DESC",
intval($uid),
- DBA::escape("Contact Photos"),
- DBA::escape(DI::l10n()->t("Contact Photos"))
+ DBA::escape(self::CONTACT_PHOTOS),
+ DBA::escape(DI::l10n()->t(self::CONTACT_PHOTOS))
);
} else {
// This query doesn't do the count and is much faster
FROM `photo` USE INDEX (`uid_album_scale_created`)
WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' $sql_extra",
intval($uid),
- DBA::escape("Contact Photos"),
- DBA::escape(DI::l10n()->t("Contact Photos"))
+ DBA::escape(self::CONTACT_PHOTOS),
+ DBA::escape(DI::l10n()->t(self::CONTACT_PHOTOS))
);
}
DI::cache()->set($key, $albums, Duration::DAY);
projects / friendica.git / blobdiff