X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FPermissionSet.php;h=c9a0697ebc9800ee3a42eadfed7e0648174dc542;hb=5f9edf32d2bb2e7b8ad082d3df6b57fc04514cbb;hp=20848c04d3b2ea6fdc56d9babc67f62e79a9728b;hpb=986106a8f7d0b58a2b2834b082301a426bc98999;p=friendica.git

diff --git a/src/Model/PermissionSet.php b/src/Model/PermissionSet.php
index 20848c04d3..c9a0697ebc 100644
--- a/src/Model/PermissionSet.php
+++ b/src/Model/PermissionSet.php
@@ -7,8 +7,6 @@ namespace Friendica\Model;
 use Friendica\BaseObject;
 use Friendica\Database\DBA;
 
-require_once 'include/dba.php';
-
 /**
  * @brief functions for interacting with the permission set of an object (item, photo, event, ...)
  */
@@ -18,20 +16,16 @@ class PermissionSet extends BaseObject
 	 * Fetch the id of a given permission set. Generate a new one when needed
 	 *
 	 * @param array $postarray The array from an item, picture or event post
-	 * @return id
+	 * @return int id
+	 * @throws \Exception
 	 */
 	public static function fetchIDForPost(&$postarray)
 	{
-		if (is_null($postarray['allow_cid']) || is_null($postarray['allow_gid'])
-			|| is_null($postarray['deny_cid']) || is_null($postarray['deny_gid'])) {
-			return null;
-		}
-
 		$condition = ['uid' => $postarray['uid'],
-			'allow_cid' => self::sortPermissions(defaults($postarray, 'allow_cid', '')),
-			'allow_gid' => self::sortPermissions(defaults($postarray, 'allow_gid', '')),
-			'deny_cid' => self::sortPermissions(defaults($postarray, 'deny_cid', '')),
-			'deny_gid' => self::sortPermissions(defaults($postarray, 'deny_gid', ''))];
+			'allow_cid' => self::sortPermissions($postarray['allow_cid'] ?? ''),
+			'allow_gid' => self::sortPermissions($postarray['allow_gid'] ?? ''),
+			'deny_cid'  => self::sortPermissions($postarray['deny_cid']  ?? ''),
+			'deny_gid'  => self::sortPermissions($postarray['deny_gid']  ?? '')];
 
 		$set = DBA::selectFirst('permissionset', ['id'], $condition);
 
@@ -41,7 +35,6 @@ class PermissionSet extends BaseObject
 			$set = DBA::selectFirst('permissionset', ['id'], $condition);
 		}
 
-
 		$postarray['allow_cid'] = null;
 		$postarray['allow_gid'] = null;
 		$postarray['deny_cid'] = null;
@@ -74,20 +67,20 @@ class PermissionSet extends BaseObject
 	 *
 	 * @param integer $uid        User id whom the items belong
 	 * @param integer $contact_id Contact id of the visitor
-	 * @param array   $groups     Possibly previously fetched group ids for that contact
 	 *
 	 * @return array of permission set ids.
+	 * @throws \Exception
 	 */
-
-	static public function get($uid, $contact_id, $groups = null)
+	static public function get($uid, $contact_id)
 	{
-		if (empty($groups) && DBA::exists('contact', ['id' => $contact_id, 'uid' => $uid, 'blocked' => false])) {
+		if (DBA::exists('contact', ['id' => $contact_id, 'uid' => $uid, 'blocked' => false])) {
 			$groups = Group::getIdsByContactId($contact_id);
 		}
 
 		if (empty($groups) || !is_array($groups)) {
 			return [];
 		}
+
 		$group_str = '<<>>'; // should be impossible to match
 
 		foreach ($groups as $g) {
@@ -96,11 +89,9 @@ class PermissionSet extends BaseObject
 
 		$contact_str = '<' . $contact_id . '>';
 
-		$condition = ["`uid` = ? AND (`allow_cid` = '' OR`allow_cid` REGEXP ?)
-			AND (`deny_cid` = '' OR NOT `deny_cid` REGEXP ?)
-			AND (`allow_gid` = '' OR `allow_gid` REGEXP ?)
-			AND (`deny_gid` = '' OR NOT `deny_gid` REGEXP ?)",
-			$uid, $contact_str, $contact_str, $group_str, $group_str];
+		$condition = ["`uid` = ? AND (NOT (`deny_cid` REGEXP ? OR deny_gid REGEXP ?)
+			AND (allow_cid REGEXP ? OR allow_gid REGEXP ? OR (allow_cid = '' AND allow_gid = '')))",
+			$uid, $contact_str, $group_str, $contact_str, $group_str];
 
 		$ret = DBA::select('permissionset', ['id'], $condition);
 		$set = [];
@@ -108,7 +99,6 @@ class PermissionSet extends BaseObject
 			$set[] = $permission['id'];
 		}
 		DBA::close($ret);
-		logger('Blubb: '.$uid.' - '.$contact_id.': '.implode(', ', $set));
 
 		return $set;
 	}