openrat-cms

commit 08888d1ecfff2bd5db599b6462d98dcbc2866d59
parent 09518638d18e3ea0ced114b8c8b6e727b79edc73
Author: dankert <openrat@jandankert.de>
Date:   Mon,  6 Dec 2021 21:34:53 +0100

Fix: Read ACL for a user.

Diffstat:
M
modules/cms/model/User.class.php
 | 
12
++++++++----

1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/modules/cms/model/User.class.php b/modules/cms/model/User.class.php
@@ -909,14 +909,18 @@ SQL
 		                         ON {{language}}.id={{acl}}.languageid
 		                  WHERE ( 
 										{{acl}}.type = {usertype}  AND {{acl}}.userid={userid}
-									 OR {{acl}}.type = {grouptype} AND $groupClause 
-									 OR ({{acl}}.type = {alltype}
-									 OR ({{acl}}.type = {guesttype}
+									 OR {{acl}}.type = {grouptype} AND ($groupClause) 
+									 OR {{acl}}.type = {alltype}
+									 OR {{acl}}.type = {guesttype}
 						  )
 		                  ORDER BY {{object}}.projectid,{{acl}}.languageid
 SQL
 		);
-		$sql->setInt  ( 'userid'    ,$this->userid );
+		$sql->setInt( 'userid'   ,$this->userid                );
+		$sql->setInt( 'usertype' ,Permission::TYPE_USER  );
+		$sql->setInt( 'grouptype',Permission::TYPE_GROUP );
+		$sql->setInt( 'alltype'  ,Permission::TYPE_AUTH  );
+		$sql->setInt( 'guesttype',Permission::TYPE_GUEST );
 
 		$aclList = array();