* @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,
'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);