* 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

diff --git a/webcit/roomlist.c b/webcit/roomlist.c
index 0c2211fc456db177e09d478c49b966efc48557f2..fe7183db1f28b3ecbfbb78c05dab6b09c80ff471 100644 (file)
--- 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 449057f84ab661ee4e7cc95cbdefa6dbb0e10fa0..4af01682116eebc270d2020db2363d46ac2bd8db 100644 (file)
--- 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 4e770f7c5385b85b4d86718dd3d80235b0d21b30..20bba42813f2e7d02f409f9d1286c57ee879e970 100644 (file)
--- 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 7a84ec05a3a7b7ba8afad0c35bafba227fbd5d76..20225440ef711ff84c80abb306abc0798f2510db 100644 (file)
--- 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);