From a484c6d9c343661892fd6c95e0149289347084ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= <timwolla@arcor.de>
Date: Sat, 3 Mar 2012 22:00:54 +0100
Subject: [PATCH] Adding some more ACL

---
 acloptions.xml                             | 28 ++++++++++++++++++++--
 file/lib/data/chat/room/ChatRoom.class.php |  4 +++-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/acloptions.xml b/acloptions.xml
index e1397d4..5df092e 100644
--- a/acloptions.xml
+++ b/acloptions.xml
@@ -1,9 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <data xmlns="http://www.woltlab.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.woltlab.com http://www.woltlab.com/XSD/maelstrom/aclOption.xsd">
 	<import>
-		<options>
-			<option name="canEnter">
+		<categories>
+			<category name="user">
 				<objecttype>timwolla.wcf.chat.room</objecttype>
+			</category>
+			<category name="mod">
+				<objecttype>timwolla.wcf.chat.room</objecttype>
+			</category>
+		</categories>
+		
+		<options>
+			<option name="user.canEnter">
+				<objecttype>timwolla.wcf.chat.room</objecttype>
+				<categoryname>user</categoryname>
+			</option>
+			<option name="user.canWrite">
+				<objecttype>timwolla.wcf.chat.room</objecttype>
+				<categoryname>user</categoryname>
+			</option>
+			
+			
+			<option name="mod.canAlwaysEnter">
+				<objecttype>timwolla.wcf.chat.room</objecttype>
+				<categoryname>mod</categoryname>
+			</option>
+			<option name="mod.canAlwaysWrite">
+				<objecttype>timwolla.wcf.chat.room</objecttype>
+				<categoryname>mod</categoryname>
 			</option>
 		</options>
 	</import>
diff --git a/file/lib/data/chat/room/ChatRoom.class.php b/file/lib/data/chat/room/ChatRoom.class.php
index e014ec4..03251e5 100644
--- a/file/lib/data/chat/room/ChatRoom.class.php
+++ b/file/lib/data/chat/room/ChatRoom.class.php
@@ -136,6 +136,8 @@ public function getUsers() {
 	 * @return	boolean
 	 */
 	public function canEnter() {
-		return \wcf\system\chat\permission\ChatPermissionHandler::getInstance()->getPermission($this, 'canEnter');
+		$ph = \wcf\system\chat\permission\ChatPermissionHandler::getInstance();
+		
+		return $ph->getPermission($this, 'canEnter') || $ph->getPermission($this, 'canAlwaysEnter');
 	}
 }