From 6617fc3bd78bba93864fdb0dbb9be2b79ee518cb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Tue, 8 Sep 2009 18:58:23 +0000 Subject: [PATCH] * add the missing flags --- webcit/roomlist.c | 28 ++++++++++++++++++++++++++-- webcit/webcit.h | 3 +++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/webcit/roomlist.c b/webcit/roomlist.c index e95e8f922..e085a1563 100644 --- a/webcit/roomlist.c +++ b/webcit/roomlist.c @@ -551,6 +551,29 @@ int ConditionalRoomHas_UA_ZAPPED(StrBuf *Target, WCTemplputParams *TP) return (Folder->RAFlags & UA_ZAPPED) != 0; } +int ConditionalRoomHas_UA_POSTALLOWED(StrBuf *Target, WCTemplputParams *TP) +{ + folder *Folder = (folder *)(TP->Context); + return (Folder->RAFlags & UA_POSTALLOWED) != 0; +} + +int ConditionalRoomHas_UA_ADMINALLOWED(StrBuf *Target, WCTemplputParams *TP) +{ + folder *Folder = (folder *)(TP->Context); + return (Folder->RAFlags & UA_ADMINALLOWED) != 0; +} + +int ConditionalRoomHas_UA_DELETEALLOWED(StrBuf *Target, WCTemplputParams *TP) +{ + folder *Folder = (folder *)(TP->Context); + return (Folder->RAFlags & UA_DELETEALLOWED) != 0; +} + + + + + + void jsonRoomFlr(void) { @@ -602,8 +625,9 @@ InitModule_ROOMLIST RegisterConditional(HKEY("COND:ROOM:FLAGS:UA_GOTOALLOWED"), 0, ConditionalRoomHas_UA_GOTOALLOWED, CTX_ROOMS); RegisterConditional(HKEY("COND:ROOM:FLAGS:UA_HASNEWMSGS"), 0, ConditionalRoomHas_UA_HASNEWMSGS, CTX_ROOMS); RegisterConditional(HKEY("COND:ROOM:FLAGS:UA_ZAPPED"), 0, ConditionalRoomHas_UA_ZAPPED, CTX_ROOMS); - - + RegisterConditional(HKEY("COND:ROOM:FLAGS:UA_POSTALLOWED"), 0, ConditionalRoomHas_UA_POSTALLOWED, CTX_ROOMS); + RegisterConditional(HKEY("COND:ROOM:FLAGS:UA_ADMINALLOWED"), 0, ConditionalRoomHas_UA_ADMINALLOWED, CTX_ROOMS); + RegisterConditional(HKEY("COND:ROOM:FLAGS:UA_DELETEALLOWED"), 0, ConditionalRoomHas_UA_DELETEALLOWED, CTX_ROOMS); RegisterSortFunc(HKEY("byfloorroom"), NULL, 0, diff --git a/webcit/webcit.h b/webcit/webcit.h index 619f3b325..a1bef23f2 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -171,6 +171,9 @@ #define UA_GOTOALLOWED 4 #define UA_HASNEWMSGS 8 #define UA_ZAPPED 16 +#define UA_POSTALLOWED 32 +#define UA_ADMINALLOWED 64 +#define UA_DELETEALLOWED 128 /* -- 2.30.2