* add COND:FLOOR:ISSUBROOM to detect whether the current room is on thet floor we...

diff --git a/webcit/roomlist.c b/webcit/roomlist.c
index 9b00be970c27c1b4258bd4c20a58b96a307005b6..72335f5255a957fe799db5166df30b52e54bec56 100644 (file)
--- a/webcit/roomlist.c
+++ b/webcit/roomlist.c
@@ -716,6 +716,15 @@ int ConditionalFloorIsRESTSubFloor(StrBuf *Target, WCTemplputParams *TP)
 }
 
 
+int ConditionalFloorIsSUBROOM(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession  *WCC = WC;
+       Floor *MyFloor = (Floor *)CTX;
+
+       return WCC->CurRoom.floorid == MyFloor->ID;
+}
+
+
 int ConditionalRoomIsRESTSubRoom(StrBuf *Target, WCTemplputParams *TP)
 {
        wcsession  *WCC = WC;
@@ -831,6 +840,7 @@ InitModule_ROOMLIST
        RegisterNamespace("FLOOR:ID", 0, 0, tmplput_FLOOR_ID, NULL, CTX_FLOORS);
        RegisterNamespace("FLOOR:NAME", 0, 1, tmplput_FLOOR_NAME, NULL, CTX_FLOORS);
        RegisterNamespace("FLOOR:NROOMS", 0, 0, tmplput_FLOOR_NROOMS, NULL, CTX_FLOORS);
+       RegisterConditional(HKEY("COND:FLOOR:ISSUBROOM"), 0, ConditionalFloorIsSUBROOM, CTX_FLOORS);
        RegisterConditional(HKEY("COND:ROOM:REST:ISSUBFLOOR"), 0, ConditionalFloorIsRESTSubFloor, CTX_FLOORS);
 
        RegisterIterator("ITERATE:THISROOM:GNET", 1, NULL, GetNetConfigHash, NULL, NULL, CTX_STRBUF, CTX_NONE, IT_NOFLAG);