X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FPhoto.php;h=d9e6f7cadebb8c54688cce3f531d15d5e025da54;hb=624e4c192c7f837ac0587a50da6e1409081eb519;hp=d1ec2e6e751d1066740d7520688e42d1c437dceb;hpb=9414edd64a714b115780df9ef6a7375c9d69c050;p=friendica.git diff --git a/src/Model/Photo.php b/src/Model/Photo.php index d1ec2e6e75..d9e6f7cade 100644 --- a/src/Model/Photo.php +++ b/src/Model/Photo.php @@ -32,6 +32,7 @@ use Friendica\Core\Storage\Exception\InvalidClassStorageException; use Friendica\Core\Storage\Exception\ReferenceStorageException; use Friendica\Core\Storage\Exception\StorageException; use Friendica\Core\Storage\Type\SystemResource; +use Friendica\Network\HTTPClient\Client\HttpClientAccept; use Friendica\Object\Image; use Friendica\Util\DateTimeFormat; use Friendica\Util\Images; @@ -497,7 +498,8 @@ class Photo $filename = basename($image_url); if (!empty($image_url)) { - $ret = DI::httpClient()->get($image_url); + $ret = DI::httpClient()->get($image_url, HttpClientAccept::IMAGE); + Logger::debug('Got picture', ['Content-Type' => $ret->getHeader('Content-Type'), 'url' => $image_url]); $img_str = $ret->getBody(); $type = $ret->getContentType(); } else { @@ -633,7 +635,8 @@ class Photo { $sql_extra = Security::getPermissionsSQLByUserId($uid); - $avatar_type = (local_user() && (local_user() == $uid)) ? Photo::USER_AVATAR : Photo::DEFAULT; + $avatar_type = (local_user() && (local_user() == $uid)) ? self::USER_AVATAR : self::DEFAULT; + $banner_type = (local_user() && (local_user() == $uid)) ? self::USER_BANNER : self::DEFAULT; $key = "photo_albums:".$uid.":".local_user().":".remote_user(); $albums = DI::cache()->get($key); @@ -643,19 +646,21 @@ class Photo // At this time we just store the data in the cache $albums = DBA::toArray(DBA::p("SELECT COUNT(DISTINCT `resource-id`) AS `total`, `album`, ANY_VALUE(`created`) AS `created` FROM `photo` - WHERE `uid` = ? AND `photo-type` IN (?, ?) $sql_extra + WHERE `uid` = ? AND `photo-type` IN (?, ?, ?) $sql_extra GROUP BY `album` ORDER BY `created` DESC", $uid, self::DEFAULT, + $banner_type, $avatar_type )); } else { // This query doesn't do the count and is much faster $albums = DBA::toArray(DBA::p("SELECT DISTINCT(`album`), '' AS `total` FROM `photo` USE INDEX (`uid_album_scale_created`) - WHERE `uid` = ? AND `photo-type` IN (?, ?) $sql_extra", + WHERE `uid` = ? AND `photo-type` IN (?, ?, ?) $sql_extra", $uid, self::DEFAULT, + $banner_type, $avatar_type )); } @@ -699,10 +704,19 @@ class Photo } $image_uri = substr($image_uri, strrpos($image_uri, '/') + 1); $image_uri = substr($image_uri, 0, strpos($image_uri, '-')); - if (!strlen($image_uri)) { - return ''; - } - return $image_uri; + return trim($image_uri); + } + + /** + * Checks if the given URL is a local photo. + * Since it is meant for time critical occasions, the check is done without any database requests. + * + * @param string $url + * @return boolean + */ + public static function isPhotoURI(string $url): bool + { + return !empty(self::ridFromURI($url)); } /** @@ -743,7 +757,7 @@ class Photo 'allow_cid' => $srch, 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '', 'resource-id' => $image_rid, 'uid' => $uid ]; - if (!Photo::exists($condition)) { + if (!self::exists($condition)) { $photo = self::selectFirst(['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'uid'], ['resource-id' => $image_rid]); if (!DBA::isResult($photo)) { Logger::info('Image not found', ['resource-id' => $image_rid]); @@ -786,7 +800,7 @@ class Photo $condition = ['resource-id' => $image_rid, 'uid' => $uid]; Logger::info('Set permissions', ['condition' => $condition, 'permissions' => $fields]); - Photo::update($fields, $condition); + self::update($fields, $condition); } /** @@ -871,6 +885,70 @@ class Photo return DBA::exists('photo', ['resource-id' => $guid]); } + private static function fitImageSize($Image) + { + $max_length = DI::config()->get('system', 'max_image_length'); + if ($max_length > 0) { + $Image->scaleDown($max_length); + Logger::info('File upload: Scaling picture to new size', ['max-length' => $max_length]); + } + + $filesize = strlen($Image->asString()); + $width = $Image->getWidth(); + $height = $Image->getHeight(); + + $maximagesize = DI::config()->get('system', 'maximagesize'); + + if (!empty($maximagesize) && ($filesize > $maximagesize)) { + // Scale down to multiples of 640 until the maximum size isn't exceeded anymore + foreach ([5120, 2560, 1280, 640] as $pixels) { + if (($filesize > $maximagesize) && (max($width, $height) > $pixels)) { + Logger::info('Resize', ['size' => $filesize, 'width' => $width, 'height' => $height, 'max' => $maximagesize, 'pixels' => $pixels]); + $Image->scaleDown($pixels); + $filesize = strlen($Image->asString()); + $width = $Image->getWidth(); + $height = $Image->getHeight(); + } + } + if ($filesize > $maximagesize) { + Logger::notice('Image size is too big', ['size' => $filesize, 'max' => $maximagesize]); + return null; + } + } + + return $Image; + } + + private static function loadImageFromURL(string $image_url) + { + $filename = basename($image_url); + if (!empty($image_url)) { + $ret = DI::httpClient()->get($image_url, HttpClientAccept::IMAGE); + Logger::debug('Got picture', ['Content-Type' => $ret->getHeader('Content-Type'), 'url' => $image_url]); + $img_str = $ret->getBody(); + $type = $ret->getContentType(); + } else { + $img_str = ''; + $type = ''; + } + + if (empty($img_str)) { + Logger::notice('Empty content'); + return []; + } + + $type = Images::getMimeTypeByData($img_str, $image_url, $type); + + $Image = new Image($img_str, $type); + + $Image = self::fitImageSize($Image); + if (empty($Image)) { + return []; + } + + return ['image' => $Image, 'filename' => $filename]; + } + private static function uploadImage(array $files) { Logger::info('starting new upload'); @@ -939,46 +1017,28 @@ class Photo $Image->orient($src); @unlink($src); - $max_length = DI::config()->get('system', 'max_image_length'); - if ($max_length > 0) { - $Image->scaleDown($max_length); - $filesize = strlen($Image->asString()); - Logger::info('File upload: Scaling picture to new size', ['max-length' => $max_length]); - } - - $width = $Image->getWidth(); - $height = $Image->getHeight(); - - $maximagesize = DI::config()->get('system', 'maximagesize'); - - if (!empty($maximagesize) && ($filesize > $maximagesize)) { - // Scale down to multiples of 640 until the maximum size isn't exceeded anymore - foreach ([5120, 2560, 1280, 640] as $pixels) { - if (($filesize > $maximagesize) && (max($width, $height) > $pixels)) { - Logger::info('Resize', ['size' => $filesize, 'width' => $width, 'height' => $height, 'max' => $maximagesize, 'pixels' => $pixels]); - $Image->scaleDown($pixels); - $filesize = strlen($Image->asString()); - $width = $Image->getWidth(); - $height = $Image->getHeight(); - } - } - if ($filesize > $maximagesize) { - @unlink($src); - Logger::notice('Image size is too big', ['size' => $filesize, 'max' => $maximagesize]); - return []; - } + $Image = self::fitImageSize($Image); + if (empty($Image)) { + return []; } - return ['image' => $Image, 'filename' => $filename, 'width' => $width, 'height' => $height]; + return ['image' => $Image, 'filename' => $filename]; } /** - * - * @param int $uid User ID - * @param array $files uploaded file array + * @param int $uid User ID + * @param array $files uploaded file array + * @param string $album + * @param string|null $allow_cid + * @param string|null $allow_gid + * @param string $deny_cid + * @param string $deny_gid + * @param string $desc + * @param string $resource_id * @return array photo record + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function upload(int $uid, array $files, string $album = '', string $allow_cid = null, string $allow_gid = null, string $deny_cid = '', string $deny_gid = '', string $desc = '', string $resource_id = '') + public static function upload(int $uid, array $files, string $album = '', string $allow_cid = null, string $allow_gid = null, string $deny_cid = '', string $deny_gid = '', string $desc = '', string $resource_id = ''): array { $user = User::getOwnerDataById($uid); if (empty($user)) { @@ -994,10 +1054,10 @@ class Photo $Image = $data['image']; $filename = $data['filename']; - $width = $data['width']; - $height = $data['height']; + $width = $Image->getWidth(); + $height = $Image->getHeight(); - $resource_id = $resource_id ?: Photo::newResource(); + $resource_id = $resource_id ?: self::newResource(); $album = $album ?: DI::l10n()->t('Wall Photos'); if (is_null($allow_cid) && is_null($allow_gid)) { @@ -1048,32 +1108,44 @@ class Photo $picture['picture'] = DI::baseUrl() . '/photo/{$resource_id}-0.' . $Image->getExt(); $picture['preview'] = DI::baseUrl() . '/photo/{$resource_id}-{$smallest}.' . $Image->getExt(); - $Image->__destruct(); - Logger::info('upload done', ['picture' => $picture]); return $picture; } /** + * Upload a user avatar * - * @param int $uid User ID - * @param array $files uploaded file array + * @param int $uid User ID + * @param array $files uploaded file array + * @param string $url External image url * @return string avatar resource */ - public static function uploadAvatar(int $uid, array $files) + public static function uploadAvatar(int $uid, array $files, string $url = ''): string { - $data = self::uploadImage($files); - if (empty($data)) { - return []; + if (!empty($files)) { + $data = self::uploadImage($files); + if (empty($data)) { + Logger::info('upload failed'); + return ''; + } + } elseif (!empty($url)) { + $data = self::loadImageFromURL($url); + if (empty($data)) { + Logger::info('loading from external url failed'); + return ''; + } + } else { + Logger::info('Neither files nor url provided'); + return ''; } $Image = $data['image']; $filename = $data['filename']; - $width = $data['width']; - $height = $data['height']; + $width = $Image->getWidth(); + $height = $Image->getHeight(); - $resource_id = Photo::newResource(); - $album = DI::l10n()->t(Photo::PROFILE_PHOTOS); + $resource_id = self::newResource(); + $album = DI::l10n()->t(self::PROFILE_PHOTOS); // upload profile image (scales 4, 5, 6) logger::info('starting new profile image upload'); @@ -1082,7 +1154,7 @@ class Photo $Image->scaleDown(300); } - $r = Photo::store($Image, $uid, 0, $resource_id, $filename, $album, 4, Photo::USER_AVATAR); + $r = self::store($Image, $uid, 0, $resource_id, $filename, $album, 4, self::USER_AVATAR); if (!$r) { logger::notice('profile image upload with scale 4 (300) failed'); } @@ -1091,7 +1163,7 @@ class Photo $Image->scaleDown(80); } - $r = Photo::store($Image, $uid, 0, $resource_id, $filename, $album, 5, Photo::USER_AVATAR); + $r = self::store($Image, $uid, 0, $resource_id, $filename, $album, 5, self::USER_AVATAR); if (!$r) { logger::notice('profile image upload with scale 5 (80) failed'); } @@ -1100,16 +1172,15 @@ class Photo $Image->scaleDown(48); } - $r = Photo::store($Image, $uid, 0, $resource_id, $filename, $album, 6, Photo::USER_AVATAR); + $r = self::store($Image, $uid, 0, $resource_id, $filename, $album, 6, self::USER_AVATAR); if (!$r) { logger::notice('profile image upload with scale 6 (48) failed'); } - $Image->__destruct(); logger::info('new profile image upload ended'); $condition = ["`profile` AND `resource-id` != ? AND `uid` = ?", $resource_id, $uid]; - Photo::update(['profile' => false, 'photo-type' => Photo::DEFAULT], $condition); + self::update(['profile' => false, 'photo-type' => self::DEFAULT], $condition); Contact::updateSelfFromUserID($uid, true); @@ -1120,26 +1191,39 @@ class Photo } /** + * Upload a user banner * - * @param int $uid User ID - * @param array $files uploaded file array + * @param int $uid User ID + * @param array $files uploaded file array + * @param string $url External image url * @return string avatar resource */ - public static function uploadBanner(int $uid, array $files) + public static function uploadBanner(int $uid, array $files = [], string $url = ''): string { - $data = self::uploadImage($files); - if (empty($data)) { - Logger::info('upload failed'); - return []; + if (!empty($files)) { + $data = self::uploadImage($files); + if (empty($data)) { + Logger::info('upload failed'); + return ''; + } + } elseif (!empty($url)) { + $data = self::loadImageFromURL($url); + if (empty($data)) { + Logger::info('loading from external url failed'); + return ''; + } + } else { + Logger::info('Neither files nor url provided'); + return ''; } $Image = $data['image']; $filename = $data['filename']; - $width = $data['width']; - $height = $data['height']; + $width = $Image->getWidth(); + $height = $Image->getHeight(); - $resource_id = Photo::newResource(); - $album = DI::l10n()->t(Photo::BANNER_PHOTOS); + $resource_id = self::newResource(); + $album = DI::l10n()->t(self::BANNER_PHOTOS); if ($width > 960) { $Image->scaleDown(960); @@ -1150,11 +1234,10 @@ class Photo logger::notice('profile banner upload with scale 3 (960) failed'); } - $Image->__destruct(); logger::info('new profile banner upload ended'); $condition = ["`photo-type` = ? AND `resource-id` != ? AND `uid` = ?", self::USER_BANNER, $resource_id, $uid]; - Photo::update(['photo-type' => Photo::DEFAULT], $condition); + self::update(['photo-type' => self::DEFAULT], $condition); Contact::updateSelfFromUserID($uid, true);