* shuffle arround the whole room stuff. we now have:
authorWilfried Göesgens <willi@citadel.org>
Thu, 26 Aug 2010 21:51:44 +0000 (21:51 +0000)
committerWilfried Göesgens <willi@citadel.org>
Thu, 26 Aug 2010 21:51:44 +0000 (21:51 +0000)
  * roomops.c : handlers; load / save / edit / goto etc. rooms, floors
  * roomlist.c : load lists from the server, sort them.
  * roomviews.c : view properties
  * roomtoknes.c : room & floor tokens & conditionals

webcit/Makefile.in
webcit/marchlist.c
webcit/roomlist.c
webcit/roomops.c
webcit/roomops.h
webcit/static/t/json/floors.html
webcit/webcit.c
webcit/webcit.h

index 7ef54a695cb271220451322c2634db0ac6896b14..8ee2c4e10d4b4ec5fd5be2e9f27da08239052188 100644 (file)
@@ -48,7 +48,8 @@ setup: setup.o gettext.o
 webcit: webserver.o context_loop.o ical_dezonify.o \
        cookie_conversion.o locate_host.o summary.o \
        webcit.o auth.o tcp_sockets.o mainmenu.o serv_func.o who.o marchlist.o \
-       roomops.o roomlist.o messages.o msg_renderers.o userlist.o paging.o sysmsgs.o \
+       roomops.o roomlist.o roomtokens.o roomviews.o \
+       messages.o msg_renderers.o userlist.o paging.o sysmsgs.o \
        useredit.o vcard_edit.o preferences.o html2html.o listsub.o roomchat.o \
        graphics.o netconf.o siteconfig.o subst.o bbsview_renderer.o \
        calendar.o calendar_tools.o calendar_view.o tasks.o event.o smtpqueue.o \
@@ -63,7 +64,8 @@ webcit: webserver.o context_loop.o ical_dezonify.o \
        $(CC) $(LDFLAGS) -o webcit $(LIBOBJS) \
        webserver.o context_loop.o cookie_conversion.o marchlist.o \
        webcit.o auth.o tcp_sockets.o mainmenu.o serv_func.o who.o listsub.o \
-       roomops.o roomlist.o messages.o msg_renderers.o userlist.o paging.o sysmsgs.o \
+       roomops.o roomlist.o roomtokens.o roomviews.o  \
+       messages.o msg_renderers.o userlist.o paging.o sysmsgs.o \
        useredit.o locate_host.o siteconfig.o subst.o vcard_edit.o roomchat.o \
        graphics.o netconf.o preferences.o html2html.o openid.o bbsview_renderer.o \
        summary.o calendar.o calendar_tools.o calendar_view.o tasks.o event.o wiki.o \
index 72d8d71c7c295f4127f6ebb85c7483ee07ffd66e..bcfbb4872924e06ac2e52aa852d4cb9fedd6645d 100644 (file)
@@ -215,6 +215,15 @@ void ungoto(void)
 
 
 
+void tmplput_ungoto(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+
+       if ((WCC!=NULL) && 
+           (!IsEmptyStr(WCC->ugname)))
+               StrBufAppendBufPlain(Target, WCC->ugname, -1, 0);
+}
+
 void _gotonext(void) {
        slrp_highest();
        gotonext();
@@ -226,12 +235,22 @@ void dotskip(void) {
 }
 
 
+int ConditionalHaveUngoto(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) && 
+               (!IsEmptyStr(WCC->ugname)) && 
+               (strcasecmp(WCC->ugname, ChrPtr(WCC->CurRoom.name)) == 0));
+}
 
 
 void 
 InitModule_MARCHLIST
 (void)
 {
+       RegisterConditional(HKEY("COND:UNGOTO"), 0, ConditionalHaveUngoto, CTX_NONE);
+       RegisterNamespace("ROOM:UNGOTO", 0, 0, tmplput_ungoto, NULL, CTX_NONE);
 
        WebcitAddUrlHandler(HKEY("gotonext"), "", 0, _gotonext, NEED_URL);
        WebcitAddUrlHandler(HKEY("skip"), "", 0, gotonext, NEED_URL);
index 5457b3e71e63e5540363d69e7f0b4e28dfbf3c8a..757b68c47dfae0c47706265d9ee6fba111dcf091 100644 (file)
@@ -6,6 +6,51 @@
 #include "webcit.h"
 #include "webserver.h"
 
+HashList *GetWhoKnowsHash(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       StrBuf *Line;
+       StrBuf *Token;
+       long State;
+       HashList *Whok = NULL;
+       int Done = 0;
+       int n;
+
+       serv_puts("WHOK");
+       Line = NewStrBuf();
+       StrBuf_ServGetln(Line);
+       if (GetServerStatus(Line, &State) == 1) 
+       {
+               Whok = NewHash(1, Flathash);
+               while(!Done && StrBuf_ServGetln(Line))
+                       if ( (StrLength(Line)==3) && 
+                            !strcmp(ChrPtr(Line), "000")) 
+                       {
+                               Done = 1;
+                       }
+                       else
+                       {
+                       
+                               const char *Pos = NULL;
+                               Token = NewStrBufPlain (NULL, StrLength(Line));
+                               StrBufExtract_NextToken(Token, Line, &Pos, '|');
+
+                               Put(Whok, 
+                                   IKEY(n),
+                                   Token, 
+                                   HFreeStrBuf);
+                               n++;
+                       }
+       }
+       else if (State == 550)
+               StrBufAppendBufPlain(WCC->ImportantMsg,
+                                    _("Higher access is required to access this function."), -1, 0);
+
+
+       FreeStrBuf(&Line);
+       return Whok;
+}
+
 
 void DeleteFloor(void *vFloor)
 {
@@ -99,25 +144,14 @@ HashList *GetFloorListHash(StrBuf *Target, WCTemplputParams *TP)
        return floors;
 }
 
-void tmplput_FLOOR_ID(StrBuf *Target, WCTemplputParams *TP) 
-{
-       Floor *myFloor = (Floor *)CTX;
-
-       StrBufAppendPrintf(Target, "%d", myFloor->ID);
-}
-
-void tmplput_FLOOR_NAME(StrBuf *Target, WCTemplputParams *TP) 
-{
-       Floor *myFloor = (Floor *)CTX;
-
-       StrBufAppendTemplate(Target, TP, myFloor->Name, 0);
-}
-
-void tmplput_FLOOR_NROOMS(StrBuf *Target, WCTemplputParams *TP) 
+HashList *GetZappedRoomListHash(StrBuf *Target, WCTemplputParams *TP) 
 {
-       Floor *myFloor = (Floor *)CTX;
+       wcsession *WCC = WC;
 
-       StrBufAppendPrintf(Target, "%d", myFloor->NRooms);
+       if (WCC->Floors == NULL)
+               GetFloorListHash(Target, TP);
+       serv_puts("LZRM -1");
+       return GetRoomListHash(Target, TP);
 }
 HashList *GetRoomListHashLKRA(StrBuf *Target, WCTemplputParams *TP) 
 {
@@ -133,15 +167,6 @@ HashList *GetRoomListHashLKRA(StrBuf *Target, WCTemplputParams *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 FlushIgnetCfgs(folder *room)
 {
@@ -562,217 +587,6 @@ int CompareRooms(const folder *room1, const folder *room2)
        return CompareRoomListByFloorRoomPrivFirst(room1, room2);
 }
 
-
-
-void tmplput_ROOM_NAME(StrBuf *Target, WCTemplputParams *TP) 
-{
-       folder *Folder = (folder *)CTX;
-
-       if (Folder == NULL)
-       {
-               wcsession *WCC = WC;
-
-               if (WCC == NULL)
-                       return;
-               Folder = &WCC->CurRoom;
-       }
-       StrBufAppendTemplate(Target, TP, Folder->name, 0);
-}
-void tmplput_ROOM_BASENAME(StrBuf *Target, WCTemplputParams *TP) 
-{
-       folder *room = (folder *)CTX;
-
-       if (room->nRoomNameParts > 1)
-               StrBufAppendTemplate(Target, TP, 
-                                     room->RoomNameParts[room->nRoomNameParts - 1], 0);
-       else 
-               StrBufAppendTemplate(Target, TP, room->name, 0);
-}
-void tmplput_ROOM_LEVEL_N_TIMES(StrBuf *Target, WCTemplputParams *TP) 
-{
-       folder *room = (folder *)CTX;
-       int i;
-        const char *AppendMe;
-        long AppendMeLen;
-
-
-       if (room->nRoomNameParts > 1)
-       {
-               GetTemplateTokenString(Target, TP, 0, &AppendMe, &AppendMeLen);
-               for (i = 0; i < room->nRoomNameParts; i++)
-                       StrBufAppendBufPlain(Target, AppendMe, AppendMeLen, 0);
-       }
-}
-
-void tmplput_ROOM_ACL(StrBuf *Target, WCTemplputParams *TP) 
-{
-       folder *Folder = (folder *)CTX;
-
-       StrBufAppendPrintf(Target, "%ld", Folder->RAFlags, 0);
-}
-
-
-void tmplput_ROOM_QRFLAGS(StrBuf *Target, WCTemplputParams *TP) 
-{
-       folder *Folder = (folder *)CTX;
-       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) 
-{
-       folder *Folder = (folder *)CTX;
-       StrBufAppendPrintf(Target, "%d", Folder->floorid);
-}
-
-void tmplput_ROOM_LISTORDER(StrBuf *Target, WCTemplputParams *TP) 
-{
-       folder *Folder = (folder *)CTX;
-       StrBufAppendPrintf(Target, "%d", Folder->Order);
-}
-void tmplput_ROOM_VIEW(StrBuf *Target, WCTemplputParams *TP) 
-{
-       folder *Folder = (folder *)CTX;
-       StrBufAppendPrintf(Target, "%d", Folder->view);
-}
-void tmplput_ROOM_DEFVIEW(StrBuf *Target, WCTemplputParams *TP) 
-{
-       folder *Folder = (folder *)CTX;
-       StrBufAppendPrintf(Target, "%d", Folder->defview);
-}
-void tmplput_ROOM_LASTCHANGE(StrBuf *Target, WCTemplputParams *TP) 
-{
-       folder *Folder = (folder *)CTX;
-       StrBufAppendPrintf(Target, "%d", Folder->lastchange);
-}
-void tmplput_ROOM_FLOOR_ID(StrBuf *Target, WCTemplputParams *TP) 
-{
-       folder *Folder = (folder *)CTX;
-       const Floor *pFloor = Folder->Floor;
-
-       if (pFloor == NULL)
-               return;
-
-       StrBufAppendPrintf(Target, "%d", pFloor->ID);
-}
-
-void tmplput_ROOM_FLOOR_NAME(StrBuf *Target, WCTemplputParams *TP) 
-{
-       folder *Folder = (folder *)CTX;
-       const Floor *pFloor = Folder->Floor;
-
-       if (pFloor == NULL)
-               return;
-
-       StrBufAppendTemplate(Target, TP, pFloor->Name, 0);
-}
-
-void tmplput_ROOM_FLOOR_NROOMS(StrBuf *Target, WCTemplputParams *TP) 
-{
-       folder *Folder = (folder *)CTX;
-       const Floor *pFloor = Folder->Floor;
-
-       if (pFloor == NULL)
-               return;
-       StrBufAppendPrintf(Target, "%d", pFloor->NRooms);
-}
-
-
-
-
-int ConditionalRoomIsInbox(StrBuf *Target, WCTemplputParams *TP)
-{
-       folder *Folder = (folder *)CTX;
-       return Folder->is_inbox;
-}
-
-void tmplput_ROOM_COLLECTIONTYPE(StrBuf *Target, WCTemplputParams *TP) 
-{
-       folder *Folder = (folder *)CTX;
-       
-       switch(Folder->view) {
-       case VIEW_CALENDAR:
-               StrBufAppendBufPlain(Target, HKEY("vevent"), 0);
-               break;
-       case VIEW_TASKS:
-               StrBufAppendBufPlain(Target, HKEY("vtodo"), 0);
-               break;
-       case VIEW_ADDRESSBOOK:
-               StrBufAppendBufPlain(Target, HKEY("vcard"), 0);
-               break;
-       case VIEW_NOTES:
-               StrBufAppendBufPlain(Target, HKEY("vnotes"), 0);
-               break;
-       case VIEW_JOURNAL:
-               StrBufAppendBufPlain(Target, HKEY("vjournal"), 0);
-               break;
-       case VIEW_WIKI:
-               StrBufAppendBufPlain(Target, HKEY("wiki"), 0);
-               break;
-       }
-}
-
-
-
-
-int ConditionalRoomHasGroupdavContent(StrBuf *Target, WCTemplputParams *TP)
-{
-       folder *Folder = (folder *)CTX;
-
-       lprintf(0, "-> %s: %ld\n", ChrPtr(Folder->name), Folder->view);
-
-       return ((Folder->view == VIEW_CALENDAR) || 
-               (Folder->view == VIEW_TASKS) || 
-               (Folder->view == VIEW_ADDRESSBOOK) ||
-               (Folder->view == VIEW_NOTES) ||
-               (Folder->view == VIEW_JOURNAL) );
-}
-
-
-
-int ConditionalFloorIsRESTSubFloor(StrBuf *Target, WCTemplputParams *TP)
-{
-       wcsession  *WCC = WC;
-       Floor *MyFloor = (Floor *)CTX;
-       /** if we have dav_depth the client just wants the subfloors */
-       if ((WCC->Hdr->HR.dav_depth == 1) && 
-           (GetCount(WCC->Directory) == 0))
-               return 1;
-       return WCC->CurrentFloor == MyFloor;
-}
-
-int ConditionalFloorHaveNRooms(StrBuf *Target, WCTemplputParams *TP)
-{
-       Floor *MyFloor = (Floor *)CTX;
-       int HaveN;
-
-       HaveN = GetTemplateTokenNumber(Target, TP, 0, 0);
-
-       return HaveN == MyFloor->NRooms;
-}
-
-int ConditionalFloorIsVirtual(StrBuf *Target, WCTemplputParams *TP)
-{
-       Floor *MyFloor = (Floor *)CTX;
-
-       return MyFloor->ID == VIRTUAL_MY_FLOOR;
-}
-
-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;
@@ -855,81 +669,20 @@ int ConditionalRoomIsRESTSubRoom(StrBuf *Target, WCTemplputParams *TP)
 }
 
 
-void jsonRoomFlr(void) 
-{
-       /* Send as our own (application/json) content type */
-       hprintf("HTTP/1.1 200 OK\r\n");
-       hprintf("Content-type: application/json; charset=utf-8\r\n");
-       hprintf("Server: %s / %s\r\n", PACKAGE_STRING, ChrPtr(WC->serv_info->serv_software));
-       hprintf("Connection: close\r\n");
-       hprintf("Pragma: no-cache\r\nCache-Control: no-store\r\nExpires:-1\r\n");
-       begin_burst();
-       DoTemplate(HKEY("json_roomflr"),NULL,&NoCtx);
-       end_burst(); 
-}
-
-#define POP3_HOST 0
-#define POP3_USERNAME 1
-#define POP3_PASSWORD 2
-#define POP3_KEEP 3
-#define POP3_INTERVAL 4
-
 void 
 InitModule_ROOMLIST
 (void)
 {
 
-       REGISTERTokenParamDefine(POP3_HOST);
-       REGISTERTokenParamDefine(POP3_USERNAME);
-       REGISTERTokenParamDefine(POP3_PASSWORD);
-       REGISTERTokenParamDefine(POP3_KEEP);
-       REGISTERTokenParamDefine(POP3_INTERVAL);
-
-
-       WebcitAddUrlHandler(HKEY("json_roomflr"), "", 0, jsonRoomFlr, 0);
-
-
-       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:FLOOR:ISVIRTUAL"), 0, ConditionalFloorIsVirtual, CTX_FLOORS);
-       RegisterConditional(HKEY("COND:FLOOR:NROOMS"), 1, ConditionalFloorHaveNRooms, CTX_FLOORS);
-       RegisterConditional(HKEY("COND:ROOM:REST:ISSUBFLOOR"), 0, ConditionalFloorIsRESTSubFloor, CTX_FLOORS);
-
+       RegisterIterator("ITERATE:THISROOM:WHO_KNOWS", 0, NULL, GetWhoKnowsHash, NULL, DeleteHash, CTX_STRBUF, CTX_NONE, IT_NOFLAG);
        RegisterIterator("ITERATE:THISROOM:GNET", 1, NULL, GetNetConfigHash, NULL, NULL, CTX_STRBUFARR, CTX_NONE, IT_NOFLAG);
 
        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);
-       RegisterNamespace("ROOM:INFO:PRINT_NAME", 0, 1, tmplput_ROOM_NAME, NULL, CTX_NONE);
-       RegisterNamespace("ROOM:INFO:BASENAME", 0, 1, tmplput_ROOM_BASENAME, NULL, CTX_ROOMS);
-       RegisterNamespace("ROOM:INFO:LEVELNTIMES", 1, 2, tmplput_ROOM_LEVEL_N_TIMES, NULL, CTX_ROOMS);
-
-       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);
-       RegisterNamespace("ROOM:INFO:LASTCHANGE", 0, 1, tmplput_ROOM_LASTCHANGE, NULL, CTX_ROOMS);
-       RegisterNamespace("ROOM:INFO:COLLECTIONTYPE", 0, 1, tmplput_ROOM_COLLECTIONTYPE, NULL, CTX_ROOMS);
-       RegisterNamespace("ROOM:INFO:FLOOR:ID", 0, 0, tmplput_ROOM_FLOOR_ID, NULL, CTX_ROOMS);
-       RegisterNamespace("ROOM:INFO:FLOOR:NAME", 0, 1, tmplput_ROOM_FLOOR_NAME, NULL, CTX_ROOMS);
-       RegisterNamespace("ROOM:INFO:FLOOR:NROOMS", 0, 0, tmplput_ROOM_FLOOR_NROOMS, NULL, CTX_ROOMS);
-
        RegisterConditional(HKEY("COND:ROOM:REST:ISSUBROOM"), 0, ConditionalRoomIsRESTSubRoom, CTX_ROOMS);
 
-       RegisterConditional(HKEY("COND:ROOM:INFO:IS_INBOX"), 0, ConditionalRoomIsInbox, CTX_ROOMS);
-       RegisterConditional(HKEY("COND:ROOM:GROUPDAV_CONTENT"), 0, ConditionalRoomHasGroupdavContent, CTX_ROOMS);
-
-
-
        RegisterSortFunc(HKEY("byfloorroom"),
                         NULL, 0,
                         CompareRoomListByFloorRoomPrivFirst,
index 8217b2a1ed984c8fcaf99ca5278e47417c267934..9f8180c55e4d9fa9565de93d870681020cb23fad 100644 (file)
@@ -6,51 +6,6 @@
 #include "webcit.h"
 #include "webserver.h"
 
-char *viewdefs[VIEW_MAX];                      /* the different kinds of available views */
-
-ROOM_VIEWS exchangeable_views[VIEW_MAX][VIEW_MAX] = {  /* the different kinds of available views for a view */
-{VIEW_BBS, VIEW_MAILBOX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX }, 
-{VIEW_BBS, VIEW_MAILBOX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX }, 
-{VIEW_MAX, VIEW_MAX, VIEW_ADDRESSBOOK, VIEW_CALENDAR, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX }, 
-{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_CALENDAR, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX /*VIEW_CALBRIEF*/, VIEW_MAX, VIEW_MAX }, 
-{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_TASKS, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, },
-{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_NOTES, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, },
-{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_WIKI, VIEW_MAX, VIEW_MAX, VIEW_MAX}, 
-{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_CALENDAR, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX/*VIEW_CALBRIEF*/, VIEW_MAX, VIEW_MAX},
-{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_JOURNAL, VIEW_MAX }, 
-{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_BLOG }, 
-       };
-/* the brief calendar view is disabled: VIEW_CALBRIEF */
-
-ROOM_VIEWS allowed_default_views[VIEW_MAX] = {
-       1, /* VIEW_BBS          Bulletin board view */
-       1, /* VIEW_MAILBOX              Mailbox summary */
-       1, /* VIEW_ADDRESSBOOK  Address book view */
-       1, /* VIEW_CALENDAR             Calendar view */
-       1, /* VIEW_TASKS                Tasks view */
-       1, /* VIEW_NOTES                Notes view */
-       1, /* VIEW_WIKI         Wiki view */
-       0, /* VIEW_CALBRIEF             Brief Calendar view */
-       0, /* VIEW_JOURNAL              Journal view */
-       0  /* VIEW_BLOG         Blog view (not yet implemented) */
-};
-
-
-/*
- * Initialize the viewdefs with localized strings
- */
-void initialize_viewdefs(void) {
-       viewdefs[VIEW_BBS] = _("Bulletin Board");
-       viewdefs[VIEW_MAILBOX] = _("Mail Folder");
-       viewdefs[VIEW_ADDRESSBOOK] = _("Address Book");
-       viewdefs[VIEW_CALENDAR] = _("Calendar");
-       viewdefs[VIEW_TASKS] = _("Task List");
-       viewdefs[VIEW_NOTES] = _("Notes List");
-       viewdefs[VIEW_WIKI] = _("Wiki");
-       viewdefs[VIEW_CALBRIEF] = _("Calendar List");
-       viewdefs[VIEW_JOURNAL] = _("Journal");
-       viewdefs[VIEW_BLOG] = _("Blog");
-}
 
 ConstStr QRFlagList[] = {
        {HKEY(strof(QR_PERMANENT))},
@@ -132,50 +87,76 @@ void DBG_QR2(long QR2)
 }
 
 
-/*
- * Embed the room banner
- *
- * got                 The information returned from a GOTO server command
- * navbar_style        Determines which navigation buttons to display
- *
- */
 
-void embed_room_banner(void) 
-{
-       wcsession *WCC = WC;
-       char buf[256];
 
-       /* refresh current room states... */
-       /* dosen't work??? gotoroom(NULL); */
 
-       /* The browser needs some information for its own use */
-       wc_printf("<script type=\"text/javascript\">    \n"
-                 "     room_is_trash = %d;             \n"
-                 "</script>\n",
-                 ((WC->CurRoom.RAFlags & UA_ISTRASH) != 0)
-               );
 
-       /*
-        * If the user happens to select the "make this my start page" link,
-        * we want it to remember the URL as a "/dotskip" one instead of
-        * a "skip" or "gotonext" or something like that.
-        */
-       if (WCC->Hdr->this_page == NULL) {
-               WCC->Hdr->this_page = NewStrBuf();
-       }
-       StrBufPrintf(WCC->Hdr->this_page, 
-                    "dotskip?room=%s",
-                    ChrPtr(WC->CurRoom.name)
-               );
-
-       do_template("roombanner", NULL);
-       /* roombanner contains this for mobile */
-       if (WC->is_mobile)
+
+
+
+
+
+/*******************************************************************************
+ ***************************** Goto Commands ***********************************
+ ******************************************************************************/
+void dotgoto(void) {
+       if (!havebstr("room")) {
+               readloop(readnew, eUseDefault);
                return;
+       }
+       if (WC->CurRoom.view != VIEW_MAILBOX) { /* dotgoto acts like dotskip when we're in a mailbox view */
+               slrp_highest();
+       }
+       smart_goto(sbstr("room"));
+}
 
-       do_template("navbar", NULL);
+/*
+ * goto next room
+ */
+void smart_goto(const StrBuf *next_room) {
+       gotoroom(next_room);
+       readloop(readnew, eUseDefault);
 }
 
+/**
+ * \brief goto a private room
+ */
+void goto_private(void)
+{
+       char hold_rm[SIZ];
+       StrBuf *Buf;
+       const StrBuf *gr_name;
+       long err;
+
+       if (!havebstr("ok_button")) {
+               display_main_menu();
+               return;
+       }
+       gr_name = sbstr("gr_name");
+       Buf = NewStrBuf();
+       strcpy(hold_rm, ChrPtr(WC->CurRoom.name));
+       serv_printf("GOTO %s|%s",
+                   ChrPtr(gr_name),
+                   bstr("gr_pass"));
+       StrBuf_ServGetln(Buf);
+       if  (GetServerStatus(Buf, &err) == 2) {
+               FlushRoomlist();
+               smart_goto(gr_name);
+               FreeStrBuf(&Buf);
+               return;
+       }
+       if (err == 540) {
+               DoTemplate(HKEY("room_display_private"), NULL, &NoCtx);
+               FreeStrBuf(&Buf);
+               return;
+       }
+       StrBufCutLeft(Buf, 4);
+       AppendImportantMessage (SKEY(Buf));
+       Buf = NewStrBufPlain(HKEY("_BASEROOM_"));
+       smart_goto(Buf);
+       FreeStrBuf(&Buf);
+       return;
+}
 
 /*
  * back end routine to take the session to a new room
@@ -337,6 +318,95 @@ void ParseGoto(folder *room, StrBuf *Line)
        room->Floor = (const Floor*) vFloor;
 }
 
+/**
+ * \brief Delete the current room
+ */
+void delete_room(void)
+{
+       char buf[SIZ];
+
+       
+       serv_puts("KILL 1");
+       serv_getln(buf, sizeof buf);
+
+       if (buf[0] != '2') {
+               strcpy(WC->ImportantMessage, &buf[4]);
+               display_main_menu();
+               return;
+       } else {
+               StrBuf *Buf;
+               
+               FlushRoomlist ();
+               Buf = NewStrBufPlain(HKEY("_BASEROOM_"));
+               smart_goto(Buf);
+               FreeStrBuf(&Buf);
+       }
+}
+
+/**
+ * \brief zap a room
+ */
+void zap(void)
+{
+       char buf[SIZ];
+       StrBuf *final_destination;
+
+       /**
+        * If the forget-room routine fails for any reason, we fall back
+        * to the current room; otherwise, we go to the Lobby
+        */
+       final_destination = NewStrBufDup(WC->CurRoom.name);
+
+       if (havebstr("ok_button")) {
+               serv_printf("GOTO %s", ChrPtr(WC->CurRoom.name));
+               serv_getln(buf, sizeof buf);
+               if (buf[0] == '2') {
+                       serv_puts("FORG");
+                       serv_getln(buf, sizeof buf);
+                       if (buf[0] == '2') {
+                               FlushStrBuf(final_destination);
+                               StrBufAppendBufPlain(final_destination, HKEY("_BASEROOM_"), 0);
+                       }
+               }
+               FlushRoomlist ();
+       }
+       smart_goto(final_destination);
+       FreeStrBuf(&final_destination);
+}
+
+
+/*
+ * mark all messages in current room as having been read
+ */
+void slrp_highest(void)
+{
+       char buf[256];
+
+       serv_puts("SLRP HIGHEST");
+       serv_getln(buf, sizeof buf);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/*******************************************************************************
+ ***************************** Modify Rooms ************************************
+ ******************************************************************************/
+
+
+
+
+
 void LoadRoomAide(void)
 {
        wcsession *WCC = WC;
@@ -382,30 +452,6 @@ int SaveRoomAide(folder *Room)
        return 1;
 }
 
-void tmplput_CurrentRoomFloorName(StrBuf *Target, WCTemplputParams *TP) 
-{
-       wcsession *WCC = WC;
-       folder *Folder = &WCC->CurRoom;
-       const Floor *pFloor;
-
-       if (Folder == NULL)
-               return;
-
-       pFloor = Folder->Floor;
-       if (pFloor == NULL)
-               return;
-
-       StrBufAppendTemplate(Target, TP, pFloor->Name, 0);
-}
-
-void tmplput_CurrentRoomAide(StrBuf *Target, WCTemplputParams *TP) 
-{
-       wcsession *WCC = WC;
-
-       LoadRoomAide();
-
-       StrBufAppendTemplate(Target, TP, WCC->CurRoom.RoomAide, 0);
-}
 
 int GetCurrentRoomFlags(folder *Room)
 {
@@ -516,16 +562,6 @@ void LoadXRoomPic(void)
        FreeStrBuf (&Buf);
 }
 
-int ConditionalThisRoomXHavePic(StrBuf *Target, WCTemplputParams *TP)
-{
-       wcsession *WCC = WC;
-       
-       if (WCC == NULL)
-               return 0;
-
-       LoadXRoomPic();
-       return WCC->CurRoom.XHaveRoomPic == 1;
-}
 
 void LoadXRoomInfoText(void)
 {
@@ -557,25 +593,6 @@ void LoadXRoomInfoText(void)
        FreeStrBuf (&Buf);
 }
 
-int ConditionalThisRoomXHaveInfoText(StrBuf *Target, WCTemplputParams *TP)
-{
-       wcsession *WCC = WC;
-       
-       if (WCC == NULL)
-               return 0;
-
-       LoadXRoomInfoText();
-       return (StrLength(WCC->CurRoom.XInfoText)>0);
-}
-
-void tmplput_CurrentRoomInfoText(StrBuf *Target, WCTemplputParams *TP) 
-{
-       wcsession *WCC = WC;
-
-       LoadXRoomInfoText();
-
-       StrBufAppendTemplate(Target, TP, WCC->CurRoom.XAPass, 1);
-}
 
 void LoadXRoomXCountFiles(void)
 {
@@ -605,326 +622,72 @@ void LoadXRoomXCountFiles(void)
        FreeStrBuf (&Buf);
 }
 
-void tmplput_CurrentRoomXNFiles(StrBuf *Target, WCTemplputParams *TP) 
-{
-       wcsession *WCC = WC;
 
-       LoadXRoomXCountFiles();
+/* 
+ * Toggle self-service list subscription
+ */
+void toggle_self_service(void) {
+       wcsession *WCC = WC;
 
-       StrBufAppendPrintf(Target, "%d", WCC->CurRoom.XDownloadCount);
-}
+       if (GetCurrentRoomFlags (&WCC->CurRoom) == 0)
+               return;
 
-void tmplput_CurrentRoomX_FileString(StrBuf *Target, WCTemplputParams *TP) 
-{
-       wcsession *WCC = WC;
+       if (yesbstr("QR2_SelfList")) 
+               WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 | QR2_SELFLIST;
+       else 
+               WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 & ~QR2_SELFLIST;
 
-       LoadXRoomXCountFiles();
+       if (yesbstr("QR2_SMTP_PUBLIC")) 
+               WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 | QR2_SMTP_PUBLIC;
+       else
+               WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 & ~QR2_SMTP_PUBLIC;
 
-       if (WCC->CurRoom.XDownloadCount == 1)
-               StrBufAppendBufPlain(Target, _("file"), -1, 0);
+       if (yesbstr("QR2_Moderated")) 
+               WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 | QR2_MODERATED;
+       else
+               WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 & ~QR2_MODERATED;
+       if (yesbstr("QR2_SubsOnly")) 
+               WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 | QR2_SMTP_PUBLIC;
        else
-               StrBufAppendBufPlain(Target, _("files"), -1, 0);
+               WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 & ~QR2_SMTP_PUBLIC;
+
+       SetCurrentRoomFlags (&WCC->CurRoom);
+       
+       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
 }
 
-void tmplput_CurrentRoomPass(StrBuf *Target, WCTemplputParams *TP) 
-{
-       wcsession *WCC = WC;
 
-       LoadRoomXA();
 
-       StrBufAppendTemplate(Target, TP, WCC->CurRoom.XAPass, 0);
-}
-void tmplput_CurrentRoomDirectory(StrBuf *Target, WCTemplputParams *TP) 
+/*
+ * save new parameters for a room
+ */
+void editroom(void)
 {
        wcsession *WCC = WC;
+       const StrBuf *Ptr;
+       const StrBuf *er_name;
+       const StrBuf *er_password;
+       const StrBuf *er_dirname;
+       const StrBuf *er_roomaide;
+       unsigned er_flags;
+       unsigned er_flags2;
+       int succ1, succ2;
 
-       LoadRoomXA();
+       if (!havebstr("ok_button")) {
+               strcpy(WC->ImportantMessage,
+                      _("Cancelled.  Changes were not saved."));
+               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
+               return;
+       }
+       if (GetCurrentRoomFlags (&WCC->CurRoom) == 0)
+               return;
 
-       StrBufAppendTemplate(Target, TP, WCC->CurRoom.Directory, 0);
-}
-void tmplput_CurrentRoomOrder(StrBuf *Target, WCTemplputParams *TP) 
-{
-       wcsession *WCC = WC;
+       LoadRoomAide();
 
-       LoadRoomXA();
+       er_flags = WCC->CurRoom.QRFlags;
+       er_flags &= !(QR_PRIVATE | QR_PASSWORDED | QR_GUESSNAME);
 
-       StrBufAppendPrintf(Target, "%d", WCC->CurRoom.Order);
-}
-void tmplput_CurrentRoomDefView(StrBuf *Target, WCTemplputParams *TP) 
-{
-       wcsession *WCC = WC;
-
-       StrBufAppendPrintf(Target, "%d", WCC->CurRoom.defview);
-}
-
-void tmplput_CurrentRoom_nNewMessages(StrBuf *Target, WCTemplputParams *TP) 
-{
-       wcsession *WCC = WC;
-
-       LoadRoomXA();
-
-       StrBufAppendPrintf(Target, "%d", WCC->CurRoom.nNewMessages);
-}
-
-void tmplput_CurrentRoom_nTotalMessages(StrBuf *Target, WCTemplputParams *TP) 
-{
-       wcsession *WCC = WC;
-
-       LoadRoomXA();
-
-       StrBufAppendPrintf(Target, "%d", WCC->CurRoom.nTotalMessages);
-}
-
-int ConditionalThisRoomOrder(StrBuf *Target, WCTemplputParams *TP)
-{
-       wcsession *WCC = WC;
-       long CheckThis;
-
-       if (WCC == NULL)
-               return 0;
-
-       LoadRoomXA();
-
-       CheckThis = GetTemplateTokenNumber(Target, TP, 2, 0);
-       return CheckThis == WCC->CurRoom.Order;
-}
-
-int ConditionalThisRoomDefView(StrBuf *Target, WCTemplputParams *TP)
-{
-       wcsession *WCC = WC;
-       long CheckThis;
-
-       if (WCC == NULL)
-               return 0;
-
-       CheckThis = GetTemplateTokenNumber(Target, TP, 2, 0);
-       return CheckThis == WCC->CurRoom.defview;
-}
-
-int ConditionalThisRoomCurrView(StrBuf *Target, WCTemplputParams *TP)
-{
-       wcsession *WCC = WC;
-       long CheckThis;
-
-       if (WCC == NULL)
-               return 0;
-
-       CheckThis = GetTemplateTokenNumber(Target, TP, 2, 0);
-       return CheckThis == WCC->CurRoom.view;
-}
-
-int ConditionalThisRoomHaveView(StrBuf *Target, WCTemplputParams *TP)
-{
-       wcsession *WCC = WC;
-       long CheckThis;
-       
-       if (WCC == NULL)
-               return 0;
-
-       CheckThis = GetTemplateTokenNumber(Target, TP, 2, 0);
-       if ((CheckThis >= VIEW_MAX) || (CheckThis < VIEW_BBS))
-       {
-               LogTemplateError(Target, "Conditional", ERR_PARM2, TP,
-                                "Roomview [%ld] not valid\n", 
-                                CheckThis);
-               return 0;
-       }
-
-       return exchangeable_views [WCC->CurRoom.defview][CheckThis] != VIEW_MAX;
-}
-
-void tmplput_CurrentRoomViewString(StrBuf *Target, WCTemplputParams *TP) 
-{
-       wcsession *WCC = WC;
-       StrBuf *Buf;
-
-       if ((WCC == NULL) ||
-           (WCC->CurRoom.defview >= VIEW_MAX) || 
-           (WCC->CurRoom.defview < VIEW_BBS))
-       {
-               LogTemplateError(Target, "Token", ERR_PARM2, TP,
-                                "Roomview [%ld] not valid\n", 
-                                (WCC != NULL)? 
-                                WCC->CurRoom.defview : -1);
-               return;
-       }
-
-       Buf = NewStrBufPlain(_(viewdefs[WCC->CurRoom.defview]), -1);
-       StrBufAppendTemplate(Target, TP, Buf, 0);
-       FreeStrBuf(&Buf);
-}
-
-void tmplput_RoomViewString(StrBuf *Target, WCTemplputParams *TP) 
-{
-       long CheckThis;
-       StrBuf *Buf;
-
-       CheckThis = GetTemplateTokenNumber(Target, TP, 0, 0);
-       if ((CheckThis >= VIEW_MAX) || (CheckThis < VIEW_BBS))
-       {
-               LogTemplateError(Target, "Token", ERR_PARM2, TP,
-                                "Roomview [%ld] not valid\n", 
-                                CheckThis);
-               return;
-       }
-
-       Buf = NewStrBufPlain(_(viewdefs[CheckThis]), -1);
-       StrBufAppendTemplate(Target, TP, Buf, 0);
-       FreeStrBuf(&Buf);
-}
-
-
-int ConditionalIsAllowedDefaultView(StrBuf *Target, WCTemplputParams *TP)
-{
-       wcsession *WCC = WC;
-       long CheckThis;
-       
-       if (WCC == NULL)
-               return 0;
-
-       CheckThis = GetTemplateTokenNumber(Target, TP, 2, 0);
-       if ((CheckThis >= VIEW_MAX) || (CheckThis < VIEW_BBS))
-       {
-               LogTemplateError(Target, "Conditional", ERR_PARM2, TP,
-                                "Roomview [%ld] not valid\n", 
-                                CheckThis);
-               return 0;
-       }
-
-       return allowed_default_views[CheckThis] != 0;
-}
-
-/*
- * goto next room
- */
-void smart_goto(const StrBuf *next_room) {
-       gotoroom(next_room);
-       readloop(readnew, eUseDefault);
-}
-
-
-
-/*
- * mark all messages in current room as having been read
- */
-void slrp_highest(void)
-{
-       char buf[256];
-
-       serv_puts("SLRP HIGHEST");
-       serv_getln(buf, sizeof buf);
-}
-
-
-
-/*
- * Set/clear/read the "self-service list subscribe" flag for a room
- * 
- * set newval to 0 to clear, 1 to set, any other value to leave unchanged.
- * returns the new value.
- */
-
-int self_service(int newval) {
-       int current_value = 0;
-       wcsession *WCC = WC;
-
-       if (GetCurrentRoomFlags (&WCC->CurRoom) == 0)
-       {
-               return 0;
-       }
-
-       if ((WCC->CurRoom.QRFlags2 & QR2_SELFLIST) != 0) {
-               current_value = 1;
-       }
-       else {
-               current_value = 0;
-       }
-
-       if (newval == 1) {
-               WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 | QR2_SELFLIST;
-       }
-       else if (newval == 0) {
-               WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 & ~QR2_SELFLIST;
-       }
-       else {
-               return(current_value);
-       }
-
-       if (newval != current_value) {
-               SetCurrentRoomFlags(&WCC->CurRoom);
-       }
-
-       return(newval);
-
-}
-
-
-
-/* 
- * Toggle self-service list subscription
- */
-void toggle_self_service(void) {
-       wcsession *WCC = WC;
-
-       if (GetCurrentRoomFlags (&WCC->CurRoom) == 0)
-               return;
-
-       if (yesbstr("QR2_SelfList")) 
-               WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 | QR2_SELFLIST;
-       else 
-               WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 & ~QR2_SELFLIST;
-
-       if (yesbstr("QR2_SMTP_PUBLIC")) 
-               WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 | QR2_SMTP_PUBLIC;
-       else
-               WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 & ~QR2_SMTP_PUBLIC;
-
-       if (yesbstr("QR2_Moderated")) 
-               WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 | QR2_MODERATED;
-       else
-               WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 & ~QR2_MODERATED;
-       if (yesbstr("QR2_SubsOnly")) 
-               WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 | QR2_SMTP_PUBLIC;
-       else
-               WCC->CurRoom.QRFlags2 = WCC->CurRoom.QRFlags2 & ~QR2_SMTP_PUBLIC;
-
-       SetCurrentRoomFlags (&WCC->CurRoom);
-       
-       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
-}
-
-
-
-/*
- * save new parameters for a room
- */
-void editroom(void)
-{
-       wcsession *WCC = WC;
-       const StrBuf *Ptr;
-       const StrBuf *er_name;
-       const StrBuf *er_password;
-       const StrBuf *er_dirname;
-       const StrBuf *er_roomaide;
-       unsigned er_flags;
-       unsigned er_flags2;
-       int succ1, succ2;
-
-       if (!havebstr("ok_button")) {
-               strcpy(WC->ImportantMessage,
-                      _("Cancelled.  Changes were not saved."));
-               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
-               return;
-       }
-       if (GetCurrentRoomFlags (&WCC->CurRoom) == 0)
-               return;
-
-       LoadRoomAide();
-
-       er_flags = WCC->CurRoom.QRFlags;
-       er_flags &= !(QR_PRIVATE | QR_PASSWORDED | QR_GUESSNAME);
-
-       er_flags2 = WCC->CurRoom.QRFlags2;
+       er_flags2 = WCC->CurRoom.QRFlags2;
 
        Ptr = sbstr("type");
        if (!strcmp(ChrPtr(Ptr), "invonly")) {
@@ -1046,6 +809,7 @@ void editroom(void)
 }
 
 
+
 /*
  * Display form for Invite, Kick, and show Who Knows a room
  */
@@ -1110,41 +874,6 @@ void do_invt_kick(void)
        http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
 }
 
-/*
- * support function for entroom() -- sets the default view 
- */
-void er_set_default_view(int newview) {
-
-       char buf[SIZ];
-
-       char rm_name[SIZ];
-       char rm_pass[SIZ];
-       char rm_dir[SIZ];
-       int rm_bits1;
-       int rm_floor;
-       int rm_listorder;
-       int rm_bits2;
-
-       serv_puts("GETR");
-       serv_getln(buf, sizeof buf);
-       if (buf[0] != '2') return;
-
-       extract_token(rm_name, &buf[4], 0, '|', sizeof rm_name);
-       extract_token(rm_pass, &buf[4], 1, '|', sizeof rm_pass);
-       extract_token(rm_dir, &buf[4], 2, '|', sizeof rm_dir);
-       rm_bits1 = extract_int(&buf[4], 3);
-       rm_floor = extract_int(&buf[4], 4);
-       rm_listorder = extract_int(&buf[4], 5);
-       rm_bits2 = extract_int(&buf[4], 7);
-
-       serv_printf("SETR %s|%s|%s|%d|0|%d|%d|%d|%d",
-                   rm_name, rm_pass, rm_dir, rm_bits1, rm_floor,
-                   rm_listorder, newview, rm_bits2
-               );
-       serv_getln(buf, sizeof buf);
-}
-
-
 
 /*
  * Create a new room
@@ -1206,110 +935,56 @@ void entroom(void)
        if ( (WCC != NULL) && ( (WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) )  {
                http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
        } else {
-               do_change_view(er_view);                /* Now go there */
+               smart_goto(WCC->CurRoom.name);
        }
 
 }
 
 
-/**
- * \brief goto a private room
- */
-void goto_private(void)
-{
-       char hold_rm[SIZ];
-       StrBuf *Buf;
-       const StrBuf *gr_name;
-       long err;
-
-       if (!havebstr("ok_button")) {
-               display_main_menu();
-               return;
-       }
-       gr_name = sbstr("gr_name");
-       Buf = NewStrBuf();
-       strcpy(hold_rm, ChrPtr(WC->CurRoom.name));
-       serv_printf("GOTO %s|%s",
-                   ChrPtr(gr_name),
-                   bstr("gr_pass"));
-       StrBuf_ServGetln(Buf);
-       if  (GetServerStatus(Buf, &err) == 2) {
-               FlushRoomlist();
-               smart_goto(gr_name);
-               FreeStrBuf(&Buf);
-               return;
-       }
-       if (err == 540) {
-               DoTemplate(HKEY("room_display_private"), NULL, &NoCtx);
-               FreeStrBuf(&Buf);
-               return;
-       }
-       StrBufCutLeft(Buf, 4);
-       AppendImportantMessage (SKEY(Buf));
-       Buf = NewStrBufPlain(HKEY("_BASEROOM_"));
-       smart_goto(Buf);
-       FreeStrBuf(&Buf);
-       return;
-}
 
 
 
 /**
- * \brief zap a room
+ * \brief Change the view for this room
  */
-void zap(void)
-{
+void change_view(void) {
+       int newview;
        char buf[SIZ];
-       StrBuf *final_destination;
-
-       /**
-        * If the forget-room routine fails for any reason, we fall back
-        * to the current room; otherwise, we go to the Lobby
-        */
-       final_destination = NewStrBufDup(WC->CurRoom.name);
 
-       if (havebstr("ok_button")) {
-               serv_printf("GOTO %s", ChrPtr(WC->CurRoom.name));
-               serv_getln(buf, sizeof buf);
-               if (buf[0] == '2') {
-                       serv_puts("FORG");
-                       serv_getln(buf, sizeof buf);
-                       if (buf[0] == '2') {
-                               FlushStrBuf(final_destination);
-                               StrBufAppendBufPlain(final_destination, HKEY("_BASEROOM_"), 0);
-                       }
-               }
-               FlushRoomlist ();
-       }
-       smart_goto(final_destination);
-       FreeStrBuf(&final_destination);
+       newview = lbstr("view");
+       serv_printf("VIEW %d", newview);
+       serv_getln(buf, sizeof buf);
+       WC->CurRoom.view = newview;
+       smart_goto(WC->CurRoom.name);
 }
 
 
 
 /**
- * \brief Delete the current room
+ * \brief Set the message expire policy for this room and/or floor
  */
-void delete_room(void)
-{
+void set_room_policy(void) {
        char buf[SIZ];
 
-       
-       serv_puts("KILL 1");
-       serv_getln(buf, sizeof buf);
-
-       if (buf[0] != '2') {
-               strcpy(WC->ImportantMessage, &buf[4]);
-               display_main_menu();
+       if (!havebstr("ok_button")) {
+               strcpy(WC->ImportantMessage,
+                      _("Cancelled.  Changes were not saved."));
+               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
                return;
-       } else {
-               StrBuf *Buf;
-               
-               FlushRoomlist ();
-               Buf = NewStrBufPlain(HKEY("_BASEROOM_"));
-               smart_goto(Buf);
-               FreeStrBuf(&Buf);
        }
+
+       serv_printf("SPEX roompolicy|%d|%d", ibstr("roompolicy"), ibstr("roomvalue"));
+       serv_getln(buf, sizeof buf);
+       strcpy(WC->ImportantMessage, &buf[4]);
+
+       if (WC->axlevel >= 6) {
+               strcat(WC->ImportantMessage, "<br />\n");
+               serv_printf("SPEX floorpolicy|%d|%d", ibstr("floorpolicy"), ibstr("floorvalue"));
+               serv_getln(buf, sizeof buf);
+               strcat(WC->ImportantMessage, &buf[4]);
+       }
+       ReloadCurrentRoom();
+       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
 }
 
 
@@ -1417,6 +1092,62 @@ void netedit(void) {
        http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
 }
 
+/**
+ * \brief Do either a known rooms list or a folders list, depending on the
+ * user's preference
+ */
+void knrooms(void)
+{
+       StrBuf *ListView = NULL;
+
+       /** Determine whether the user is trying to change views */
+       if (havebstr("view")) {
+               ListView = NewStrBufDup(SBSTR("view"));
+               set_preference("roomlistview", ListView, 1);
+       }
+       /** Sanitize the input so its safe */
+       if((get_preference("roomlistview", &ListView) != 0)||
+          ((strcasecmp(ChrPtr(ListView), "folders") != 0) &&
+           (strcasecmp(ChrPtr(ListView), "table") != 0))) 
+       {
+               if (ListView == NULL) {
+                       ListView = NewStrBufPlain(HKEY("rooms"));
+                       set_preference("roomlistview", ListView, 0);
+                       ListView = NULL;
+               }
+               else {
+                       ListView = NewStrBufPlain(HKEY("rooms"));
+                       set_preference("roomlistview", ListView, 0);
+                       ListView = NULL;
+               }
+       }
+       FreeStrBuf(&ListView);
+       url_do_template();
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/*******************************************************************************
+ ********************** FLOOR Coomands *****************************************
+ ******************************************************************************/
+
+
+
 /*
  * delete the actual floor
  */
@@ -1489,323 +1220,19 @@ void rename_floor(void) {
 
 
 
-/**
- * \brief Back end for change_view()
- * \param newview set newview???
- */
-void do_change_view(int newview) {
-       char buf[SIZ];
-
-       serv_printf("VIEW %d", newview);
-       serv_getln(buf, sizeof buf);
-       WC->CurRoom.view = newview;
-       smart_goto(WC->CurRoom.name);
-}
-
-
-
-/**
- * \brief Change the view for this room
- */
-void change_view(void) {
-       int view;
-
-       view = lbstr("view");
-       do_change_view(view);
-}
-
-/**
- * \brief Do either a known rooms list or a folders list, depending on the
- * user's preference
- */
-void knrooms(void)
-{
-       StrBuf *ListView = NULL;
-
-       /** Determine whether the user is trying to change views */
-       if (havebstr("view")) {
-               ListView = NewStrBufDup(SBSTR("view"));
-               set_preference("roomlistview", ListView, 1);
-       }
-       /** Sanitize the input so its safe */
-       if((get_preference("roomlistview", &ListView) != 0)||
-          ((strcasecmp(ChrPtr(ListView), "folders") != 0) &&
-           (strcasecmp(ChrPtr(ListView), "table") != 0))) 
-       {
-               if (ListView == NULL) {
-                       ListView = NewStrBufPlain(HKEY("rooms"));
-                       set_preference("roomlistview", ListView, 0);
-                       ListView = NULL;
-               }
-               else {
-                       ListView = NewStrBufPlain(HKEY("rooms"));
-                       set_preference("roomlistview", ListView, 0);
-                       ListView = NULL;
-               }
-       }
-       FreeStrBuf(&ListView);
-       url_do_template();
-}
-
-
-
-/**
- * \brief Set the message expire policy for this room and/or floor
- */
-void set_room_policy(void) {
-       char buf[SIZ];
-
-       if (!havebstr("ok_button")) {
-               strcpy(WC->ImportantMessage,
-                      _("Cancelled.  Changes were not saved."));
-               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
-               return;
-       }
-
-       serv_printf("SPEX roompolicy|%d|%d", ibstr("roompolicy"), ibstr("roomvalue"));
-       serv_getln(buf, sizeof buf);
-       strcpy(WC->ImportantMessage, &buf[4]);
-
-       if (WC->axlevel >= 6) {
-               strcat(WC->ImportantMessage, "<br />\n");
-               serv_printf("SPEX floorpolicy|%d|%d", ibstr("floorpolicy"), ibstr("floorvalue"));
-               serv_getln(buf, sizeof buf);
-               strcat(WC->ImportantMessage, &buf[4]);
-       }
-       ReloadCurrentRoom();
-       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
-}
-
-void tmplput_RoomName(StrBuf *Target, WCTemplputParams *TP)
-{
-       StrBufAppendTemplate(Target, TP, WC->CurRoom.name, 0);
-}
-
-void dotgoto(void) {
-       if (!havebstr("room")) {
-               readloop(readnew, eUseDefault);
-               return;
-       }
-       if (WC->CurRoom.view != VIEW_MAILBOX) { /* dotgoto acts like dotskip when we're in a mailbox view */
-               slrp_highest();
-       }
-       smart_goto(sbstr("room"));
-}
-
-
-
-void tmplput_current_room(StrBuf *Target, WCTemplputParams *TP)
-{
-       wcsession *WCC = WC;
-
-       if (WCC != NULL)
-               StrBufAppendTemplate(Target, TP, 
-                                    WCC->CurRoom.name, 
-                                    0); 
-}
-
-void tmplput_roombanner(StrBuf *Target, WCTemplputParams *TP)
-{
-       wc_printf("<div id=\"banner\">\n");
-       embed_room_banner();
-       wc_printf("</div>\n");
-}
-
-
-void tmplput_ungoto(StrBuf *Target, WCTemplputParams *TP)
-{
-       wcsession *WCC = WC;
-
-       if ((WCC!=NULL) && 
-           (!IsEmptyStr(WCC->ugname)))
-               StrBufAppendBufPlain(Target, WCC->ugname, -1, 0);
-}
-
-int ConditionalRoomAide(StrBuf *Target, WCTemplputParams *TP)
-{
-       wcsession *WCC = WC;
-       return (WCC != NULL)? 
-               ((WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) : 0;
-}
-
-int ConditionalRoomAcessDelete(StrBuf *Target, WCTemplputParams *TP)
-{
-       wcsession *WCC = WC;
-       return (WCC == NULL)? 0 : 
-               ( ((WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) ||
-                  (WCC->CurRoom.is_inbox) || 
-                  (WCC->CurRoom.QRFlags2 & QR2_COLLABDEL) );
-}
-
-int ConditionalHaveUngoto(StrBuf *Target, WCTemplputParams *TP)
-{
-       wcsession *WCC = WC;
-       
-       return ((WCC!=NULL) && 
-               (!IsEmptyStr(WCC->ugname)) && 
-               (strcasecmp(WCC->ugname, ChrPtr(WCC->CurRoom.name)) == 0));
-}
-
-
-int ConditionalRoomHas_UAFlag(StrBuf *Target, WCTemplputParams *TP)
-{
-       folder *Folder = (folder *)(TP->Context);
-       long UA_CheckFlag;
-               
-       UA_CheckFlag = GetTemplateTokenNumber(Target, TP, 2, 0);
-       if (UA_CheckFlag == 0)
-               LogTemplateError(Target, "Conditional", ERR_PARM1, TP,
-                                "requires one of the #\"UA_*\"- defines or an integer flag 0 is invalid!");
-
-       return ((Folder->RAFlags & UA_CheckFlag) != 0);
-}
-
-
-
-int ConditionalCurrentRoomHas_QRFlag(StrBuf *Target, WCTemplputParams *TP)
-{
-       long QR_CheckFlag;
-       wcsession *WCC = WC;
-       
-       QR_CheckFlag = GetTemplateTokenNumber(Target, TP, 2, 0);
-       if (QR_CheckFlag == 0)
-               LogTemplateError(Target, "Conditional", ERR_PARM1, TP,
-                                "requires one of the #\"QR*\"- defines or an integer flag 0 is invalid!");
-       
-       if (WCC == NULL)
-               return 0;
-
-       if ((TP->Tokens->Params[2]->MaskBy == eOR) ||
-           (TP->Tokens->Params[2]->MaskBy == eNO))
-               return (WCC->CurRoom.QRFlags & QR_CheckFlag) != 0;
-       else
-               return (WCC->CurRoom.QRFlags & QR_CheckFlag) == QR_CheckFlag;
-}
-
-int ConditionalRoomHas_QRFlag(StrBuf *Target, WCTemplputParams *TP)
-{
-       long QR_CheckFlag;
-       folder *Folder = (folder *)(TP->Context);
-
-       QR_CheckFlag = GetTemplateTokenNumber(Target, TP, 2, 0);
-       if (QR_CheckFlag == 0)
-               LogTemplateError(Target, "Conditional", ERR_PARM1, TP,
-                                "requires one of the #\"QR*\"- defines or an integer flag 0 is invalid!");
-
-       if ((TP->Tokens->Params[2]->MaskBy == eOR) ||
-           (TP->Tokens->Params[2]->MaskBy == eNO))
-               return (Folder->QRFlags & QR_CheckFlag) != 0;
-       else
-               return (Folder->QRFlags & QR_CheckFlag) == QR_CheckFlag;
-}
-
-
-int ConditionalCurrentRoomHas_QRFlag2(StrBuf *Target, WCTemplputParams *TP)
-{
-       long QR2_CheckFlag;
-       wcsession *WCC = WC;
-       
-       QR2_CheckFlag = GetTemplateTokenNumber(Target, TP, 2, 0);
-       if (QR2_CheckFlag == 0)
-               LogTemplateError(Target, "Conditional", ERR_PARM1, TP,
-                                "requires one of the #\"QR2*\"- defines or an integer flag 0 is invalid!");
-
-       
-       if (WCC == NULL)
-               return 0;
-
-       if ((TP->Tokens->Params[2]->MaskBy == eOR) ||
-           (TP->Tokens->Params[2]->MaskBy == eNO))
-               return (WCC->CurRoom.QRFlags2 & QR2_CheckFlag) != 0;
-       else
-               return (WCC->CurRoom.QRFlags2 & QR2_CheckFlag) == QR2_CheckFlag;
-}
-
-int ConditionalRoomHas_QRFlag2(StrBuf *Target, WCTemplputParams *TP)
-{
-       long QR2_CheckFlag;
-       folder *Folder = (folder *)(TP->Context);
-
-       QR2_CheckFlag = GetTemplateTokenNumber(Target, TP, 2, 0);
-       if (QR2_CheckFlag == 0)
-               LogTemplateError(Target, "Conditional", ERR_PARM1, TP,
-                                "requires one of the #\"QR2*\"- defines or an integer flag 0 is invalid!");
-       return ((Folder->QRFlags2 & QR2_CheckFlag) != 0);
-}
-
-
-int ConditionalHaveRoomeditRights(StrBuf *Target, WCTemplputParams *TP)
-{
-       wcsession *WCC = WC;
-
-       return ( (WCC!= NULL) && 
-                ((WCC->axlevel >= 6) || 
-                 ((WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) ||
-                 (WCC->CurRoom.is_inbox) ));
-}
-
-int ConditionalIsRoomtype(StrBuf *Target, WCTemplputParams *TP)
-{
-       wcsession *WCC = WC;
-
-       if ((WCC == NULL) ||
-           (TP->Tokens->nParameters < 3))
-       {
-               return ((WCC->CurRoom.view < VIEW_BBS) || 
-                       (WCC->CurRoom.view > VIEW_MAX));
-       }
-
-       return WCC->CurRoom.view == GetTemplateTokenNumber(Target, TP, 2, VIEW_BBS);
-}
-
-
-HashList *GetWhoKnowsHash(StrBuf *Target, WCTemplputParams *TP)
+void jsonRoomFlr(void) 
 {
-       wcsession *WCC = WC;
-       StrBuf *Line;
-       StrBuf *Token;
-       long State;
-       HashList *Whok = NULL;
-       int Done = 0;
-       int n;
-
-       serv_puts("WHOK");
-       Line = NewStrBuf();
-       StrBuf_ServGetln(Line);
-       if (GetServerStatus(Line, &State) == 1) 
-       {
-               Whok = NewHash(1, Flathash);
-               while(!Done && StrBuf_ServGetln(Line))
-                       if ( (StrLength(Line)==3) && 
-                            !strcmp(ChrPtr(Line), "000")) 
-                       {
-                               Done = 1;
-                       }
-                       else
-                       {
-                       
-                               const char *Pos = NULL;
-                               Token = NewStrBufPlain (NULL, StrLength(Line));
-                               StrBufExtract_NextToken(Token, Line, &Pos, '|');
-
-                               Put(Whok, 
-                                   IKEY(n),
-                                   Token, 
-                                   HFreeStrBuf);
-                               n++;
-                       }
-       }
-       else if (State == 550)
-               StrBufAppendBufPlain(WCC->ImportantMsg,
-                                    _("Higher access is required to access this function."), -1, 0);
-
-
-       FreeStrBuf(&Line);
-       return Whok;
+       /* Send as our own (application/json) content type */
+       hprintf("HTTP/1.1 200 OK\r\n");
+       hprintf("Content-type: application/json; charset=utf-8\r\n");
+       hprintf("Server: %s / %s\r\n", PACKAGE_STRING, ChrPtr(WC->serv_info->serv_software));
+       hprintf("Connection: close\r\n");
+       hprintf("Pragma: no-cache\r\nCache-Control: no-store\r\nExpires:-1\r\n");
+       begin_burst();
+       DoTemplate(HKEY("json_roomflr"),NULL,&NoCtx);
+       end_burst(); 
 }
 
-
-
 void _FlushRoomList(wcsession *WCC)
 {
        free_march_list(WCC);
@@ -1838,15 +1265,14 @@ void
 InitModule_ROOMOPS
 (void)
 {
-       initialize_viewdefs();
        RegisterPreference("roomlistview",
                            _("Room list view"),
                            PRF_STRING,
                            NULL);
         RegisterPreference("emptyfloors", _("Show empty floors"), PRF_YESNO, NULL);
 
-       RegisterNamespace("ROOMNAME", 0, 1, tmplput_RoomName, NULL, CTX_NONE);
-
+       
+       WebcitAddUrlHandler(HKEY("json_roomflr"), "", 0, jsonRoomFlr, 0);
 
        WebcitAddUrlHandler(HKEY("delete_floor"), "", 0, delete_floor, 0);
        WebcitAddUrlHandler(HKEY("rename_floor"), "", 0, rename_floor, 0);
@@ -1867,40 +1293,7 @@ InitModule_ROOMOPS
        WebcitAddUrlHandler(HKEY("set_room_policy"), "", 0, set_room_policy, 0);
        WebcitAddUrlHandler(HKEY("changeview"), "", 0, change_view, 0);
        WebcitAddUrlHandler(HKEY("toggle_self_service"), "", 0, toggle_self_service, 0);
-       RegisterNamespace("ROOMBANNER", 0, 1, tmplput_roombanner, NULL, CTX_NONE);
-
-       RegisterConditional(HKEY("COND:ROOM:TYPE_IS"), 0, ConditionalIsRoomtype, CTX_NONE);
-       RegisterConditional(HKEY("COND:THISROOM:FLAG:QR"), 0, ConditionalCurrentRoomHas_QRFlag, CTX_NONE);
-       RegisterConditional(HKEY("COND:ROOM:FLAG:QR"), 0, ConditionalRoomHas_QRFlag, CTX_ROOMS);
-
-       RegisterConditional(HKEY("COND:THISROOM:FLAG:QR2"), 0, ConditionalCurrentRoomHas_QRFlag2, CTX_NONE);
-       RegisterConditional(HKEY("COND:ROOM:FLAG:QR2"), 0, ConditionalRoomHas_QRFlag2, CTX_ROOMS);
-       RegisterConditional(HKEY("COND:ROOM:FLAG:UA"), 0, ConditionalRoomHas_UAFlag, CTX_ROOMS);
-
-       RegisterIterator("ITERATE:THISROOM:WHO_KNOWS", 0, NULL, GetWhoKnowsHash, NULL, DeleteHash, CTX_STRBUF, CTX_NONE, IT_NOFLAG);
-       RegisterNamespace("THISROOM:MSGS:NEW", 0, 0, tmplput_CurrentRoom_nNewMessages, NULL, CTX_NONE);
-       RegisterNamespace("THISROOM:MSGS:TOTAL", 0, 0, tmplput_CurrentRoom_nTotalMessages, NULL, CTX_NONE);
-
-       RegisterNamespace("THISROOM:FLOOR:NAME", 0, 1, tmplput_CurrentRoomFloorName, NULL, CTX_NONE);
-       RegisterNamespace("THISROOM:AIDE", 0, 1, tmplput_CurrentRoomAide, NULL, CTX_NONE);
-       RegisterNamespace("THISROOM:PASS", 0, 1, tmplput_CurrentRoomPass, NULL, CTX_NONE);
-       RegisterNamespace("THISROOM:DIRECTORY", 0, 1, tmplput_CurrentRoomDirectory, NULL, CTX_NONE);
-       RegisterNamespace("THISROOM:ORDER", 0, 0, tmplput_CurrentRoomOrder, NULL, CTX_NONE);
-       RegisterNamespace("THISROOM:DEFAULT_VIEW", 0, 0, tmplput_CurrentRoomDefView, NULL, CTX_NONE);
-       RegisterConditional(HKEY("COND:THISROOM:HAVE_VIEW"), 0, ConditionalThisRoomHaveView, CTX_NONE);
-       RegisterConditional(HKEY("COND:ALLOWED_DEFAULT_VIEW"), 0, ConditionalIsAllowedDefaultView, CTX_NONE);
-
-       RegisterNamespace("THISROOM:VIEW_STRING", 0, 1, tmplput_CurrentRoomViewString, NULL, CTX_NONE);
-       RegisterNamespace("ROOM:VIEW_STRING", 1, 2, tmplput_RoomViewString, NULL, CTX_NONE);
-
-       RegisterNamespace("THISROOM:INFOTEXT", 1, 2, tmplput_CurrentRoomInfoText, NULL, CTX_NONE);
-       RegisterConditional(HKEY("COND:THISROOM:ORDER"), 0, ConditionalThisRoomOrder, CTX_NONE);
-       RegisterConditional(HKEY("COND:THISROOM:DEFAULT_VIEW"), 0, ConditionalThisRoomDefView, CTX_NONE);
-       RegisterConditional(HKEY("COND:THISROOM:CURR_VIEW"), 0, ConditionalThisRoomCurrView, CTX_NONE);
-       RegisterConditional(HKEY("COND:THISROOM:HAVE_PIC"), 0, ConditionalThisRoomXHavePic, CTX_NONE);
-       RegisterConditional(HKEY("COND:THISROOM:HAVE_INFOTEXT"), 0, ConditionalThisRoomXHaveInfoText, CTX_NONE);
-       RegisterNamespace("THISROOM:FILES:N", 0, 1, tmplput_CurrentRoomXNFiles, NULL, CTX_NONE);
-       RegisterNamespace("THISROOM:FILES:STR", 0, 1, tmplput_CurrentRoomX_FileString, NULL, CTX_NONE);
+
 
        REGISTERTokenParamDefine(QR_PERMANENT);
        REGISTERTokenParamDefine(QR_INUSE);
@@ -1982,15 +1375,6 @@ InitModule_ROOMOPS
        REGISTERTokenParamDefine(rssclient);
        REGISTERTokenParamDefine(participate);
 
-       RegisterConditional(HKEY("COND:ROOMAIDE"), 2, ConditionalRoomAide, CTX_NONE);
-       RegisterConditional(HKEY("COND:ACCESS:DELETE"), 2, ConditionalRoomAcessDelete, CTX_NONE);
-
-       RegisterConditional(HKEY("COND:UNGOTO"), 0, ConditionalHaveUngoto, CTX_NONE);
-       RegisterConditional(HKEY("COND:ROOM:EDITACCESS"), 0, ConditionalHaveRoomeditRights, CTX_NONE);
-
-       RegisterNamespace("CURRENT_ROOM", 0, 1, tmplput_current_room, NULL, CTX_NONE);
-       RegisterNamespace("ROOM:UNGOTO", 0, 0, tmplput_ungoto, NULL, CTX_NONE);
-       RegisterIterator("FLOORS", 0, NULL, GetFloorListHash, NULL, NULL, CTX_FLOORS, CTX_NONE, IT_NOFLAG);
 
 
 }
index e0a6320791c387da51974405ba19f8c4d040f011..8c841616453c0e98a6032ee385333f1ae128bd7d 100644 (file)
@@ -115,6 +115,12 @@ void ParseGoto(folder *proom, StrBuf *Line);
 void FlushRoomlist(void); /* release our caches, so a deleted / zapped room disapears */
 void ReloadCurrentRoom(void); /* Flush cache; reload current state */
 
+HashList *GetFloorListHash(StrBuf *Target, WCTemplputParams *TP);
+HashList *GetRoomListHash(StrBuf *Target, WCTemplputParams *TP);
+int SortRoomsByListOrder(const void *room1, const void *room2);
+void tmplput_roombanner(StrBuf *Target, WCTemplputParams *TP);
+
+
 /*
  * wrapper around usual sort-comparator; private rooms will allways be prefered, -1 if one of them NULL
  */
index 71516b61872322db4d1871a54fcc62d61ff4a4f1..ea30b44516d872c435dde5dd2ae2960715131a32 100644 (file)
@@ -1,3 +1,3 @@
 [
-<?ITERATE("FLOORS", ="json_floor")>
+<?ITERATE("LFLR", ="json_floor")>
 ]
index e7a735e2d5290c89f4fc5f5779b9f7b738188a9d..0396cd408ed6c021b91907b86c1887c7d597dcd1 100644 (file)
@@ -212,9 +212,7 @@ void output_headers(        int do_httpheaders,     /* 1 = output HTTP headers
                }
 
                if (do_room_banner == 1) {
-                       wc_printf("<div id=\"banner\">\n");
-                       embed_room_banner();
-                       wc_printf("</div>\n");
+                       tmplput_roombanner(NULL, NULL);
                }
        }
 
index 860129e2f72036f78e79c2f0f2b5b3c96b42ebbc..f08104e9e1bc175e90c722d062c6a538dd2fc258 100644 (file)
@@ -821,11 +821,6 @@ void summary(void);
 
 int is_mobile_ua(char *user_agent);
 
-void embed_room_banner(void);
-HashList *GetFloorListHash(StrBuf *Target, WCTemplputParams *TP);
-HashList *GetRoomListHash(StrBuf *Target, WCTemplputParams *TP);
-int SortRoomsByListOrder(const void *room1, const void *room2);
-
 /* actual supported locales */
 void TmplGettext(StrBuf *Target, WCTemplputParams *TP);
 void offer_languages(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType);