From 54bce84628085e28f3a14b7d1d3ea6a4adabeecf Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Fri, 18 Dec 2009 08:07:02 +0000
Subject: [PATCH] * by matt:   * add RA-Flags token   * use RA flags to detect
 whether a room has new messages or not in the room treeview; this was using
 QRFlags by mistake

---
 webcit/roomlist.c              | 6 ++++++
 webcit/static/roomops.js       | 1 +
 webcit/static/t/json_room.html | 2 +-
 webcit/static/wclib.js         | 3 ++-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/webcit/roomlist.c b/webcit/roomlist.c
index 0c2211fc4..fe7183db1 100644
--- a/webcit/roomlist.c
+++ b/webcit/roomlist.c
@@ -482,6 +482,11 @@ void tmplput_ROOM_QRFLAGS(StrBuf *Target, WCTemplputParams *TP)
 	StrBufAppendPrintf(Target, "%d", Folder->QRFlags);
 }
 
+void tmplput_ROOM_RAFLAGS(StrBuf *Target, WCTemplputParams *TP) 
+{
+	folder *Folder = (folder *)(TP->Context);
+	StrBufAppendPrintf(Target, "%d", Folder->RAFlags);
+}
 
 
 void tmplput_ROOM_FLOORID(StrBuf *Target, WCTemplputParams *TP) 
@@ -736,6 +741,7 @@ InitModule_ROOMLIST
 
 	RegisterNamespace("ROOM:INFO:ACL", 0, 1, tmplput_ROOM_ACL, NULL, CTX_ROOMS);
 	RegisterNamespace("ROOM:INFO:QRFLAGS", 0, 1, tmplput_ROOM_QRFLAGS, NULL, CTX_ROOMS);
+	RegisterNamespace("ROOM:INFO:RAFLAGS", 0, 1, tmplput_ROOM_RAFLAGS, NULL, CTX_ROOMS);
 	RegisterNamespace("ROOM:INFO:LISTORDER", 0, 1, tmplput_ROOM_LISTORDER, NULL, CTX_ROOMS);
 	RegisterNamespace("ROOM:INFO:VIEW", 0, 1, tmplput_ROOM_VIEW, NULL, CTX_ROOMS);
 	RegisterNamespace("ROOM:INFO:DEFVIEW", 0, 1, tmplput_ROOM_DEFVIEW, NULL, CTX_ROOMS);
diff --git a/webcit/static/roomops.js b/webcit/static/roomops.js
index 449057f84..4af016821 100644
--- a/webcit/static/roomops.js
+++ b/webcit/static/roomops.js
@@ -20,6 +20,7 @@ var RN_ACCESS_CONTROL = 4;
 var RN_CUR_VIEW = 5;
 var RN_DEF_VIEW = 6;
 var RN_LAST_CHANGE = 7;
+var RN_RAFLAGS = 8;
 
 var QR_PRIVATE = 4;
 var QR_MAILBOX = 16384;
diff --git a/webcit/static/t/json_room.html b/webcit/static/t/json_room.html
index 4e770f7c5..20bba4281 100644
--- a/webcit/static/t/json_room.html
+++ b/webcit/static/t/json_room.html
@@ -1 +1 @@
-["<?ROOM:INFO:NAME("J")>", <?ROOM:INFO:QRFLAGS>, <?ROOM:INFO:FLOORID>, <?ROOM:INFO:LISTORDER>,<?ROOM:INFO:ACL("J")>, <?ROOM:INFO:VIEW>, <?ROOM:INFO:DEFVIEW>, <?ROOM:INFO:LASTCHANGE>] <?%("COND:ITERATE:LASTN", 1, 1, 0, "", " ,")>
+["<?ROOM:INFO:NAME("J")>", <?ROOM:INFO:QRFLAGS>, <?ROOM:INFO:FLOORID>, <?ROOM:INFO:LISTORDER>,<?ROOM:INFO:ACL("J")>, <?ROOM:INFO:VIEW>, <?ROOM:INFO:DEFVIEW>, <?ROOM:INFO:LASTCHANGE>, <?ROOM:INFO:RAFLAGS> ] <?%("COND:ITERATE:LASTN", 1, 1, 0, "", " ,")>
diff --git a/webcit/static/wclib.js b/webcit/static/wclib.js
index 7a84ec05a..20225440e 100644
--- a/webcit/static/wclib.js
+++ b/webcit/static/wclib.js
@@ -282,8 +282,9 @@ function addRoomToList(floorUL,room, roomToEmphasize) {
   var flag = room[RN_ROOM_FLAG];
   var curView = room[RN_CUR_VIEW];
   var view = room[RN_DEF_VIEW];
+  var raflags = room[RN_RAFLAGS];
   var isMailBox = ((flag & QR_MAILBOX) == QR_MAILBOX);
-  var hasNewMsgs = ((curView & UA_HASNEWMSGS) == UA_HASNEWMSGS);
+  var hasNewMsgs = ((raflags & UA_HASNEWMSGS) == UA_HASNEWMSGS);
   var roomLI = document.createElement("li");
   var roomA = document.createElement("a");
   roomA.setAttribute("href","dotgoto?room="+roomName);
-- 
2.30.2