* New command 'WIKI history|<pagename>' to list the revision history for a wiki page.
[citadel.git] / webcit / roomops.c
index b1fce7f15e7b062ba65ed9025788de974306c529..456b19ce657c104fcc68a0f178bc8bdb0185a6a8 100644 (file)
@@ -6,25 +6,14 @@
 #include "webcit.h"
 #include "webserver.h"
 #define MAX_FLOORS 128
-char floorlist[MAX_FLOORS][SIZ]; /**< list of our floor names */
-
-char *viewdefs[9]; /**< the different kinds of available views */
-
-/** See GetFloorListHash and GetRoomListHash for info on these. Basically we pull LFLR/LKRA etc. and set up a room HashList with these keys. */
-const char FLOOR_PARAM_NAMES[(FLOOR_PARAM_LEN + 1)][15] = {"ID",
-                                                          "NAME", 
-                                                          "ROOMS"};
-const char ROOM_PARAM_NAMES[(ROOM_PARAM_LEN + 1)][20] = {"NAME",
-                                                        "FLAG",
-                                                        "FLOOR",
-                                                        "LISTORDER",
-                                                        "ACL",
-                                                        "CURVIEW",
-                                                        "DEFVIEW",
-                                                        "LASTCHANGE"};
-/* Because avoiding strlen at run time is a Good Thing(TM) */
-const int FLOOR_PARAM_NAMELEN[(FLOOR_PARAM_LEN +1)] = {2, 4, 5};
-const int ROOM_PARAM_NAMELEN[(ROOM_PARAM_LEN +1)] = {4, 4, 5, 9, 3, 7, 7, 8};
+
+char floorlist[MAX_FLOORS][SIZ];       /* list of our floor names */
+
+char *viewdefs[9];                     /* the different kinds of available views */
+
+/* See GetFloorListHash and GetRoomListHash for info on these.
+ * Basically we pull LFLR/LKRA etc. and set up a room HashList with these keys.
+ */
 
 void display_whok(void);
 
@@ -49,22 +38,16 @@ void initialize_viewdefs(void) {
 int is_view_allowed_as_default(int which_view)
 {
        switch(which_view) {
-       case VIEW_BBS:          return(1);
-       case VIEW_MAILBOX:      return(1);
-       case VIEW_ADDRESSBOOK:  return(1);
-       case VIEW_CALENDAR:     return(1);
-       case VIEW_TASKS:        return(1);
-       case VIEW_NOTES:        return(1);
-
-#ifdef TECH_PREVIEW
-       case VIEW_WIKI:         return(1);
-#else /* TECH_PREVIEW */
-       case VIEW_WIKI:         return(0);      /* because it isn't finished yet */
-#endif /* TECH_PREVIEW */
-
-       case VIEW_CALBRIEF:     return(0);
-       case VIEW_JOURNAL:      return(0);
-       default:                return(0);      /* should never get here */
+               case VIEW_BBS:          return(1);
+               case VIEW_MAILBOX:      return(1);
+               case VIEW_ADDRESSBOOK:  return(1);
+               case VIEW_CALENDAR:     return(1);
+               case VIEW_TASKS:        return(1);
+               case VIEW_NOTES:        return(1);
+               case VIEW_WIKI:         return(1);
+               case VIEW_CALBRIEF:     return(0);
+               case VIEW_JOURNAL:      return(0);
+               default:                return(0);      /* should never get here */
        }
 }
 
@@ -72,68 +55,27 @@ int is_view_allowed_as_default(int which_view)
 /*
  * load the list of floors
  */
-void load_floorlist(void)
+void load_floorlist(StrBuf *Buf)
 {
        int a;
-       char buf[SIZ];
+       int Done = 0;
 
        for (a = 0; a < MAX_FLOORS; ++a)
                floorlist[a][0] = 0;
 
        serv_puts("LFLR");
-       serv_getln(buf, sizeof buf);
-       if (buf[0] != '1') {
+       StrBuf_ServGetln(Buf);
+       if (GetServerStatus(Buf, NULL) != 1) {
                strcpy(floorlist[0], "Main Floor");
                return;
        }
-       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-               extract_token(floorlist[extract_int(buf, 0)], buf, 1, '|', sizeof floorlist[0]);
-       }
-}
-
-
-/*
- * Free a session's march list
- */
-void free_march_list(wcsession *wcf)
-{
-       struct march *mptr;
-
-       while (wcf->march != NULL) {
-               mptr = wcf->march->next;
-               free(wcf->march);
-               wcf->march = mptr;
-       }
-
-}
-
-
-
-/*
- * remove a room from the march list
- */
-void remove_march(const StrBuf *aaa)
-{
-       struct march *mptr, *mptr2;
-
-       if (WC->march == NULL)
-               return;
-
-       if (!strcasecmp(WC->march->march_name, ChrPtr(aaa))) {
-               mptr = WC->march->next;
-               free(WC->march);
-               WC->march = mptr;
-               return;
-       }
-       mptr2 = WC->march;
-       for (mptr = WC->march; mptr != NULL; mptr = mptr->next) {
-               if (!strcasecmp(mptr->march_name, ChrPtr(aaa))) {
-                       mptr2->next = mptr->next;
-                       free(mptr);
-                       mptr = mptr2;
-               } else {
-                       mptr2 = mptr;
+       while (!Done && (StrBuf_ServGetln(Buf)>=0)) {
+               if ( (StrLength(Buf)==3) && 
+                    !strcmp(ChrPtr(Buf), "000")) {
+                       Done = 1;
+                       break;
                }
+               extract_token(floorlist[StrBufExtract_int(Buf, 0, '|')], ChrPtr(Buf), 1, '|', sizeof floorlist[0]);
        }
 }
 
@@ -157,7 +99,7 @@ void room_tree_list(struct roomlisting *rp)
        strcpy(rmname, rp->rlname);
        f = rp->rlflags;
 
-       wprintf("<a href=\"dotgoto&room=");
+       wprintf("<a href=\"dotgoto?room=");
        urlescputs(rmname);
        wprintf("\"");
        wprintf(">");
@@ -177,11 +119,8 @@ void room_tree_list(struct roomlisting *rp)
 }
 
 
-/** 
- * \brief Room ordering stuff (compare first by floor, then by order)
- * \param r1 first roomlist to compare
- * \param r2 second roomlist co compare
- * \return are they the same???
+/* 
+ * Room ordering stuff (compare first by floor, then by order)
  */
 int rordercmp(struct roomlisting *r1, struct roomlisting *r2)
 {
@@ -203,9 +142,8 @@ int rordercmp(struct roomlisting *r1, struct roomlisting *r2)
 }
 
 
-/**
- * \brief Common code for all room listings
- * \param variety what???
+/*
+ * Common code for all room listings
  */
 void listrms(char *variety)
 {
@@ -216,7 +154,7 @@ void listrms(char *variety)
        struct roomlisting *rp;
        struct roomlisting *rs;
 
-       /** Ask the server for a room list */
+       /* Ask the server for a room list */
        serv_puts(variety);
        serv_getln(buf, sizeof buf);
        if (buf[0] != '1') {
@@ -259,7 +197,7 @@ void listrms(char *variety)
 
        room_tree_list(rl);
 
-       /**
+       /*
         * If no rooms were listed, print an nbsp to make the cell
         * borders show up anyway.
         */
@@ -267,8 +205,8 @@ void listrms(char *variety)
 }
 
 
-/**
- * \brief list all forgotten rooms
+/*
+ * list all forgotten rooms
  */
 void zapped_list(void)
 {
@@ -293,8 +231,8 @@ void zapped_list(void)
 }
 
 
-/**
- * \brief read this room's info file (set v to 1 for verbose mode)
+/*
+ * read this room's info file (set v to 1 for verbose mode)
  */
 void readinfo(StrBuf *Target, WCTemplputParams *TP)
 {
@@ -319,14 +257,15 @@ void readinfo(StrBuf *Target, WCTemplputParams *TP)
 
                 wprintf("<div class=\"infos\" "
                        "onclick=\"javascript:Effect.Appear('room_infos', { duration: 0.5 });\" "
-                       ">");
+                       ">"
+               );
                escputs(briefinfo);
                 wprintf("</div><div id=\"room_infos\" style=\"display:none;\">");
                wprintf("<img class=\"close_infos\" "
                        "onclick=\"javascript:Effect.Fade('room_infos', { duration: 0.5 });\" "
-                       "src=\"static/closewindow.gif\" alt=\"%s\">",
+                       "src=\"static/closewindow.gif\" alt=\"%s\"  width=\"16\" height=\"16\">",
                        _("Close window")
-                       );
+               );
                escputs(fullinfo);
                 wprintf("</div>");
        }
@@ -338,12 +277,10 @@ void readinfo(StrBuf *Target, WCTemplputParams *TP)
 
 
 
-/**
- * \brief Display room banner icon.  
- * The server doesn't actually
- * need the room name, but we supply it in order to
- * keep the browser from using a cached icon from 
- * another room.
+/*
+ * Display room banner icon.  
+ * The server doesn't actually need the room name, but we supply it in
+ * order to keep the browser from using a cached icon from another room.
  */
 void embed_room_graphic(StrBuf *Target, WCTemplputParams *TP)
 {
@@ -352,7 +289,7 @@ void embed_room_graphic(StrBuf *Target, WCTemplputParams *TP)
        serv_puts("OIMG _roompic_");
        serv_getln(buf, sizeof buf);
        if (buf[0] == '2') {
-               wprintf("<img height=\"64px\" src=\"image&name=_roompic_&room=");
+               wprintf("<img height=\"64px\" src=\"image?name=_roompic_&room=");
                urlescputs(ChrPtr(WC->wc_roomname));
                wprintf("\">");
                serv_puts("CLOS");
@@ -361,37 +298,37 @@ void embed_room_graphic(StrBuf *Target, WCTemplputParams *TP)
        else if (WC->wc_view == VIEW_ADDRESSBOOK) {
                wprintf("<img class=\"roompic\" alt=\"\" src=\""
                        "static/viewcontacts_48x.gif"
-                       "\">"
+                       "\" >"
                        );
        }
        else if ( (WC->wc_view == VIEW_CALENDAR) || (WC->wc_view == VIEW_CALBRIEF) ) {
                wprintf("<img class=\"roompic\" alt=\"\" src=\""
                        "static/calarea_48x.gif"
-                       "\">"
+                       "\" width=\"48\" height=\"48\">"
                        );
        }
        else if (WC->wc_view == VIEW_TASKS) {
                wprintf("<img class=\"roompic\" alt=\"\" src=\""
                        "static/taskmanag_48x.gif"
-                       "\">"
+                       "\" width=\"48\" height=\"48\">"
                        );
        }
        else if (WC->wc_view == VIEW_NOTES) {
                wprintf("<img class=\"roompic\" alt=\"\" src=\""
                        "static/storenotes_48x.gif"
-                       "\">"
+                       "\" width=\"48\" height=\"48\">"
                        );
        }
        else if (WC->wc_view == VIEW_MAILBOX) {
                wprintf("<img class=\"roompic\" alt=\"\" src=\""
                        "static/privatemess_48x.gif"
-                       "\">"
+                       "\" width=\"48\" height=\"48\">"
                        );
        }
        else {
                wprintf("<img class=\"roompic\" alt=\"\" src=\""
                        "static/chatrooms_48x.gif"
-                       "\">"
+                       "\" width=\"48\" height=\"48\">"
                        );
        }
 
@@ -399,8 +336,8 @@ void embed_room_graphic(StrBuf *Target, WCTemplputParams *TP)
 
 
 
-/**
- * \brief Display the current view and offer an option to change it
+/*
+ * Display the current view and offer an option to change it
  */
 void embed_view_o_matic(StrBuf *Target, WCTemplputParams *TP)
 {
@@ -417,17 +354,17 @@ void embed_view_o_matic(StrBuf *Target, WCTemplputParams *TP)
                "[selectedIndex].value\">\n");
 
        for (i=0; i<(sizeof viewdefs / sizeof (char *)); ++i) {
-               /**
+               /*
                 * Only offer the views that make sense, given the default
                 * view for the room.  For example, don't offer a Calendar
                 * view in a non-Calendar room.
                 */
                if (
                        (i == WC->wc_view)
-                       ||      (i == WC->wc_default_view)                      /**< default */
-                       ||      ( (i == 0) && (WC->wc_default_view == 1) )      /**< mail or bulletin */
-                       ||      ( (i == 1) && (WC->wc_default_view == 0) )      /**< mail or bulletin */
-                       /** ||  ( (i == 7) && (WC->wc_default_view == 3) )      (calendar list temporarily disabled) */
+                       ||      (i == WC->wc_default_view)                      /* default */
+                       ||      ( (i == 0) && (WC->wc_default_view == 1) )      /* mail or bulletin */
+                       ||      ( (i == 1) && (WC->wc_default_view == 0) )      /* mail or bulletin */
+                       /* ||   ( (i == 7) && (WC->wc_default_view == 3) )      (calendar list temporarily disabled) */
                        ) {
 
                        wprintf("<option %s value=\"changeview?view=%d\">",
@@ -441,8 +378,8 @@ void embed_view_o_matic(StrBuf *Target, WCTemplputParams *TP)
 }
 
 
-/**
- * \brief Display a search box
+/*
+ * Display a search box
  */
 void embed_search_o_matic(StrBuf *Target, WCTemplputParams *TP)
 {
@@ -458,21 +395,22 @@ void embed_search_o_matic(StrBuf *Target, WCTemplputParams *TP)
 }
 
 
-/**
- * \brief              Embed the room banner
+/*
+ * Embed the room banner
  *
- * \param got          The information returned from a GOTO server command
- * \param navbar_style         Determines which navigation buttons to display
+ * got                 The information returned from a GOTO server command
+ * navbar_style        Determines which navigation buttons to display
  *
  */
 
 void embed_room_banner(char *got, int navbar_style) {
+       wcsession *WCC = WC;
        char buf[256];
        char buf2[1024];
        char with_files[256];
        int file_count=0;
        
-       /**
+       /*
         * We need to have the information returned by a GOTO server command.
         * If it isn't supplied, we fake it by issuing our own GOTO.
         */
@@ -484,25 +422,27 @@ void embed_room_banner(char *got, int navbar_style) {
                got = buf;
        }
 
-       /** The browser needs some information for its own use */
+       /* The browser needs some information for its own use */
        wprintf("<script type=\"text/javascript\">      \n"
                "       room_is_trash = %d;             \n"
                "</script>\n",
                WC->wc_is_trash
-               );
+       );
 
-       /**
+       /*
         * 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 (WC->this_page == NULL)
-               WC->this_page = NewStrBuf();
-       StrBufPrintf(WC->this_page, 
-                    "dotskip&room=%s",
-                    ChrPtr(WC->wc_roomname));
+       if (WCC->Hdr->this_page == NULL) {
+               WCC->Hdr->this_page = NewStrBuf();
+       }
+       StrBufPrintf(WCC->Hdr->this_page, 
+                    "dotskip?room=%s",
+                    ChrPtr(WC->wc_roomname)
+       );
 
-       /** Check for new mail. */
+       /* Check for new mail. */
        WC->new_mail = extract_int(&got[4], 9);
        WC->wc_view = extract_int(&got[4], 11);
 
@@ -542,7 +482,7 @@ void embed_room_banner(char *got, int navbar_style) {
                if (navbar_style == navbar_default) wprintf(
                        "<li class=\"ungoto\">"
                        "<a href=\"ungoto\">"
-                       "<img src=\"static/ungoto2_24x.gif\" alt=\"\">"
+                       "<img src=\"static/ungoto2_24x.gif\" alt=\"\" width=\"24\" height=\"24\">"
                        "<span class=\"navbar_link\">%s</span></A>"
                        "</li>\n", _("Ungoto")
                        );
@@ -551,7 +491,7 @@ void embed_room_banner(char *got, int navbar_style) {
                        wprintf(
                                "<li class=\"newmess\">"
                                "<a href=\"readnew\">"
-                               "<img src=\"static/newmess2_24x.gif\" alt=\"\">"
+                               "<img src=\"static/newmess2_24x.gif\" alt=\"\" width=\"24\" height=\"24\">"
                                "<span class=\"navbar_link\">%s</span></A>"
                                "</li>\n", _("Read new messages")
                                );
@@ -564,7 +504,7 @@ void embed_room_banner(char *got, int navbar_style) {
                                        "<li class=\"viewcontacts\">"
                                        "<a href=\"readfwd\">"
                                        "<img src=\"static/viewcontacts_24x.gif\" "
-                                       "alt=\"\">"
+                                       "alt=\"\" width=\"24\" height=\"24\">"
                                        "<span class=\"navbar_link\">"
                                        "%s"
                                        "</span></a></li>\n", _("View contacts")
@@ -575,7 +515,7 @@ void embed_room_banner(char *got, int navbar_style) {
                                        "<li class=\"staskday\">"
                                        "<a href=\"readfwd?calview=day\">"
                                        "<img src=\"static/taskday2_24x.gif\" "
-                                       "alt=\"\">"
+                                       "alt=\"\" width=\"24\" height=\"24\">"
                                        "<span class=\"navbar_link\">"
                                        "%s"
                                        "</span></a></li>\n", _("Day view")
@@ -584,7 +524,7 @@ void embed_room_banner(char *got, int navbar_style) {
                                        "<li class=\"monthview\">"
                                        "<a href=\"readfwd?calview=month\">"
                                        "<img src=\"static/monthview2_24x.gif\" "
-                                       "alt=\"\">"
+                                       "alt=\"\" width=\"24\" height=\"24\">"
                                        "<span class=\"navbar_link\">"
                                        "%s"
                                        "</span></a></li>\n", _("Month view")
@@ -595,7 +535,7 @@ void embed_room_banner(char *got, int navbar_style) {
                                        "<li class=\"monthview\">"
                                        "<a href=\"readfwd?calview=month\">"
                                        "<img src=\"static/monthview2_24x.gif\" "
-                                       "alt=\"\">"
+                                       "alt=\"\" width=\"24\" height=\"24\">"
                                        "<span class=\"navbar_link\">"
                                        "%s"
                                        "</span></a></li>\n", _("Calendar list")
@@ -606,7 +546,7 @@ void embed_room_banner(char *got, int navbar_style) {
                                        "<li class=\"taskmanag\">"
                                        "<a href=\"readfwd\">"
                                        "<img src=\"static/taskmanag_24x.gif\" "
-                                       "alt=\"\">"
+                                       "alt=\"\" width=\"24\" height=\"24\">"
                                        "<span class=\"navbar_link\">"
                                        "%s"
                                        "</span></a></li>\n", _("View tasks")
@@ -617,7 +557,7 @@ void embed_room_banner(char *got, int navbar_style) {
                                        "<li class=\"viewnotes\">"
                                        "<a href=\"readfwd\">"
                                        "<img src=\"static/viewnotes_24x.gif\" "
-                                       "alt=\"\">"
+                                       "alt=\"\" width=\"24\" height=\"24\">"
                                        "<span class=\"navbar_link\">"
                                        "%s"
                                        "</span></a></li>\n", _("View notes")
@@ -628,7 +568,7 @@ void embed_room_banner(char *got, int navbar_style) {
                                        "<li class=\"readallmess\">"
                                        "<a id=\"m_refresh\" href=\"readfwd\">"
                                        "<img src=\"static/readallmess3_24x.gif\" "
-                                       "alt=\"\">"
+                                       "alt=\"\" width=\"24\" height=\"24\">"
                                        "<span class=\"navbar_link\">"
                                        "%s"
                                        "</span></a></li>\n", _("Refresh message list")
@@ -639,7 +579,7 @@ void embed_room_banner(char *got, int navbar_style) {
                                        "<li class=\"readallmess\">"
                                        "<a href=\"readfwd\">"
                                        "<img src=\"static/readallmess3_24x.gif\" "
-                                       "alt=\"\">"
+                                       "alt=\"\" width=\"24\" height=\"24\">"
                                        "<span class=\"navbar_link\">"
                                        "%s"
                                        "</span></a></li>\n", _("Wiki home")
@@ -650,7 +590,7 @@ void embed_room_banner(char *got, int navbar_style) {
                                        "<li class=\"readallmess\">"
                                        "<a href=\"readfwd\">"
                                        "<img src=\"static/readallmess3_24x.gif\" "
-                                       "alt=\"\">"
+                                       "alt=\"\" width=\"24\" height=\"24\">"
                                        "<span class=\"navbar_link\">"
                                        "%s"
                                        "</span></a></li>\n", _("Read all messages")
@@ -666,7 +606,8 @@ void embed_room_banner(char *got, int navbar_style) {
                                        "<li class=\"addnewcontact\">"
                                        "<a href=\"display_enter\">"
                                        "<img src=\"static/addnewcontact_24x.gif\" "
-                                       "alt=\"\"><span class=\"navbar_link\">"
+                                       "alt=\"\" width=\"24\" height=\"24\">"
+                                       "<span class=\"navbar_link\">"
                                        "%s"
                                        "</span></a></li>\n", _("Add new contact")
                                        );
@@ -679,7 +620,8 @@ void embed_room_banner(char *got, int navbar_style) {
                                if (havebstr("day"  )) wprintf("?day=%s", bstr("day"));
                                wprintf("\">"
                                        "<img  src=\"static/addevent_24x.gif\" "
-                                       "alt=\"\"><span class=\"navbar_link\">"
+                                       "alt=\"\" width=\"24\" height=\"24\">"
+                                       "<span class=\"navbar_link\">"
                                        "%s"
                                        "</span></a></li>\n", _("Add new event")
                                        );
@@ -689,7 +631,8 @@ void embed_room_banner(char *got, int navbar_style) {
                                        "<li class=\"newmess\">"
                                        "<a href=\"display_enter\">"
                                        "<img  src=\"static/newmess3_24x.gif\" "
-                                       "alt=\"\"><span class=\"navbar_link\">"
+                                       "alt=\"\" width=\"24\" height=\"24\">"
+                                       "<span class=\"navbar_link\">"
                                        "%s"
                                        "</span></a></li>\n", _("Add new task")
                                        );
@@ -699,19 +642,24 @@ void embed_room_banner(char *got, int navbar_style) {
                                        "<li class=\"enternewnote\">"
                                        "<a href=\"add_new_note\">"
                                        "<img  src=\"static/enternewnote_24x.gif\" "
-                                       "alt=\"\"><span class=\"navbar_link\">"
+                                       "alt=\"\" width=\"24\" height=\"24\">"
+                                       "<span class=\"navbar_link\">"
                                        "%s"
                                        "</span></a></li>\n", _("Add new note")
                                        );
                                break;
                        case VIEW_WIKI:
                                safestrncpy(buf, bstr("page"), sizeof buf);
+                               if (IsEmptyStr(buf)) {
+                                       safestrncpy(buf, "home", sizeof buf);
+                               }
                                str_wiki_index(buf);
                                wprintf(
                                        "<li class=\"newmess\">"
                                        "<a href=\"display_enter?wikipage=%s\">"
                                        "<img  src=\"static/newmess3_24x.gif\" "
-                                       "alt=\"\"><span class=\"navbar_link\">"
+                                       "alt=\"\" width=\"24\" height=\"24\">"
+                                       "<span class=\"navbar_link\">"
                                        "%s"
                                        "</span></a></li>\n", buf, _("Edit this page")
                                        );
@@ -721,17 +669,27 @@ void embed_room_banner(char *got, int navbar_style) {
                                        "<li class=\"newmess\">"
                                        "<a href=\"display_enter\">"
                                        "<img  src=\"static/newmess3_24x.gif\" "
-                                       "alt=\"\"><span class=\"navbar_link\">"
+                                       "alt=\"\" width=\"24\" height=\"24\">"
+                                       "<span class=\"navbar_link\">"
                                        "%s"
                                        "</span></a></li>\n", _("Write mail")
                                        );
+                               wprintf(
+                                       "<li class=\"newmess\">"
+                                       "<a href=\"javascript:deleteAllSelectedMessages();\">"
+                                       "<img  src=\"static/delete.gif\" "
+                                       "alt=\"\" width=\"24\" height=\"24\"><span class=\"navbar_link\">"
+                                       "%s"
+                                       "</span></a></li>\n", _("Delete")
+                                       );
                                break;
                        default:
                                wprintf(
                                        "<li class=\"newmess\">"
                                        "<a href=\"display_enter\">"
                                        "<img  src=\"static/newmess3_24x.gif\" "
-                                       "alt=\"\"><span class=\"navbar_link\">"
+                                       "alt=\"\" width=\"24\" height=\"24\">"
+                                       "<span class=\"navbar_link\">"
                                        "%s"
                                        "</span></a></li>\n", _("Enter a message")
                                        );
@@ -743,7 +701,8 @@ void embed_room_banner(char *got, int navbar_style) {
                        "<li class=\"skipthisroom\">"
                        "<a href=\"skip\" "
                        "title=\"%s\">"
-                       "<img  src=\"static/skipthisroom_24x.gif\" alt=\"\">"
+                       "<img  src=\"static/skipthisroom_24x.gif\" alt=\"\" "
+                       "width=\"24\" height=\"24\">"
                        "<span class=\"navbar_link\">%s</span></a>"
                        "</li>\n",
                        _("Leave all messages marked as unread, go to next room with unread messages"),
@@ -754,7 +713,8 @@ void embed_room_banner(char *got, int navbar_style) {
                        "<li class=\"markngo\">"
                        "<a href=\"gotonext\" "
                        "title=\"%s\">"
-                       "<img  src=\"static/markngo_24x.gif\" alt=\"\">"
+                       "<img  src=\"static/markngo_24x.gif\" alt=\"\" "
+                       "width=\"24\" height=\"24\">"
                        "<span class=\"navbar_link\">%s</span></a>"
                        "</li>\n",
                        _("Mark all messages as read, go to next room with unread messages"),
@@ -780,13 +740,19 @@ long gotoroom(const StrBuf *gname)
        strcpy(WC->ugname, ChrPtr(WC->wc_roomname));
        WC->uglsn = ls;
        Buf = NewStrBuf();
-       /** move to the new room */
+
+       /* move to the new room */
        serv_printf("GOTO %s", ChrPtr(gname));
        StrBuf_ServGetln(Buf);
        if  (GetServerStatus(Buf, &err) != 2) {
                serv_puts("GOTO _BASEROOM_");
                StrBuf_ServGetln(Buf);
-               if (GetServerStatus(Buf, &err) != 2) {
+               /* 
+                * well, we know that this is the fallback case, 
+                * but we're interested that the first command 
+                * didn't work out in first place.
+                */
+               if (GetServerStatus(Buf, NULL) != 2) {
                        FreeStrBuf(&Buf);
                        return err;
                }
@@ -825,134 +791,6 @@ long gotoroom(const StrBuf *gname)
 }
 
 
-/**
- * \brief Locate the room on the march list which we most want to go to.  
- * Each room
- * is measured given a "weight" of preference based on various factors.
- * \param desired_floor the room number on the citadel server
- * \return the roomname
- */
-char *pop_march(int desired_floor)
-{
-       static char TheRoom[128];
-       int TheFloor = 0;
-       int TheOrder = 32767;
-       int TheWeight = 0;
-       int weight;
-       struct march *mptr = NULL;
-
-       strcpy(TheRoom, "_BASEROOM_");
-       if (WC->march == NULL)
-               return (TheRoom);
-
-       for (mptr = WC->march; mptr != NULL; mptr = mptr->next) {
-               weight = 0;
-               if ((strcasecmp(mptr->march_name, "_BASEROOM_")))
-                       weight = weight + 10000;
-               if (mptr->march_floor == desired_floor)
-                       weight = weight + 5000;
-
-               weight = weight + ((128 - (mptr->march_floor)) * 128);
-               weight = weight + (128 - (mptr->march_order));
-
-               if (weight > TheWeight) {
-                       TheWeight = weight;
-                       strcpy(TheRoom, mptr->march_name);
-                       TheFloor = mptr->march_floor;
-                       TheOrder = mptr->march_order;
-               }
-       }
-       return (TheRoom);
-}
-
-
-
-/*
- * Goto next room having unread messages.
- *
- * We want to skip over rooms that the user has already been to, and take the
- * user back to the lobby when done.  The room we end up in is placed in
- * newroom - which is set to 0 (the lobby) initially.
- * We start the search in the current room rather than the beginning to prevent
- * two or more concurrent users from dragging each other back to the same room.
- */
-void gotonext(void)
-{
-       char buf[256];
-       struct march *mptr = NULL;
-       struct march *mptr2 = NULL;
-       char room_name[128];
-       StrBuf *next_room;
-       int ELoop = 0;
-
-       /*
-        * First check to see if the march-mode list is already allocated.
-        * If it is, pop the first room off the list and go there.
-        */
-
-       if (WC->march == NULL) {
-               serv_puts("LKRN");
-               serv_getln(buf, sizeof buf);
-               if (buf[0] == '1')
-                       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-                               if (IsEmptyStr(buf)) {
-                                       if (ELoop > 10000)
-                                               return;
-                                       if (ELoop % 100 == 0)
-                                               sleeeeeeeeeep(1);
-                                       ELoop ++;
-                                       continue;                                       
-                               }
-                               extract_token(room_name, buf, 0, '|', sizeof room_name);
-                               if (strcasecmp(room_name, ChrPtr(WC->wc_roomname))) {
-                                       mptr = (struct march *) malloc(sizeof(struct march));
-                                       mptr->next = NULL;
-                                       safestrncpy(mptr->march_name, room_name, sizeof mptr->march_name);
-                                       mptr->march_floor = extract_int(buf, 2);
-                                       mptr->march_order = extract_int(buf, 3);
-                                       if (WC->march == NULL) 
-                                               WC->march = mptr;
-                                       else 
-                                               mptr2->next = mptr;
-                                       mptr2 = mptr;
-                               }
-                               buf[0] = '\0';
-                       }
-               /*
-                * add _BASEROOM_ to the end of the march list, so the user will end up
-                * in the system base room (usually the Lobby>) at the end of the loop
-                */
-               mptr = (struct march *) malloc(sizeof(struct march));
-               mptr->next = NULL;
-               mptr->march_order = 0;
-               mptr->march_floor = 0;
-               strcpy(mptr->march_name, "_BASEROOM_");
-               if (WC->march == NULL) {
-                       WC->march = mptr;
-               } else {
-                       mptr2 = WC->march;
-                       while (mptr2->next != NULL)
-                               mptr2 = mptr2->next;
-                       mptr2->next = mptr;
-               }
-               /*
-                * ...and remove the room we're currently in, so a <G>oto doesn't make us
-                * walk around in circles
-                */
-               remove_march(WC->wc_roomname);
-       }
-       if (WC->march != NULL) {
-               next_room = NewStrBufPlain(pop_march(-1), -1);/*TODO: migrate march to strbuf */
-       } else {
-               next_room = NewStrBufPlain(HKEY("_BASEROOM_"));
-       }
-
-
-       smart_goto(next_room);
-       FreeStrBuf(&next_room);
-}
-
-
 /*
  * goto next room
  */
@@ -975,36 +813,6 @@ void slrp_highest(void)
 }
 
 
-/*
- * un-goto the previous room
- */
-void ungoto(void)
-{
-       StrBuf *Buf;
-
-       if (!strcmp(WC->ugname, "")) {
-               smart_goto(WC->wc_roomname);
-               return;
-       }
-       serv_printf("GOTO %s", WC->ugname);
-       Buf = NewStrBuf();
-       StrBuf_ServGetln(Buf);
-       if (GetServerStatus(Buf, NULL) != 2) {
-               smart_goto(WC->wc_roomname);
-               FreeStrBuf(&Buf);
-               return;
-       }
-       if (WC->uglsn >= 0L) {
-               serv_printf("SLRP %ld", WC->uglsn);
-               StrBuf_ServGetln(Buf);
-       }
-       FlushStrBuf(Buf);
-       StrBufAppendBufPlain(Buf, WC->ugname, -1, 0);
-       strcpy(WC->ugname, "");
-       smart_goto(Buf);
-       FreeStrBuf(&Buf);
-}
-
 typedef struct __room_states {
        char password[SIZ];
        char dirname[SIZ];
@@ -1144,6 +952,7 @@ int set_roomflags(room_states *RoomOps)
  */
 void display_editroom(void)
 {
+       StrBuf *Buf;
        char buf[SIZ];
        char cmd[1024];
        char node[256];
@@ -1171,7 +980,9 @@ void display_editroom(void)
        tab = bstr("tab");
        if (IsEmptyStr(tab)) tab = "admin";
 
-       load_floorlist();
+       Buf = NewStrBuf();
+       load_floorlist(Buf);
+       FreeStrBuf(&Buf);
        output_headers(1, 1, 1, 0, 0, 0);
 
        wprintf("<div class=\"fix_scrollbar_bug\">");
@@ -1180,7 +991,7 @@ void display_editroom(void)
 
        /* print the tabbed dialog */
        wprintf("<div align=\"center\">");
-       wprintf("<table id=\"AdminTabs\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\""
+       wprintf("<table id=\"AdminTabs\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">"
                "<tr align=\"center\" style=\"cursor:pointer\"><td>&nbsp;</td>"
                );
 
@@ -1190,7 +1001,7 @@ void display_editroom(void)
                wprintf(_("Administration"));
        }
        else {
-               wprintf("< tab_cell_edit\"><a href=\"display_editroom&tab=admin\">");
+               wprintf("< tab_cell_edit\"><a href=\"display_editroom?tab=admin\">");
                wprintf(_("Administration"));
                wprintf("</a>");
        }
@@ -1205,7 +1016,7 @@ void display_editroom(void)
                        wprintf(_("Configuration"));
                }
                else {
-                       wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=config\">");
+                       wprintf(" tab_cell_edit\"><a href=\"display_editroom?tab=config\">");
                        wprintf(_("Configuration"));
                        wprintf("</a>");
                }
@@ -1218,7 +1029,7 @@ void display_editroom(void)
                        wprintf(_("Message expire policy"));
                }
                else {
-                       wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=expire\">");
+                       wprintf(" tab_cell_edit\"><a href=\"display_editroom?tab=expire\">");
                        wprintf(_("Message expire policy"));
                        wprintf("</a>");
                }
@@ -1231,7 +1042,7 @@ void display_editroom(void)
                        wprintf(_("Access controls"));
                }
                else {
-                       wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=access\">");
+                       wprintf(" tab_cell_edit\"><a href=\"display_editroom?tab=access\">");
                        wprintf(_("Access controls"));
                        wprintf("</a>");
                }
@@ -1244,7 +1055,7 @@ void display_editroom(void)
                        wprintf(_("Sharing"));
                }
                else {
-                       wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=sharing\">");
+                       wprintf(" tab_cell_edit\"><a href=\"display_editroom?tab=sharing\">");
                        wprintf(_("Sharing"));
                        wprintf("</a>");
                }
@@ -1257,7 +1068,7 @@ void display_editroom(void)
                        wprintf(_("Mailing list service"));
                }
                else {
-                       wprintf("< tab_cell_edit\"><a href=\"display_editroom&tab=listserv\">");
+                       wprintf("< tab_cell_edit\"><a href=\"display_editroom?tab=listserv\">");
                        wprintf(_("Mailing list service"));
                        wprintf("</a>");
                }
@@ -1272,7 +1083,7 @@ void display_editroom(void)
                wprintf(_("Remote retrieval"));
        }
        else {
-               wprintf("< tab_cell_edit\"><a href=\"display_editroom&tab=feeds\">");
+               wprintf("< tab_cell_edit\"><a href=\"display_editroom?tab=feeds\">");
                wprintf(_("Remote retrieval"));
                wprintf("</a>");
        }
@@ -1299,7 +1110,9 @@ void display_editroom(void)
                wprintf("');\">\n");
                wprintf(_("Delete this room"));
                wprintf("</a>\n"
-                       "<li><a href=\"display_editroompic\">\n");
+                       "<li><a href=\"display_editroompic?which_room=");
+               urlescputs(ChrPtr(WC->wc_roomname));
+               wprintf("\">\n");
                wprintf(_("Set or change the icon for this room's banner"));
                wprintf("</a>\n"
                        "<li><a href=\"display_editinfo\">\n");
@@ -1722,7 +1535,7 @@ void display_editroom(void)
                                        extract_token(recp, buf, 1, '|', sizeof recp);
                        
                                        escputs(recp);
-                                       wprintf(" <a href=\"netedit&cmd=remove&tab=listserv&line=listrecp|");
+                                       wprintf(" <a href=\"netedit?cmd=remove&tab=listserv&line=listrecp|");
                                        urlescputs(recp);
                                        wprintf("\">");
                                        wprintf(_("(remove)"));
@@ -1752,7 +1565,7 @@ void display_editroom(void)
                                        extract_token(recp, buf, 1, '|', sizeof recp);
                        
                                        escputs(recp);
-                                       wprintf(" <a href=\"netedit&cmd=remove&tab=listserv&line="
+                                       wprintf(" <a href=\"netedit?cmd=remove&tab=listserv&line="
                                                "digestrecp|");
                                        urlescputs(recp);
                                        wprintf("\">");
@@ -1797,7 +1610,7 @@ void display_editroom(void)
                wprintf(_("The URL for subscribe/unsubscribe is: "));
                wprintf("<TT>%s://%s/listsub</TT></td></tr>\n",
                        (is_https ? "https" : "http"),
-                       ChrPtr(WC->http_host));
+                       ChrPtr(WC->Hdr->HR.http_host));
                /* Public posting? */
                wprintf("<tr><td>");
                wprintf(_("Allow non-subscribers to mail to this room."));
@@ -1976,7 +1789,7 @@ void display_editroom(void)
                                        wprintf("<td>%ld</td>", extract_long(buf, 5));  /* Fetching interval */
                        
                                        wprintf("<td class=\"button_link\">");
-                                       wprintf(" <a href=\"netedit&cmd=remove&tab=feeds&line=pop3client|");
+                                       wprintf(" <a href=\"netedit?cmd=remove&tab=feeds&line=pop3client|");
                                        urlescputs(recp);
                                        wprintf("\">");
                                        wprintf(_("(remove)"));
@@ -2043,7 +1856,7 @@ void display_editroom(void)
                                        wprintf("</td>");
 
                                        wprintf("<td class=\"button_link\">");
-                                       wprintf(" <a href=\"netedit&cmd=remove&tab=feeds&line=rssclient|");
+                                       wprintf(" <a href=\"netedit?cmd=remove&tab=feeds&line=rssclient|");
                                        urlescputs(recp);
                                        wprintf("\">");
                                        wprintf(_("(remove)"));
@@ -2464,15 +2277,18 @@ void display_whok(void)
  */
 void display_entroom(void)
 {
+       StrBuf *Buf;
        int i;
        char buf[SIZ];
 
+       Buf = NewStrBuf();
        serv_puts("CRE8 0");
        serv_getln(buf, sizeof buf);
 
        if (buf[0] != '2') {
                strcpy(WC->ImportantMessage, &buf[4]);
                display_main_menu();
+               FreeStrBuf(&Buf);
                return;
        }
 
@@ -2495,7 +2311,7 @@ void display_entroom(void)
        wprintf("<tr class=\"odd\"><td>");
        wprintf(_("Resides on floor: "));
        wprintf("</td><td>");
-        load_floorlist(); 
+        load_floorlist(Buf); 
         wprintf("<select name=\"er_floor\" size=\"1\">\n");
         for (i = 0; i < 128; ++i)
                 if (!IsEmptyStr(floorlist[i])) {
@@ -2604,6 +2420,7 @@ void display_entroom(void)
        do_template("endbox", NULL);
 
        wDumpContent(1);
+       FreeStrBuf(&Buf);
 }
 
 
@@ -3051,363 +2868,6 @@ void change_view(void) {
        do_change_view(view);
 }
 
-
-/**
- * \brief One big expanded tree list view --- like a folder list
- * \param fold the folder to view
- * \param max_folders how many folders???
- * \param num_floors hom many floors???
- */
-void do_folder_view(struct folder *fold, int max_folders, int num_floors) {
-       char buf[SIZ];
-       int levels;
-       int i;
-       int has_subfolders = 0;
-       int *parents;
-
-       parents = malloc(max_folders * sizeof(int));
-
-       /** BEGIN TREE MENU */
-       wprintf("<div id=\"roomlist_div\">Loading folder list...</div>\n");
-
-       /** include NanoTree */
-       wprintf("<script type=\"text/javascript\" src=\"static/nanotree.js\"></script>\n");
-
-       /** initialize NanoTree */
-       wprintf("<script type=\"text/javascript\">                      \n"
-               "       showRootNode = false;                           \n"
-               "       sortNodes = false;                              \n"
-               "       dragable = false;                               \n"
-               "                                                       \n"
-               "       function standardClick(treeNode) {              \n"
-               "       }                                               \n"
-               "                                                       \n"
-               "       var closedGif = 'static/folder_closed.gif';     \n"
-               "       var openGif = 'static/folder_open.gif';         \n"
-               "                                                       \n"
-               "       rootNode = new TreeNode(1, 'root node - hide'); \n"
-               );
-
-       levels = 0;
-       for (i=0; i<max_folders; ++i) {
-
-               has_subfolders = 0;
-               if ((i+1) < max_folders) {
-                       int len;
-                       len = strlen(fold[i].name);
-                       if ( (!strncasecmp(fold[i].name, fold[i+1].name, len))
-                            && (fold[i+1].name[len] == '|') ) {
-                               has_subfolders = 1;
-                       }
-               }
-
-               levels = num_tokens(fold[i].name, '|');
-               parents[levels] = i;
-
-               wprintf("var node%d = new TreeNode(%d, '", i, i);
-
-               if (fold[i].selectable) {
-                       wprintf("<a href=\"dotgoto?room=");
-                       urlescputs(fold[i].room);
-                       wprintf("\">");
-               }
-
-               if (levels == 1) {
-                       wprintf("<span class=\"roomlist_floor\">");
-               }
-               else if (fold[i].hasnewmsgs) {
-                       wprintf("<span class=\"roomlist_new\">");
-               }
-               else {
-                       wprintf("<span class=\"roomlist_old\">");
-               }
-               extract_token(buf, fold[i].name, levels-1, '|', sizeof buf);
-               escputs(buf);
-               wprintf("</span>");
-
-               wprintf("</a>', ");
-               if (has_subfolders) {
-                       wprintf("new Array(closedGif, openGif)");
-               }
-               else if (fold[i].view == VIEW_ADDRESSBOOK) {
-                       wprintf("'static/viewcontacts_16x.gif'");
-               }
-               else if (fold[i].view == VIEW_CALENDAR) {
-                       wprintf("'static/calarea_16x.gif'");
-               }
-               else if (fold[i].view == VIEW_CALBRIEF) {
-                       wprintf("'static/calarea_16x.gif'");
-               }
-               else if (fold[i].view == VIEW_TASKS) {
-                       wprintf("'static/taskmanag_16x.gif'");
-               }
-               else if (fold[i].view == VIEW_NOTES) {
-                       wprintf("'static/storenotes_16x.gif'");
-               }
-               else if (fold[i].view == VIEW_MAILBOX) {
-                       wprintf("'static/privatemess_16x.gif'");
-               }
-               else {
-                       wprintf("'static/chatrooms_16x.gif'");
-               }
-               wprintf(", '");
-               urlescputs(fold[i].name);
-               wprintf("');\n");
-
-               if (levels < 2) {
-                       wprintf("rootNode.addChild(node%d);\n", i);
-               }
-               else {
-                       wprintf("node%d.addChild(node%d);\n", parents[levels-1], i);
-               }
-       }
-
-       wprintf("container = document.getElementById('roomlist_div');   \n"
-               "showTree('');  \n"
-               "</script>\n"
-               );
-
-       free(parents);
-       /** END TREE MENU */
-}
-
-/**
- * \brief Boxes and rooms and lists ... oh my!
- * \param fold the folder to view
- * \param max_folders how many folders???
- * \param num_floors hom many floors???
- */
-void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
-       char buf[256];
-       char floor_name[256];
-       char old_floor_name[256];
-       int levels, oldlevels;
-       int i, t;
-       int num_boxes = 0;
-       static int columns = 3;
-       int boxes_per_column = 0;
-       int current_column = 0;
-       int nf;
-
-       strcpy(floor_name, "");
-       strcpy(old_floor_name, "");
-
-       nf = num_floors;
-       while (nf % columns != 0) ++nf;
-       boxes_per_column = (nf / columns);
-       if (boxes_per_column < 1) boxes_per_column = 1;
-
-       /** Outer table (for columnization) */
-       wprintf("<table BORDER=0 WIDTH=96%% CELLPADDING=5>"
-               "<tr><td valign=top>");
-
-       levels = 0;
-       oldlevels = 0;
-       for (i=0; i<max_folders; ++i) {
-
-               levels = num_tokens(fold[i].name, '|');
-               extract_token(floor_name, fold[i].name, 0,
-                             '|', sizeof floor_name);
-
-               if ( (strcasecmp(floor_name, old_floor_name))
-                    && (!IsEmptyStr(old_floor_name)) ) {
-                       /* End inner box */
-                       do_template("endbox", NULL);
-                       wprintf("<br>");
-
-                       ++num_boxes;
-                       if ((num_boxes % boxes_per_column) == 0) {
-                               ++current_column;
-                               if (current_column < columns) {
-                                       wprintf("</td><td valign=top>\n");
-                               }
-                       }
-               }
-               strcpy(old_floor_name, floor_name);
-
-               if (levels == 1) {
-                       StrBuf *Buf;
-                       WCTemplputParams SubTP;
-
-                       Buf = NewStrBufPlain(floor_name, -1);
-                       memset(&SubTP, 0, sizeof(WCTemplputParams));
-                       SubTP.Filter.ContextType = CTX_STRBUF;
-                       SubTP.Context = Buf;
-                       DoTemplate(HKEY("beginbox"), NULL, &SubTP);
-                       
-                       FreeStrBuf(&Buf);
-               }
-
-               oldlevels = levels;
-
-               if (levels > 1) {
-                       wprintf("&nbsp;");
-                       if (levels>2) for (t=0; t<(levels-2); ++t) wprintf("&nbsp;&nbsp;&nbsp;");
-                       if (fold[i].selectable) {
-                               wprintf("<a href=\"dotgoto?room=");
-                               urlescputs(fold[i].room);
-                               wprintf("\">");
-                       }
-                       else {
-                               wprintf("<i>");
-                       }
-                       if (fold[i].hasnewmsgs) {
-                               wprintf("<span class=\"roomlist_new\">");
-                       }
-                       else {
-                               wprintf("<span class=\"roomlist_old\">");
-                       }
-                       extract_token(buf, fold[i].name, levels-1, '|', sizeof buf);
-                       escputs(buf);
-                       wprintf("</span>");
-                       if (fold[i].selectable) {
-                               wprintf("</A>");
-                       }
-                       else {
-                               wprintf("</i>");
-                       }
-                       if (!strcasecmp(fold[i].name, "My Folders|Mail")) {
-                               wprintf(" (INBOX)");
-                       }
-                       wprintf("<br />\n");
-               }
-       }
-       /** End the final inner box */
-       do_template("endbox", NULL);
-
-       wprintf("</td></tr></table>\n");
-}
-
-/**
- * \brief print a floor div???
- * \param which_floordiv name of the floordiv???
- */
-void set_floordiv_expanded(void) {
-       wcsession *WCC = WC;
-       StrBuf *FloorDiv;
-       
-       FloorDiv = NewStrBuf();
-       StrBufAppendBuf(FloorDiv, WCC->UrlFragment2, 0);
-       set_preference("floordiv_expanded", FloorDiv, 1);
-       WCC->floordiv_expanded = FloorDiv;
-}
-
-/**
- * \brief view the iconbar
- * \param fold the folder to view
- * \param max_folders how many folders???
- * \param num_floors hom many floors???
- */
-void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
-       char buf[256];
-       char floor_name[256];
-       char old_floor_name[256];
-       char floordivtitle[256];
-       char floordiv_id[32];
-       int levels, oldlevels;
-       int i, t;
-       char *icon = NULL;
-
-       strcpy(floor_name, "");
-       strcpy(old_floor_name, "");
-
-       levels = 0;
-       oldlevels = 0;
-       for (i=0; i<max_folders; ++i) {
-
-               levels = num_tokens(fold[i].name, '|');
-               extract_token(floor_name, fold[i].name, 0,
-                             '|', sizeof floor_name);
-
-               if ( (strcasecmp(floor_name, old_floor_name))
-                    && (!IsEmptyStr(old_floor_name)) ) {
-                       /** End inner box */
-                       wprintf("<br>\n");
-                       wprintf("</div>\n");    /** floordiv */
-               }
-               strcpy(old_floor_name, floor_name);
-
-               if (levels == 1) {
-                       /** Begin floor */
-                       stresc(floordivtitle, 256, floor_name, 0, 0);
-                       sprintf(floordiv_id, "floordiv%d", i);
-                       wprintf("<span class=\"ib_roomlist_floor\" "
-                               "onClick=\"expand_floor('%s')\">"
-                               "%s</span><br>\n", floordiv_id, floordivtitle);
-                       wprintf("<div id=\"%s\" style=\"display:%s\">",
-                               floordiv_id,
-                               (!strcasecmp(floordiv_id, ChrPtr(WC->floordiv_expanded)) ? "block" : "none")
-                               );
-               }
-
-               oldlevels = levels;
-
-               if (levels > 1) {
-                       wprintf("<div id=\"roomdiv%d\">", i);
-                       wprintf("&nbsp;");
-                       if (levels>2) for (t=0; t<(levels-2); ++t) wprintf("&nbsp;");
-
-                       /** choose the icon */
-                       if (fold[i].view == VIEW_ADDRESSBOOK) {
-                               icon = "viewcontacts_16x.gif" ;
-                       }
-                       else if (fold[i].view == VIEW_CALENDAR) {
-                               icon = "calarea_16x.gif" ;
-                       }
-                       else if (fold[i].view == VIEW_CALBRIEF) {
-                               icon = "calarea_16x.gif" ;
-                       }
-                       else if (fold[i].view == VIEW_TASKS) {
-                               icon = "taskmanag_16x.gif" ;
-                       }
-                       else if (fold[i].view == VIEW_NOTES) {
-                               icon = "storenotes_16x.gif" ;
-                       }
-                       else if (fold[i].view == VIEW_MAILBOX) {
-                               icon = "privatemess_16x.gif" ;
-                       }
-                       else {
-                               icon = "chatrooms_16x.gif" ;
-                       }
-
-                       if (fold[i].selectable) {
-                               wprintf("<a href=\"dotgoto?room=");
-                               urlescputs(fold[i].room);
-                               wprintf("\">");
-                               wprintf("<img  border=0 src=\"static/%s\" alt=\"\"> ", icon);
-                       }
-                       else {
-                               wprintf("<i>");
-                       }
-                       if (fold[i].hasnewmsgs) {
-                               wprintf("<span class=\"ib_roomlist_new\">");
-                       }
-                       else {
-                               wprintf("<span class=\"ib_roomlist_old\">");
-                       }
-                       extract_token(buf, fold[i].name, levels-1, '|', sizeof buf);
-                       escputs(buf);
-                       if (!strcasecmp(fold[i].name, "My Folders|Mail")) {
-                               wprintf(" (INBOX)");
-                       }
-                       wprintf("</span>");
-                       if (fold[i].selectable) {
-                               wprintf("</A>");
-                       }
-                       else {
-                               wprintf("</i>");
-                       }
-                       wprintf("<br />");
-                       wprintf("</div>\n");    /** roomdiv */
-               }
-       }
-       wprintf("</div>\n");    /** floordiv */
-
-
-}
-
-
-
 /**
  * \brief Burn the cached folder list.  
  * \param age How old the cahce needs to be before we burn it.
@@ -3426,187 +2886,6 @@ void burn_folder_cache(time_t age)
 
 
 
-
-/**
- * \brief Show the room list.  
- * (only should get called by
- * knrooms() because that's where output_headers() is called from)
- * \param viewpref the view preferences???
- */
-
-void list_all_rooms_by_floor(const char *viewpref) {
-       char buf[SIZ];
-       int swap = 0;
-       struct folder *fold = NULL;
-       struct folder ftmp;
-       int max_folders = 0;
-       int alloc_folders = 0;
-       int *floor_mapping;
-       int IDMax;
-       int i, j;
-       int ShowEmptyFloors;
-       int ra_flags = 0;
-       int flags = 0;
-       int num_floors = 1;     /** add an extra one for private folders */
-       char buf3[SIZ];
-       
-       /** If our cached folder list is very old, burn it. */
-       burn_folder_cache(300);
-       
-       /** Can we do the iconbar roomlist from cache? */
-       if ((WC->cache_fold != NULL) && (!strcasecmp(viewpref, "iconbar"))) {
-               do_iconbar_view(WC->cache_fold, WC->cache_max_folders, WC->cache_num_floors);
-               return;
-       }
-
-       /** Grab the floor table so we know how to build the list... */
-       load_floorlist();
-
-       /** Start with the mailboxes */
-       max_folders = 1;
-       alloc_folders = 1;
-       fold = malloc(sizeof(struct folder));
-       memset(fold, 0, sizeof(struct folder));
-       strcpy(fold[0].name, "My folders");
-       fold[0].is_mailbox = 1;
-
-       /** Then add floors */
-       serv_puts("LFLR");
-       serv_getln(buf, sizeof buf);
-       if (buf[0]=='1') while(serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-                       if (max_folders >= alloc_folders) {
-                               alloc_folders = max_folders + 100;
-                               fold = realloc(fold,
-                                              alloc_folders * sizeof(struct folder));
-                       }
-                       memset(&fold[max_folders], 0, sizeof(struct folder));
-                       extract_token(fold[max_folders].name, buf, 1, '|', sizeof fold[max_folders].name);
-                       extract_token(buf3, buf, 0, '|', SIZ);
-                       fold[max_folders].floor = atol (buf3);
-                       ++max_folders;
-                       ++num_floors;
-               }
-       IDMax = 0;
-       for (i=0; i<num_floors; i++)
-               if (IDMax < fold[i].floor)
-                       IDMax = fold[i].floor;
-       floor_mapping = malloc (sizeof (int) * (IDMax + 1));
-       memset (floor_mapping, 0, sizeof (int) * (IDMax + 1));
-       for (i=0; i<num_floors; i++)
-               floor_mapping[fold[i].floor]=i;
-       
-       /** refresh the messages index for this room */
-/* TODO        serv_puts("GOTO ");
-   while (serv_getln(buf, sizeof buf), strcmp(buf, "000")); */
-       /** Now add rooms */
-       serv_puts("LKRA");
-       serv_getln(buf, sizeof buf);
-       if (buf[0]=='1') while(serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-                       if (max_folders >= alloc_folders) {
-                               alloc_folders = max_folders + 100;
-                               fold = realloc(fold,
-                                              alloc_folders * sizeof(struct folder));
-                       }
-                       memset(&fold[max_folders], 0, sizeof(struct folder));
-                       extract_token(fold[max_folders].room, buf, 0, '|', sizeof fold[max_folders].room);
-                       ra_flags = extract_int(buf, 5);
-                       flags = extract_int(buf, 1);
-                       fold[max_folders].floor = extract_int(buf, 2);
-                       fold[max_folders].hasnewmsgs =
-                               ((ra_flags & UA_HASNEWMSGS) ? 1 : 0 );
-                       if (flags & QR_MAILBOX) {
-                               fold[max_folders].is_mailbox = 1;
-                       }
-                       fold[max_folders].view = extract_int(buf, 6);
-                       room_to_folder(fold[max_folders].name,
-                                      fold[max_folders].room,
-                                      fold[max_folders].floor,
-                                      fold[max_folders].is_mailbox);
-                       fold[max_folders].selectable = 1;
-                       /* Increase the room count for the associtaed floor */
-                       if (fold[max_folders].is_mailbox) {
-                               fold[0].num_rooms++;
-                       }
-                       else {
-                               i = floor_mapping[fold[max_folders].floor];
-                               fold[i].num_rooms++;
-                       }
-                       ++max_folders;
-               }
-       
-       /*
-        * Remove any floors that don't have rooms
-        */
-       get_pref_yesno("emptyfloors", &ShowEmptyFloors, 0);
-       if (ShowEmptyFloors)
-       {
-               for (i=0; i<num_floors; i++)
-               {
-                       if (fold[i].num_rooms == 0) {
-                               for (j=i; j<max_folders; j++) {
-                                       memcpy(&fold[j], &fold[j+1], sizeof(struct folder));
-                               }
-                               max_folders--;
-                               num_floors--;
-                               i--;
-                       }
-               }
-       }
-       
-       /** Bubble-sort the folder list */
-       for (i=0; i<max_folders; ++i) {
-               for (j=0; j<(max_folders-1)-i; ++j) {
-                       if (fold[j].is_mailbox == fold[j+1].is_mailbox) {
-                               swap = strcasecmp(fold[j].name, fold[j+1].name);
-                       }
-                       else {
-                               if ( (fold[j+1].is_mailbox)
-                                    && (!fold[j].is_mailbox)) {
-                                       swap = 1;
-                               }
-                               else {
-                                       swap = 0;
-                               }
-                       }
-                       if (swap > 0) {
-                               memcpy(&ftmp, &fold[j], sizeof(struct folder));
-                               memcpy(&fold[j], &fold[j+1],
-                                      sizeof(struct folder));
-                               memcpy(&fold[j+1], &ftmp,
-                                      sizeof(struct folder));
-                       }
-               }
-       }
-
-
-       if (!strcasecmp(viewpref, "folders")) {
-               do_folder_view(fold, max_folders, num_floors);
-       }
-       else if (!strcasecmp(viewpref, "hackish_view")) {
-               for (i=0; i<max_folders; ++i) {
-                       escputs(fold[i].name);
-                       wprintf("<br />\n");
-               }
-       }
-       else if (!strcasecmp(viewpref, "iconbar")) {
-               do_iconbar_view(fold, max_folders, num_floors);
-       }
-       else {
-               do_rooms_view(fold, max_folders, num_floors);
-       }
-
-       /* Don't free the folder list ... cache it for future use! */
-       if (WC->cache_fold != NULL) {
-               free(WC->cache_fold);
-       }
-       WC->cache_fold = fold;
-       WC->cache_max_folders = max_folders;
-       WC->cache_num_floors = num_floors;
-       WC->cache_timestamp = time(NULL);
-       free(floor_mapping);
-}
-
-
 /**
  * \brief Do either a known rooms list or a folders list, depending on the
  * user's preference
@@ -3615,11 +2894,9 @@ void knrooms(void)
 {
        StrBuf *ListView = NULL;
 
-       output_headers(1, 1, 2, 0, 0, 0);
-
        /** Determine whether the user is trying to change views */
        if (havebstr("view")) {
-               ListView = NewStrBufPlain(bstr("view"), -1);
+               ListView = NewStrBufDup(SBSTR("view"));
                set_preference("roomlistview", ListView, 1);
        }
        /** Sanitize the input so its safe */
@@ -3628,62 +2905,15 @@ void knrooms(void)
            (strcasecmp(ChrPtr(ListView), "table") != 0))) 
        {
                if (ListView == NULL) {
-                       ListView = NewStrBufPlain("rooms", sizeof("rooms") - 1);
+                       ListView = NewStrBufPlain(HKEY("rooms"));
                        set_preference("roomlistview", ListView, 0);
                }
                else {
-                       StrBufPrintf(ListView, "rooms");
+                       StrBufPlain(ListView, HKEY("rooms"));
                        save_preferences();
                }
        }
-
-       /** title bar */
-       wprintf("<div id=\"banner\">\n");
-       wprintf("<div class=\"room_banner\" id=\"room_banner\">");
-       wprintf("<h1>");
-       if (!strcasecmp(ChrPtr(ListView), "rooms")) {
-               wprintf(_("Room list"));
-       }
-       else if (!strcasecmp(ChrPtr(ListView), "folders")) {
-               wprintf(_("Folder list"));
-       }
-       else if (!strcasecmp(ChrPtr(ListView), "table")) {
-               wprintf(_("Room list"));
-       }
-       wprintf("</h1></div>\n");
-       
-       /** offer the ability to switch views */
-       wprintf("<div id=\"actiondiv\">");
-       wprintf("<ul class=\"room_actions\">\n");
-       wprintf("<li class=\"start_page\">");
-       offer_start_page(NULL, &NoCtx);
-       wprintf("</li>");
-       wprintf("<li><form name=\"roomlistomatic\">\n"
-               "<select name=\"newview\" size=\"1\" "
-               "OnChange=\"location.href=roomlistomatic.newview.options"
-               "[selectedIndex].value\">\n");
-
-       wprintf("<option %s value=\"knrooms&view=rooms\">"
-               "View as room list"
-               "</option>\n",
-               ( !strcasecmp(ChrPtr(ListView), "rooms") ? "SELECTED" : "" )
-               );
-
-       wprintf("<option %s value=\"knrooms&view=folders\">"
-               "View as folder list"
-               "</option>\n",
-               ( !strcasecmp(ChrPtr(ListView), "folders") ? "SELECTED" : "" )
-               );
-
-       wprintf("</select>");
-       wprintf("</form></li>");
-       wprintf("</ul></div></div>\n");
-
-       wprintf("<div id=\"content\" class=\"service\">\n");
-
-       /** Display the room list in the user's preferred format */
-       list_all_rooms_by_floor(ChrPtr(ListView));
-       wDumpContent(1);
+       url_do_template();
 }
 
 
@@ -3715,127 +2945,21 @@ void set_room_policy(void) {
        display_editroom();
 }
 
-HashList *GetFloorListHash(StrBuf *Target, WCTemplputParams *TP) {
-       /* todo: check context */
-       const char *Err;
-       StrBuf *Buf;
-       StrBuf *Buf2;
-       HashList *floors;
-       HashList *floor;
-       floors = NewHash(1, NULL);
-       Buf = NewStrBuf();
-       serv_puts("LFLR"); /* get floors */
-       StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err); /* '100', we hope */
-       if (ChrPtr(Buf)[0] == '1') while(StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err), strcmp(ChrPtr(Buf), "000")) {
-                       int a;
-                       const char *floorNum;
-                       floor = NewHash(1, NULL);
-                       for(a=0; a<FLOOR_PARAM_LEN; a++) {
-                               Buf2 = NewStrBuf();
-                               StrBufExtract_token(Buf2, Buf, a, '|');
-                               if (a==0) {
-                                       floorNum = ChrPtr(Buf2); /* hmm, should we copy Buf2 first? */
-                               }
-                               Put(floor, FPKEY(a), Buf2, NULL);
-                       }
-                       Put(floors, HKEY(floorNum), floor, NULL);
-               }
-       FreeStrBuf(&Buf);
-       return floors;
-}
-
-void tmplput_FLOOR_Value(StrBuf *TemplBuffer, WCTemplputParams *TP) 
-{
-       StrBuf *val;
-       HashList *floor = (HashList *)(TP->Context);
-       void *value;
-       GetHash(floor, TKEY(0), &value);
-       val = (StrBuf *)value;
-       StrECMAEscAppend(TemplBuffer, val, 0);
-}
-HashList *GetRoomListHashLKRA(StrBuf *Target, WCTemplputParams *TP) 
-{
-       serv_puts("LKRA");
-       return GetRoomListHash(Target, TP);
-}
-HashList *GetRoomListHash(StrBuf *Target, WCTemplputParams *TP) 
-{
-       /* TODO: Check context */
-       HashList *rooms;
-       HashList *room;
-       StrBuf *buf;
-       StrBuf *buf2;
-       const char *Err;
-       buf = NewStrBuf();
-       rooms = NewHash(1, NULL);
-       StrBufTCP_read_line(buf, &WC->serv_sock, 0, &Err);
-       if (ChrPtr(buf)[0] == '1') while(StrBufTCP_read_line(buf, &WC->serv_sock, 0, &Err), strcmp(ChrPtr(buf), "000")) {
-                       int i;
-                       const char *rmName;
-                       room = NewHash(1, NULL);
-                       for(i=0; i<ROOM_PARAM_LEN; i++) {
-                               buf2 = NewStrBuf();
-                               StrBufExtract_token(buf2, buf, i, '|');
-                               if (i==0) {
-                                       rmName = ChrPtr(buf2);
-                               }
-                               Put(room, RPKEY(i), buf2, NULL);
-                       }
-                       Put(rooms, rmName, strlen(rmName), room, NULL);
-               }
-       SortByHashKey(rooms, 1);
-       /*SortByPayload(rooms, SortRoomsByListOrder);  */
-       FreeStrBuf(&buf);
-       return rooms;
-}
-/** Unused function that orders rooms by the listorder flag */
-int SortRoomsByListOrder(const void *room1, const void *room2) 
-{
-       int l1;
-       int l2;
-       HashList *r1 = (HashList *)GetSearchPayload(room1);
-       HashList *r2 = (HashList *)GetSearchPayload(room2);
-       StrBuf *listOrderBuf1;
-       StrBuf *listOrderBuf2;
-  
-       GetHash(r1, RPKEY(3), (void *)&listOrderBuf1);
-       GetHash(r2, RPKEY(3), (void *)&listOrderBuf2);
-       l1 = atoi(ChrPtr(listOrderBuf1));
-       l2 = atoi(ChrPtr(listOrderBuf2));
-       if (l1 < l2) return -1;
-       else if (l1 > l2) return +1;
-       else return 0;
-}
-void tmplput_ROOM_Value(StrBuf *TemplBuffer, WCTemplputParams *TP) 
-{
-       void *value;
-       StrBuf *val;
-       HashList *room = (HashList *)(TP->Context);
-
-       GetHash(room, TKEY(0), &value);
-       val = (StrBuf *)value;
-       StrECMAEscAppend(TemplBuffer, val, 0);
-}
-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(); 
-}
 void tmplput_RoomName(StrBuf *Target, WCTemplputParams *TP)
 {
        StrBufAppendTemplate(Target, TP, WC->wc_roomname, 0);
 }
 
-void _gotonext(void) { slrp_highest(); gotonext(); }
-void dotskip(void) {smart_goto(sbstr("room"));}
-void _display_private(void) { display_private("", 0); }
+
+void _display_private(void) {
+       display_private("", 0);
+}
+
 void dotgoto(void) {
+       if (!havebstr("room")) {
+               readloop(readnew);
+               return;
+       }
        if (WC->wc_view != VIEW_MAILBOX) {      /* dotgoto acts like dotskip when we're in a mailbox view */
                slrp_highest();
        }
@@ -3990,6 +3114,9 @@ int ConditionalRoomHas_QR_MAILBOX(StrBuf *Target, WCTemplputParams *TP)
 }
 
 
+
+
+
 int ConditionalHaveRoomeditRights(StrBuf *Target, WCTemplputParams *TP)
 {
        wcsession *WCC = WC;
@@ -4000,44 +3127,74 @@ int ConditionalHaveRoomeditRights(StrBuf *Target, WCTemplputParams *TP)
                  (WCC->is_mailbox) ));
 }
 
+int ConditionalIsRoomtype(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+
+       if ((WCC == NULL) ||
+           (TP->Tokens->nParameters < 3) ||
+           (TP->Tokens->Params[2]->Type != TYPE_STR)||
+           (TP->Tokens->Params[2]->len < 7))
+               return 0;
+
+       switch(WCC->wc_view) {
+       case VIEW_BBS:
+               return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_BBS"));
+       case VIEW_MAILBOX:
+               return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_MAILBOX"));
+       case VIEW_ADDRESSBOOK:
+               return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_ADDRESSBOOK"));
+       case VIEW_TASKS:
+               return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_TASKS"));
+       case VIEW_NOTES:
+               return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_NOTES"));
+       case VIEW_WIKI:
+               return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_WIKI"));
+       case VIEW_JOURNAL:
+               return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_JOURNAL"));
+       case VIEW_CALENDAR:
+               return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_CALENDAR"));
+       case VIEW_CALBRIEF:
+               return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_CALBRIEF"));
+       default:
+               return 0;
+       }
+}
+
 void 
 InitModule_ROOMOPS
 (void)
 {
-       RegisterPreference(HKEY("roomlistview"),
+       RegisterPreference("roomlistview",
                            _("Room list view"),
                            PRF_STRING,
                            NULL);
-        RegisterPreference(HKEY("emptyfloors"), _("Show empty floors"), PRF_YESNO, NULL);
-
-       RegisterNamespace("ROOMNAME", 0, 1, tmplput_RoomName, 0);
-
-       WebcitAddUrlHandler(HKEY("knrooms"), knrooms, 0);
-       WebcitAddUrlHandler(HKEY("gotonext"), _gotonext, NEED_URL);
-       WebcitAddUrlHandler(HKEY("skip"), gotonext, NEED_URL);
-       WebcitAddUrlHandler(HKEY("ungoto"), ungoto, NEED_URL);
-       WebcitAddUrlHandler(HKEY("dotgoto"), dotgoto, NEED_URL);
-       WebcitAddUrlHandler(HKEY("dotskip"), dotskip, NEED_URL);
-       WebcitAddUrlHandler(HKEY("display_private"), _display_private, 0);
-       WebcitAddUrlHandler(HKEY("goto_private"), goto_private, NEED_URL);
-       WebcitAddUrlHandler(HKEY("zapped_list"), zapped_list, 0);
-       WebcitAddUrlHandler(HKEY("display_zap"), display_zap, 0);
-       WebcitAddUrlHandler(HKEY("zap"), zap, 0);
-       WebcitAddUrlHandler(HKEY("display_entroom"), display_entroom, 0);
-       WebcitAddUrlHandler(HKEY("entroom"), entroom, 0);
-       WebcitAddUrlHandler(HKEY("display_whok"), display_whok, 0);
-       WebcitAddUrlHandler(HKEY("do_invt_kick"), do_invt_kick, 0);
-       WebcitAddUrlHandler(HKEY("display_editroom"), display_editroom, 0);
-       WebcitAddUrlHandler(HKEY("netedit"), netedit, 0);
-       WebcitAddUrlHandler(HKEY("editroom"), editroom, 0);
-       WebcitAddUrlHandler(HKEY("delete_room"), delete_room, 0);
-       WebcitAddUrlHandler(HKEY("set_room_policy"), set_room_policy, 0);
-       WebcitAddUrlHandler(HKEY("set_floordiv_expanded"), set_floordiv_expanded, NEED_URL|AJAX);
-       WebcitAddUrlHandler(HKEY("changeview"), change_view, 0);
-       WebcitAddUrlHandler(HKEY("toggle_self_service"), toggle_self_service, 0);
-       WebcitAddUrlHandler(HKEY("json_roomflr"), jsonRoomFlr, 0);
-       RegisterNamespace("ROOMBANNER", 0, 1, tmplput_roombanner, 0);
-
+        RegisterPreference("emptyfloors", _("Show empty floors"), PRF_YESNO, NULL);
+
+       RegisterNamespace("ROOMNAME", 0, 1, tmplput_RoomName, NULL, CTX_NONE);
+
+       WebcitAddUrlHandler(HKEY("knrooms"), "", 0, knrooms, 0);
+       WebcitAddUrlHandler(HKEY("dotgoto"), "", 0, dotgoto, NEED_URL);
+       WebcitAddUrlHandler(HKEY("dotskip"), "", 0, dotskip, NEED_URL);
+       WebcitAddUrlHandler(HKEY("display_private"), "", 0, _display_private, 0);
+       WebcitAddUrlHandler(HKEY("goto_private"), "", 0, goto_private, NEED_URL);
+       WebcitAddUrlHandler(HKEY("zapped_list"), "", 0, zapped_list, 0);
+       WebcitAddUrlHandler(HKEY("display_zap"), "", 0, display_zap, 0);
+       WebcitAddUrlHandler(HKEY("zap"), "", 0, zap, 0);
+       WebcitAddUrlHandler(HKEY("display_entroom"), "", 0, display_entroom, 0);
+       WebcitAddUrlHandler(HKEY("entroom"), "", 0, entroom, 0);
+       WebcitAddUrlHandler(HKEY("display_whok"), "", 0, display_whok, 0);
+       WebcitAddUrlHandler(HKEY("do_invt_kick"), "", 0, do_invt_kick, 0);
+       WebcitAddUrlHandler(HKEY("display_editroom"), "", 0, display_editroom, 0);
+       WebcitAddUrlHandler(HKEY("netedit"), "", 0, netedit, 0);
+       WebcitAddUrlHandler(HKEY("editroom"), "", 0, editroom, 0);
+       WebcitAddUrlHandler(HKEY("delete_room"), "", 0, delete_room, 0);
+       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:ROOM:FLAGS:QR_PERMANENT"), 0, ConditionalRoomHas_QR_PERMANENT, CTX_NONE);
        RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_INUSE"), 0, ConditionalRoomHas_QR_INUSE, CTX_NONE);
        RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_PRIVATE"), 0, ConditionalRoomHas_QR_PRIVATE, CTX_NONE);
@@ -4057,11 +3214,22 @@ InitModule_ROOMOPS
        RegisterConditional(HKEY("COND:UNGOTO"), 0, ConditionalHaveUngoto, CTX_NONE);
        RegisterConditional(HKEY("COND:ROOM:EDITACCESS"), 0, ConditionalHaveRoomeditRights, CTX_NONE);
 
-       RegisterNamespace("ROOM:UNGOTO", 0, 0, tmplput_ungoto, 0);
-       RegisterIterator("FLOORS", 0, NULL, GetFloorListHash, NULL, DeleteHash, CTX_FLOORS, CTX_NONE, IT_NOFLAG);
-       RegisterNamespace("FLOOR:INFO", 1, 2, tmplput_FLOOR_Value, CTX_FLOORS);
-       RegisterIterator("LKRA", 0, NULL, GetRoomListHashLKRA, NULL, NULL, CTX_ROOMS, CTX_NONE, IT_NOFLAG);
-       RegisterNamespace("ROOM:INFO", 1, 2, tmplput_ROOM_Value, CTX_ROOMS);
+       RegisterNamespace("ROOM:UNGOTO", 0, 0, tmplput_ungoto, NULL, CTX_NONE);
+       RegisterIterator("FLOORS", 0, NULL, GetFloorListHash, NULL, NULL, CTX_FLOORS, CTX_NONE, IT_NOFLAG);
+
+
 }
 
+
+void 
+SessionDestroyModule_ROOMOPS
+(wcsession *sess)
+{
+       if (sess->cache_fold != NULL) {
+               free(sess->cache_fold);
+       }
+       
+       free_march_list(sess);
+       DeleteHash(&sess->Floors);
+}
 /*@}*/