From 88522fc832f2057f20c90b4a20f57861442a10a5 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 11 Mar 2020 21:36:29 +0000
Subject: [PATCH 1/2] Set the picture accesibility separate from the
 permissions

---
 src/Model/Photo.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 2ac95e952..67c4fa2ea 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -655,6 +655,12 @@ class Photo
 				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) . '>';
 
@@ -677,10 +683,6 @@ class Photo
 			$fields = ['allow_cid' => $str_contact_allow, 'allow_gid' => $str_group_allow,
 					'deny_cid' => $str_contact_deny, 'deny_gid' => $str_group_deny];
 
-			if (DI::pConfig()->get($uid, 'system', 'accessible-photos')) {
-				$fields['accessible'] = true;
-			}
-
 			$condition = ['resource-id' => $image_rid, 'uid' => $uid];
 			Logger::info('Set permissions', ['condition' => $condition, 'permissions' => $fields]);
 			Photo::update($fields, $condition);

From 7863406080bf4ea1ca73d6ffd49aac315b447b31 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Thu, 12 Mar 2020 06:20:49 +0000
Subject: [PATCH 2/2] Prevent "null" permissions on photos

---
 src/Model/Photo.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 67c4fa2ea..fa3ffe81b 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -298,6 +298,13 @@ class Photo
 			$backend_ref = $storage->put($Image->asString(), $backend_ref);
 		}
 
+		// Prevent "null" permissions
+		if (!empty($uid)) {
+			$allow_cid = $allow_cid ?? '<' . $uid . '>';
+			$allow_gid = $allow_gid ?? '';
+			$deny_cid = $deny_cid ?? '';
+			$deny_gid = $deny_gid ?? '';
+		}
 
 		$fields = [
 			"uid" => $uid,