From b059002a6a751837ca5af47b2d18e190a1fa6daf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Wed, 11 Aug 2010 11:15:27 +0000 Subject: [PATCH] * templatize zap room list * GetRoomListHashLKRA(): if we send something to the server, we need to read the reply. --- webcit/roomlist.c | 16 +++++++++++++++- webcit/static/t/menu/advanced_roomcommands.html | 3 ++- webcit/static/t/room/zap_entry.html | 6 ++++++ webcit/static/t/room/zapped_list.html | 11 +++++++++++ 4 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 webcit/static/t/room/zap_entry.html create mode 100644 webcit/static/t/room/zapped_list.html diff --git a/webcit/roomlist.c b/webcit/roomlist.c index f4edff91b..05b08bcc2 100644 --- a/webcit/roomlist.c +++ b/webcit/roomlist.c @@ -125,12 +125,24 @@ HashList *GetRoomListHashLKRA(StrBuf *Target, WCTemplputParams *TP) if (WCC->Floors == NULL) GetFloorListHash(Target, TP); - serv_puts("LKRA"); if (WCC->Rooms == NULL) + { + serv_puts("LKRA"); WCC->Rooms = GetRoomListHash(Target, TP); + } return WCC->Rooms; } +HashList *GetZappedRoomListHash(StrBuf *Target, WCTemplputParams *TP) +{ + wcsession *WCC = WC; + + if (WCC->Floors == NULL) + GetFloorListHash(Target, TP); + serv_puts("LZRM -1"); + return GetRoomListHash(Target, TP); +} + void FlushFolder(folder *room) { int i; @@ -843,6 +855,8 @@ InitModule_ROOMLIST RegisterIterator("LFLR", 0, NULL, GetFloorListHash, NULL, NULL, CTX_FLOORS, CTX_NONE, IT_FLAG_DETECT_GROUPCHANGE); RegisterIterator("LKRA", 0, NULL, GetRoomListHashLKRA, NULL, NULL, CTX_ROOMS, CTX_NONE, IT_FLAG_DETECT_GROUPCHANGE); + RegisterIterator("LZRM", 0, NULL, GetZappedRoomListHash, NULL, DeleteHash, CTX_ROOMS, CTX_NONE, IT_FLAG_DETECT_GROUPCHANGE); + RegisterNamespace("ROOM:INFO:FLOORID", 0, 1, tmplput_ROOM_FLOORID, NULL, CTX_ROOMS); RegisterNamespace("ROOM:INFO:NAME", 0, 1, tmplput_ROOM_NAME, NULL, CTX_ROOMS); diff --git a/webcit/static/t/menu/advanced_roomcommands.html b/webcit/static/t/menu/advanced_roomcommands.html index 82e5ddf45..b33760ca1 100644 --- a/webcit/static/t/menu/advanced_roomcommands.html +++ b/webcit/static/t/menu/advanced_roomcommands.html @@ -6,5 +6,6 @@
    • -
    • +
    • +
  • (old)
    • diff --git a/webcit/static/t/room/zap_entry.html b/webcit/static/t/room/zap_entry.html new file mode 100644 index 000000000..f4be9a6af --- /dev/null +++ b/webcit/static/t/room/zap_entry.html @@ -0,0 +1,6 @@ + ">"> + +<?_("> +<?_("> + +
    diff --git a/webcit/static/t/room/zapped_list.html b/webcit/static/t/room/zapped_list.html new file mode 100644 index 000000000..070569676 --- /dev/null +++ b/webcit/static/t/room/zapped_list.html @@ -0,0 +1,11 @@ + + +
    + + + + +
    + -- 2.30.2