]> code.citadel.org Git - citadel.git/blobdiff - webcit/roomops.c
* New command 'WIKI history|<pagename>' to list the revision history for a wiki page.
[citadel.git] / webcit / roomops.c
index 546f5a04f05e5d8513fc736046e38d8ff5e82872..456b19ce657c104fcc68a0f178bc8bdb0185a6a8 100644 (file)
@@ -15,22 +15,6 @@ char *viewdefs[9];                   /* the different kinds of available views */
  * Basically we pull LFLR/LKRA etc. and set up a room HashList with these keys.
  */
 
-#define FLOOR_PARAM_LEN 3
-const ConstStr FLOOR_PARAM_NAMES[] = {{HKEY("ID")},
-                                     {HKEY("NAME")}, 
-                                     {HKEY("ROOMS")}};
-
-#define ROOM_PARAM_LEN 8
-const ConstStr ROOM_PARAM_NAMES[] = {{HKEY("NAME")},
-                                    {HKEY("FLAG")},
-                                    {HKEY("FLOOR")},
-                                    {HKEY("LISTORDER")},
-                                    {HKEY("ACL")},
-                                    {HKEY("CURVIEW")},
-                                    {HKEY("DEFVIEW")},
-                                    {HKEY("LASTCHANGE")}};
-
-
 void display_whok(void);
 
 /*
@@ -54,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 */
        }
 }
 
@@ -102,52 +80,6 @@ void load_floorlist(StrBuf *Buf)
 }
 
 
-/*
- * 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;
-               }
-       }
-}
-
-
 
 
 /*
@@ -718,6 +650,9 @@ void embed_room_banner(char *got, int navbar_style) {
                                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\">"
@@ -801,8 +736,6 @@ long gotoroom(const StrBuf *gname)
        static long ls = (-1L);
        long err = 0;
 
-       lprintf(9, "%s:%d gotoroom(%s)\n", __FILE__, __LINE__, ChrPtr(gname));
-
        /* store ungoto information */
        strcpy(WC->ugname, ChrPtr(WC->wc_roomname));
        WC->uglsn = ls;
@@ -811,7 +744,6 @@ long gotoroom(const StrBuf *gname)
        /* move to the new room */
        serv_printf("GOTO %s", ChrPtr(gname));
        StrBuf_ServGetln(Buf);
-       lprintf(9, "%s:%d GOTO server reply: %s\n", __FILE__, __LINE__, ChrPtr(Buf));
        if  (GetServerStatus(Buf, &err) != 2) {
                serv_puts("GOTO _BASEROOM_");
                StrBuf_ServGetln(Buf);
@@ -832,7 +764,6 @@ long gotoroom(const StrBuf *gname)
                FlushStrBuf(WC->wc_roomname);
 
        StrBufExtract_token(WC->wc_roomname, Buf, 0, '|');
-       lprintf(9, "%s:%d extracted room name: %s\n", __FILE__, __LINE__, ChrPtr(WC->wc_roomname));
        StrBufCutLeft(WC->wc_roomname, 4);
        WC->room_flags = StrBufExtract_int(Buf, 4, '|');
        /* highest_msg_read = extract_int(&buf[4],6);
@@ -860,139 +791,10 @@ 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
  */
 void smart_goto(const StrBuf *next_room) {
-       lprintf(9, "%s:%d smart_goto(%s)\n", __FILE__, __LINE__, ChrPtr(next_room));
        gotoroom(next_room);
        readloop(readnew);
 }
@@ -1011,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];
@@ -1338,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");
@@ -3094,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();
-       StrBufExtract_token(FloorDiv, WCC->Hdr->HR.ReqLine, 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.
@@ -3469,189 +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) {
-       StrBuf *Buf;
-       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;
-       }
-       Buf = NewStrBuf();
-
-       /** Grab the floor table so we know how to build the list... */
-       load_floorlist(Buf);
-       FreeStrBuf(&Buf);
-       /** 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
@@ -3660,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 */
@@ -3673,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();
 }
 
 
@@ -3760,143 +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 (GetServerStatus(Buf, NULL) == 1) 
-               while(StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err), strcmp(ChrPtr(Buf), "000")) {
-                       int a;
-                       const StrBuf *floorNum = NULL;
-                       floor = NewHash(1, NULL);
-                       for(a=0; a<FLOOR_PARAM_LEN; a++) {
-                               Buf2 = NewStrBuf();
-                               StrBufExtract_token(Buf2, Buf, a, '|');
-                               if (a==0) {
-                                       floorNum = Buf2; /* hmm, should we copy Buf2 first? */
-                                       
-                               }
-                               Put(floor, CKEY(FLOOR_PARAM_NAMES[a]), Buf2, HFreeStrBuf);
-                       }
-                       Put(floors, SKEY(floorNum), floor, HDeleteHash);
-               }
-       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 (GetServerStatus(buf, NULL) == 1) 
-               while(StrBufTCP_read_line(buf, &WC->serv_sock, 0, &Err), strcmp(ChrPtr(buf), "000")) {
-                       int i;
-                       StrBuf *rmName = NULL;
-                       room = NewHash(1, NULL);
-                       for(i=0; i<ROOM_PARAM_LEN; i++) {
-                               buf2 = NewStrBuf();
-                               StrBufExtract_token(buf2, buf, i, '|');
-                               if (i==0) {
-                                       rmName = buf2;
-                               }
-                               Put(room, CKEY(ROOM_PARAM_NAMES[i]), buf2, HFreeStrBuf);
-                       }
-                       Put(rooms, SKEY(rmName), room, HDeleteHash);
-               }
-       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, CKEY(ROOM_PARAM_NAMES[3]), (void *)&listOrderBuf1);
-       GetHash(r2, CKEY(ROOM_PARAM_NAMES[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) {
-       lprintf(9, "%s:%d dotskip?room=%s\n", __FILE__, __LINE__, ChrPtr(sbstr("room")));
-       smart_goto(sbstr("room"));
-}
 
 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();
        }
@@ -4051,6 +3114,9 @@ int ConditionalRoomHas_QR_MAILBOX(StrBuf *Target, WCTemplputParams *TP)
 }
 
 
+
+
+
 int ConditionalHaveRoomeditRights(StrBuf *Target, WCTemplputParams *TP)
 {
        wcsession *WCC = WC;
@@ -4105,33 +3171,28 @@ InitModule_ROOMOPS
                            NULL);
         RegisterPreference("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);
+       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);
@@ -4153,14 +3214,12 @@ 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, DeleteHash, 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
@@ -4171,5 +3230,6 @@ SessionDestroyModule_ROOMOPS
        }
        
        free_march_list(sess);
+       DeleteHash(&sess->Floors);
 }
 /*@}*/