<?php
-
/**
- * @file src/Model/Photo.php
- * This file contains the Photo class for database interface
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
*/
+
namespace Friendica\Model;
use Friendica\Core\Cache\Duration;
-use Friendica\Core\Config;
use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Database\DBA;
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
*
* @return boolean|array
* @throws \Exception
*/
- public static function getPhoto($resourceid, $scale = 0)
+ public static function getPhoto(string $resourceid, int $scale = 0)
{
$r = self::selectFirst(["uid"], ["resource-id" => $resourceid]);
if (!DBA::isResult($r)) {
$uid = $r["uid"];
- $sql_acl = Security::getPermissionsSQLByUserId($uid);
+ $accessible = $uid ? (bool)DI::pConfig()->get($uid, 'system', 'accessible-photos', false) : false;
+
+ $sql_acl = Security::getPermissionsSQLByUserId($uid, $accessible);
$conditions = ["`resource-id` = ? AND `scale` <= ? " . $sql_acl, $resourceid, $scale];
$params = ["order" => ["scale" => true]];
$backend_ref = $storage->put($Image->asString(), $backend_ref);
}
-
$fields = [
"uid" => $uid,
"contact-id" => $cid,
$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];
$key = "photo_albums:".$uid.":".local_user().":".remote_user();
$albums = DI::cache()->get($key);
if (is_null($albums) || $update) {
- if (!Config::get("system", "no_count", false)) {
+ if (!DI::config()->get("system", "no_count", false)) {
/// @todo This query needs to be renewed. It is really slow
// At this time we just store the data in the cache
$albums = q("SELECT COUNT(DISTINCT `resource-id`) AS `total`, `album`, ANY_VALUE(`created`) AS `created`
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);
'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;
}
- /// @todo Check if $str_contact_allow does contain a public forum. Then set the permissions to public.
+ /**
+ * @todo Existing permissions need to be mixed with the new ones.
+ * Otherwise this creates problems with sharing the same picture multiple times
+ * Also check if $str_contact_allow does contain a public forum.
+ * Then set the permissions to public.
+ */
$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]);
Photo::update($fields, $condition);
projects / friendica.git / blobdiff