use Friendica\Object\Image;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Images;
-use Friendica\Util\Network;
-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)
{
$backendClass = DI::storageManager()->getByName($photo['backend-class'] ?? '');
if ($backendClass === null) {
$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;
}
$backend_ref = $storage->put($Image->asString(), $backend_ref);
}
-
$fields = [
"uid" => $uid,
"contact-id" => $cid,
"guid" => $guid,
"resource-id" => $rid,
+ "hash" => md5($Image->asString()),
"created" => $created,
"edited" => DateTimeFormat::utcNow(),
"filename" => basename($filename),
$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 = Network::curl($image_url, true);
+ $ret = DI::httpRequest()->get($image_url);
$img_str = $ret->getBody();
$type = $ret->getContentType();
} else {
return false;
}
- if (empty($type)) {
- $type = Images::guessType($image_url, true);
- }
+ $type = Images::getMimeTypeByData($img_str, $image_url, $type);
$Image = new Image($img_str, $type);
if ($Image->isValid()) {
$Image->scaleToSquare(300);
- $r = self::store($Image, $uid, $cid, $resource_id, $filename, "Contact Photos", 4);
+ $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);
continue;
}
- if (DI::pConfig()->get($uid, 'system', 'accessible-photos')) {
- $condition = ['resource-id' => $image_rid, 'uid' => $uid];
- Logger::info('Set accessibility', ['condition' => $condition]);
- Photo::update(['accessible' => true], $condition);
- }
-
// Ensure to only modify photos that you own
$srch = '<' . intval($original_contact_id) . '>';
- $condition = ["(`allow_cid` = ? OR `allow_cid` IS NULL) AND
- (`allow_gid` = ? OR `allow_gid` IS NULL) AND
- (`deny_cid` = ? OR `deny_cid` IS NULL) AND
- (`deny_gid` = ? OR `deny_gid` IS NULL) AND
- `resource-id` = ? AND `uid` =?", $srch, '', '', '', $image_rid, $uid];
+ $condition = [
+ 'allow_cid' => $srch, 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '',
+ 'resource-id' => $image_rid, 'uid' => $uid
+ ];
if (!Photo::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]);
+ } else {
+ Logger::info('Mismatching permissions', ['condition' => $condition, 'photo' => $photo]);
+ }
continue;
}
*/
$fields = ['allow_cid' => $str_contact_allow, 'allow_gid' => $str_group_allow,
- 'deny_cid' => $str_contact_deny, 'deny_gid' => $str_group_deny];
+ 'deny_cid' => $str_contact_deny, 'deny_gid' => $str_group_deny,
+ 'accessible' => DI::pConfig()->get($uid, 'system', 'accessible-photos', false)];
$condition = ['resource-id' => $image_rid, 'uid' => $uid];
Logger::info('Set permissions', ['condition' => $condition, 'permissions' => $fields]);