* typedef wcsession, so we don't always need to say gcc again its a struct.
[citadel.git] / webcit / roomops.c
index 80c8e4e1447c74e75ddcc582fbc59017733e52a2..6a41b0c41e358859cb8d091f1ecc98bd6a8406e4 100644 (file)
@@ -1,19 +1,19 @@
 /*
  * $Id$
+ * Lots of different room-related operations.
  */
-/**
- * \defgroup RoomOps Lots of different room-related operations.
- * \ingroup CitadelCommunitacion
- */
-/*@{*/
-#include "webcit.h"
 
-char floorlist[128][SIZ]; /**< list of our floor names */
+#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 */
 
-/**
- * \brief initialize the viewdefs with localized strings
+void display_whok(void);
+
+/*
+ * Initialize the viewdefs with localized strings
  */
 void initialize_viewdefs(void) {
        viewdefs[0] = _("Bulletin Board");
@@ -27,10 +27,8 @@ void initialize_viewdefs(void) {
        viewdefs[8] = _("Journal");
 }
 
-/**
- * \brief      Determine which views are allowed as the default for creating a new room.
- *
- * \param      which_view      The view ID being queried.
+/*
+ * Determine which views are allowed as the default for creating a new room.
  */
 int is_view_allowed_as_default(int which_view)
 {
@@ -41,23 +39,29 @@ int is_view_allowed_as_default(int which_view)
                case VIEW_CALENDAR:     return(1);
                case VIEW_TASKS:        return(1);
                case VIEW_NOTES:        return(1);
-               case VIEW_WIKI:         return(0);      /**< because it isn't finished yet */
+
+#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 */
+               default:                return(0);      /* should never get here */
        }
 }
 
 
-/**
- * \brief load the list of floors
+/*
+ * load the list of floors
  */
 void load_floorlist(void)
 {
        int a;
        char buf[SIZ];
 
-       for (a = 0; a < 128; ++a)
+       for (a = 0; a < MAX_FLOORS; ++a)
                floorlist[a][0] = 0;
 
        serv_puts("LFLR");
@@ -72,12 +76,10 @@ void load_floorlist(void)
 }
 
 
-/**
- * \brief      Free a session's march list
- *
- * \param      wcf             Pointer to session being cleared
+/*
+ * Free a session's march list
  */
-void free_march_list(struct wcsession *wcf)
+void free_march_list(wcsession *wcf)
 {
        struct march *mptr;
 
@@ -91,8 +93,8 @@ void free_march_list(struct wcsession *wcf)
 
 
 
-/**
- * \brief remove a room from the march list
+/*
+ * remove a room from the march list
  */
 void remove_march(char *aaa)
 {
@@ -122,9 +124,8 @@ void remove_march(char *aaa)
 
 
 
-/**
- * \brief display rooms in tree structure???
- * \param rp the roomlist to build a tree from
+/*
+ * display rooms in tree structure
  */
 void room_tree_list(struct roomlisting *rp)
 {
@@ -255,16 +256,19 @@ void listrms(char *variety)
  */
 void zapped_list(void)
 {
+       StrBuf *Buf;
        output_headers(1, 1, 1, 0, 0, 0);
 
-       svprintf("BOXTITLE", WCS_STRING, _("Zapped (forgotten) rooms"));
-       do_template("beginbox");
+       Buf = NewStrBufPlain(_("Zapped (forgotten) rooms"), -1);
+       DoTemplate(HKEY("beginbox"), NULL, Buf, CTX_STRBUF);
+
+       FreeStrBuf(&Buf);
 
        listrms("LZRM -1");
 
        wprintf("<br /><br />\n");
        wprintf(_("Click on any room to un-zap it and goto that room.\n"));
-       do_template("endbox");
+       do_template("endbox", NULL);
        wDumpContent(1);
 }
 
@@ -272,7 +276,7 @@ void zapped_list(void)
 /**
  * \brief read this room's info file (set v to 1 for verbose mode)
  */
-void readinfo(void)
+void readinfo(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
 {
        char buf[256];
        char briefinfo[128];
@@ -321,7 +325,7 @@ void readinfo(void)
  * keep the browser from using a cached icon from 
  * another room.
  */
-void embed_room_graphic(void) {
+void embed_room_graphic(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) {
        char buf[SIZ];
 
        serv_puts("OIMG _roompic_");
@@ -334,37 +338,37 @@ void embed_room_graphic(void) {
                serv_getln(buf, sizeof buf);
        }
        else if (WC->wc_view == VIEW_ADDRESSBOOK) {
-               wprintf("<img height=48 width=48 src=\""
+               wprintf("<img class=\"roompic\" alt=\"\" src=\""
                        "static/viewcontacts_48x.gif"
                        "\">"
                );
        }
        else if ( (WC->wc_view == VIEW_CALENDAR) || (WC->wc_view == VIEW_CALBRIEF) ) {
-               wprintf("<img height=48 width=48 src=\""
+               wprintf("<img class=\"roompic\" alt=\"\" src=\""
                        "static/calarea_48x.gif"
                        "\">"
                );
        }
        else if (WC->wc_view == VIEW_TASKS) {
-               wprintf("<img height=48 width=48 src=\""
+               wprintf("<img class=\"roompic\" alt=\"\" src=\""
                        "static/taskmanag_48x.gif"
                        "\">"
                );
        }
        else if (WC->wc_view == VIEW_NOTES) {
-               wprintf("<img height=48 width=48 src=\""
+               wprintf("<img class=\"roompic\" alt=\"\" src=\""
                        "static/storenotes_48x.gif"
                        "\">"
                );
        }
        else if (WC->wc_view == VIEW_MAILBOX) {
-               wprintf("<img height=48 width=48 src=\""
+               wprintf("<img class=\"roompic\" alt=\"\" src=\""
                        "static/privatemess_48x.gif"
                        "\">"
                );
        }
        else {
-               wprintf("<img height=48 width=48 src=\""
+               wprintf("<img class=\"roompic\" alt=\"\" src=\""
                        "static/chatrooms_48x.gif"
                        "\">"
                );
@@ -377,11 +381,11 @@ void embed_room_graphic(void) {
 /**
  * \brief Display the current view and offer an option to change it
  */
-void embed_view_o_matic(void) {
+void embed_view_o_matic(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) {
        int i;
 
        wprintf("<form name=\"viewomatic\" action=\"changeview\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       wprintf("\t<div style=\"display: inline;\">\n\t<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
        wprintf("<label for=\"view_name\">");
        wprintf(_("View as:"));
        wprintf("</label> "
@@ -411,23 +415,24 @@ void embed_view_o_matic(void) {
                        wprintf("</option>\n");
                }
        }
-       wprintf("</select></form>\n");
+       wprintf("</select></div></form>\n");
 }
 
 
 /**
  * \brief Display a search box
  */
-void embed_search_o_matic(void) {
+void embed_search_o_matic(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) {
        wprintf("<form name=\"searchomatic\" action=\"do_search\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       wprintf("<div style=\"display: inline;\"><input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
        wprintf("<label for=\"search_name\">");
        wprintf(_("Search: "));
-       wprintf("</label> <input "
-               "type=\"text\" name=\"query\" size=\"15\" maxlength=\"128\" "
+       wprintf("</label><input ");
+       wprintf("%s", serv_info.serv_fulltext_enabled ? "" : "disabled ");
+       wprintf("type=\"text\" name=\"query\" size=\"15\" maxlength=\"128\" "
                "id=\"search_name\" class=\"inputbox\">\n"
        );
-       wprintf("</select></form>\n");
+       wprintf("</div></form>\n");
 }
 
 
@@ -441,13 +446,17 @@ void embed_search_o_matic(void) {
 
 void embed_room_banner(char *got, int navbar_style) {
        char buf[256];
-       char sanitized_roomname[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.
         */
        if (got == NULL) {
+               memset(buf, 20, '0');
+               buf[20] = '\0';
                serv_printf("GOTO %s", WC->wc_roomname);
                serv_getln(buf, sizeof buf);
                got = buf;
@@ -472,28 +481,43 @@ void embed_room_banner(char *got, int navbar_style) {
        WC->new_mail = extract_int(&got[4], 9);
        WC->wc_view = extract_int(&got[4], 11);
 
-       stresc(sanitized_roomname, 256, WC->wc_roomname, 1, 1);
-       svprintf("ROOMNAME", WCS_STRING, "%s", sanitized_roomname);
-       svprintf("NUMMSGS", WCS_STRING,
-               _("%d new of %d messages"),
+       /* Is this a directory room and does it contain files and how many? */
+       if ((WC->room_flags & QR_DIRECTORY) && (WC->room_flags & QR_VISDIR))
+       {
+               serv_puts("RDIR");
+               serv_getln(buf2, sizeof buf2);
+               if (buf2[0] == '1') while (serv_getln(buf2, sizeof buf2), strcmp(buf2, "000"))
+                       file_count++;
+               snprintf (with_files, sizeof with_files, 
+                         "; <a href=\"display_room_directory\"> %d %s </a>", 
+                         file_count, 
+                         ((file_count>1) || (file_count == 0)  ? _("files") : _("file")));
+       }
+       else
+               strcpy (with_files, "");
+       
+       svprintf(HKEY("NUMMSGS"), WCS_STRING,
+               _("%d new of %d messages%s"),
                extract_int(&got[4], 1),
-               extract_int(&got[4], 2)
+               extract_int(&got[4], 2),
+               with_files
        );
        svcallback("ROOMPIC", embed_room_graphic);
        svcallback("ROOMINFO", readinfo);
-       svcallback("VIEWOMATIC", embed_view_o_matic);
+       svcallback("VIEWOMATIC", embed_view_o_matic); 
        svcallback("SEARCHOMATIC", embed_search_o_matic);
-       svcallback("START", offer_start_page);
-
-       do_template("roombanner");
-       if (navbar_style != navbar_none) {
+       svcallback("START", offer_start_page); 
+       do_template("roombanner", NULL);
+       // roombanner contains this for mobile
+       if (navbar_style != navbar_none && !WC->is_mobile) { 
 
                wprintf("<div id=\"navbar\"><ul>");
 
                if (navbar_style == navbar_default) wprintf(
                        "<li class=\"ungoto\">"
                        "<a href=\"ungoto\">"
-                       "<img align=\"middle\" src=\"static/ungoto2_24x.gif\" border=\"0\">"
+                       "<img src=\"static/ungoto2_24x.gif\" alt=\"\">"
                        "<span class=\"navbar_link\">%s</span></A>"
                        "</li>\n", _("Ungoto")
                );
@@ -502,7 +526,7 @@ void embed_room_banner(char *got, int navbar_style) {
                        wprintf(
                                "<li class=\"newmess\">"
                                "<a href=\"readnew\">"
-                               "<img align=\"middle\" src=\"static/newmess2_24x.gif\" border=\"0\">"
+                               "<img src=\"static/newmess2_24x.gif\" alt=\"\">"
                                "<span class=\"navbar_link\">%s</span></A>"
                                "</li>\n", _("Read new messages")
                        );
@@ -514,8 +538,8 @@ void embed_room_banner(char *got, int navbar_style) {
                                        wprintf(
                                                "<li class=\"viewcontacts\">"
                                                "<a href=\"readfwd\">"
-                                               "<img align=\"middle\" src=\"static/viewcontacts_24x.gif\" "
-                                               "border=\"0\">"
+                                               "<img src=\"static/viewcontacts_24x.gif\" "
+                                               "alt=\"\">"
                                                "<span class=\"navbar_link\">"
                                                "%s"
                                                "</span></a></li>\n", _("View contacts")
@@ -525,8 +549,8 @@ void embed_room_banner(char *got, int navbar_style) {
                                        wprintf(
                                                "<li class=\"staskday\">"
                                                "<a href=\"readfwd?calview=day\">"
-                                               "<img align=\"middle\" src=\"static/taskday2_24x.gif\" "
-                                               "border=\"0\">"
+                                               "<img src=\"static/taskday2_24x.gif\" "
+                                               "alt=\"\">"
                                                "<span class=\"navbar_link\">"
                                                "%s"
                                                "</span></a></li>\n", _("Day view")
@@ -534,8 +558,8 @@ void embed_room_banner(char *got, int navbar_style) {
                                        wprintf(
                                                "<li class=\"monthview\">"
                                                "<a href=\"readfwd?calview=month\">"
-                                               "<img align=\"middle\" src=\"static/monthview2_24x.gif\" "
-                                               "border=\"0\">"
+                                               "<img src=\"static/monthview2_24x.gif\" "
+                                               "alt=\"\">"
                                                "<span class=\"navbar_link\">"
                                                "%s"
                                                "</span></a></li>\n", _("Month view")
@@ -545,8 +569,8 @@ void embed_room_banner(char *got, int navbar_style) {
                                        wprintf(
                                                "<li class=\"monthview\">"
                                                "<a href=\"readfwd?calview=month\">"
-                                               "<img align=\"middle\" src=\"static/monthview2_24x.gif\" "
-                                               "border=\"0\">"
+                                               "<img src=\"static/monthview2_24x.gif\" "
+                                               "alt=\"\">"
                                                "<span class=\"navbar_link\">"
                                                "%s"
                                                "</span></a></li>\n", _("Calendar list")
@@ -556,8 +580,8 @@ void embed_room_banner(char *got, int navbar_style) {
                                        wprintf(
                                                "<li class=\"taskmanag\">"
                                                "<a href=\"readfwd\">"
-                                               "<img align=\"middle\" src=\"static/taskmanag_24x.gif\" "
-                                               "border=\"0\">"
+                                               "<img src=\"static/taskmanag_24x.gif\" "
+                                               "alt=\"\">"
                                                "<span class=\"navbar_link\">"
                                                "%s"
                                                "</span></a></li>\n", _("View tasks")
@@ -567,8 +591,8 @@ void embed_room_banner(char *got, int navbar_style) {
                                        wprintf(
                                                "<li class=\"viewnotes\">"
                                                "<a href=\"readfwd\">"
-                                               "<img align=\"middle\" src=\"static/viewnotes_24x.gif\" "
-                                               "border=\"0\">"
+                                               "<img src=\"static/viewnotes_24x.gif\" "
+                                               "alt=\"\">"
                                                "<span class=\"navbar_link\">"
                                                "%s"
                                                "</span></a></li>\n", _("View notes")
@@ -578,8 +602,8 @@ void embed_room_banner(char *got, int navbar_style) {
                                        wprintf(
                                                "<li class=\"readallmess\">"
                                                "<a href=\"readfwd\">"
-                                               "<img align=\"middle\" src=\"static/readallmess3_24x.gif\" "
-                                               "border=\"0\">"
+                                               "<img src=\"static/readallmess3_24x.gif\" "
+                                               "alt=\"\">"
                                                "<span class=\"navbar_link\">"
                                                "%s"
                                                "</span></a></li>\n", _("View message list")
@@ -589,8 +613,8 @@ void embed_room_banner(char *got, int navbar_style) {
                                        wprintf(
                                                "<li class=\"readallmess\">"
                                                "<a href=\"readfwd\">"
-                                               "<img align=\"middle\" src=\"static/readallmess3_24x.gif\" "
-                                               "border=\"0\">"
+                                               "<img src=\"static/readallmess3_24x.gif\" "
+                                               "alt=\"\">"
                                                "<span class=\"navbar_link\">"
                                                "%s"
                                                "</span></a></li>\n", _("Wiki home")
@@ -600,8 +624,8 @@ void embed_room_banner(char *got, int navbar_style) {
                                        wprintf(
                                                "<li class=\"readallmess\">"
                                                "<a href=\"readfwd\">"
-                                               "<img align=\"middle\" src=\"static/readallmess3_24x.gif\" "
-                                               "border=\"0\">"
+                                               "<img src=\"static/readallmess3_24x.gif\" "
+                                               "alt=\"\">"
                                                "<span class=\"navbar_link\">"
                                                "%s"
                                                "</span></a></li>\n", _("Read all messages")
@@ -616,8 +640,8 @@ void embed_room_banner(char *got, int navbar_style) {
                                        wprintf(
                                                "<li class=\"addnewcontact\">"
                                                "<a href=\"display_enter\">"
-                                               "<img align=\"middle\" src=\"static/addnewcontact_24x.gif\" "
-                                               "border=\"0\"><span class=\"navbar_link\">"
+                                               "<img src=\"static/addnewcontact_24x.gif\" "
+                                               "alt=\"\"><span class=\"navbar_link\">"
                                                "%s"
                                                "</span></a></li>\n", _("Add new contact")
                                        );
@@ -625,12 +649,12 @@ void embed_room_banner(char *got, int navbar_style) {
                                case VIEW_CALENDAR:
                                case VIEW_CALBRIEF:
                                        wprintf("<li class=\"addevent\"><a href=\"display_enter");
-                                       if (!IsEmptyStr(bstr("year" ))) wprintf("?year=%s", bstr("year"));
-                                       if (!IsEmptyStr(bstr("month"))) wprintf("?month=%s", bstr("month"));
-                                       if (!IsEmptyStr(bstr("day"  ))) wprintf("?day=%s", bstr("day"));
+                                       if (havebstr("year" )) wprintf("?year=%s", bstr("year"));
+                                       if (havebstr("month")) wprintf("?month=%s", bstr("month"));
+                                       if (havebstr("day"  )) wprintf("?day=%s", bstr("day"));
                                        wprintf("\">"
-                                               "<img align=\"middle\" src=\"static/addevent_24x.gif\" "
-                                               "border=\"0\"><span class=\"navbar_link\">"
+                                               "<img  src=\"static/addevent_24x.gif\" "
+                                               "alt=\"\"><span class=\"navbar_link\">"
                                                "%s"
                                                "</span></a></li>\n", _("Add new event")
                                        );
@@ -639,8 +663,8 @@ void embed_room_banner(char *got, int navbar_style) {
                                        wprintf(
                                                "<li class=\"newmess\">"
                                                "<a href=\"display_enter\">"
-                                               "<img align=\"middle\" src=\"static/newmess3_24x.gif\" "
-                                               "border=\"0\"><span class=\"navbar_link\">"
+                                               "<img  src=\"static/newmess3_24x.gif\" "
+                                               "alt=\"\"><span class=\"navbar_link\">"
                                                "%s"
                                                "</span></a></li>\n", _("Add new task")
                                        );
@@ -648,9 +672,9 @@ void embed_room_banner(char *got, int navbar_style) {
                                case VIEW_NOTES:
                                        wprintf(
                                                "<li class=\"enternewnote\">"
-                                               "<a href=\"javascript:add_new_note();\">"
-                                               "<img align=\"middle\" src=\"static/enternewnote_24x.gif\" "
-                                               "border=\"0\"><span class=\"navbar_link\">"
+                                               "<a href=\"add_new_note\">"
+                                               "<img  src=\"static/enternewnote_24x.gif\" "
+                                               "alt=\"\"><span class=\"navbar_link\">"
                                                "%s"
                                                "</span></a></li>\n", _("Add new note")
                                        );
@@ -661,8 +685,8 @@ void embed_room_banner(char *got, int navbar_style) {
                                        wprintf(
                                                "<li class=\"newmess\">"
                                                "<a href=\"display_enter?wikipage=%s\">"
-                                               "<img align=\"middle\" src=\"static/newmess3_24x.gif\" "
-                                               "border=\"0\"><span class=\"navbar_link\">"
+                                               "<img  src=\"static/newmess3_24x.gif\" "
+                                               "alt=\"\"><span class=\"navbar_link\">"
                                                "%s"
                                                "</span></a></li>\n", buf, _("Edit this page")
                                        );
@@ -671,8 +695,8 @@ void embed_room_banner(char *got, int navbar_style) {
                                        wprintf(
                                                "<li class=\"newmess\">"
                                                "<a href=\"display_enter\">"
-                                               "<img align=\"middle\" src=\"static/newmess3_24x.gif\" "
-                                               "border=\"0\"><span class=\"navbar_link\">"
+                                               "<img  src=\"static/newmess3_24x.gif\" "
+                                               "alt=\"\"><span class=\"navbar_link\">"
                                                "%s"
                                                "</span></a></li>\n", _("Write mail")
                                        );
@@ -681,8 +705,8 @@ void embed_room_banner(char *got, int navbar_style) {
                                        wprintf(
                                                "<li class=\"newmess\">"
                                                "<a href=\"display_enter\">"
-                                               "<img align=\"middle\" src=\"static/newmess3_24x.gif\" "
-                                               "border=\"0\"><span class=\"navbar_link\">"
+                                               "<img  src=\"static/newmess3_24x.gif\" "
+                                               "alt=\"\"><span class=\"navbar_link\">"
                                                "%s"
                                                "</span></a></li>\n", _("Enter a message")
                                        );
@@ -694,7 +718,7 @@ void embed_room_banner(char *got, int navbar_style) {
                        "<li class=\"skipthisroom\">"
                        "<a href=\"skip\" "
                        "title=\"%s\">"
-                       "<img align=\"middle\" src=\"static/skipthisroom_24x.gif\" border=\"0\">"
+                       "<img  src=\"static/skipthisroom_24x.gif\" alt=\"\">"
                        "<span class=\"navbar_link\">%s</span></a>"
                        "</li>\n",
                        _("Leave all messages marked as unread, go to next room with unread messages"),
@@ -705,7 +729,7 @@ void embed_room_banner(char *got, int navbar_style) {
                        "<li class=\"markngo\">"
                        "<a href=\"gotonext\" "
                        "title=\"%s\">"
-                       "<img align=\"middle\" src=\"static/markngo_24x.gif\" border=\"0\">"
+                       "<img  src=\"static/markngo_24x.gif\" alt=\"\">"
                        "<span class=\"navbar_link\">%s</span></a>"
                        "</li>\n",
                        _("Mark all messages as read, go to next room with unread messages"),
@@ -718,10 +742,8 @@ void embed_room_banner(char *got, int navbar_style) {
 }
 
 
-/**
- * \brief back end routine to take the session to a new room
- * \param gname room to go to
- *
+/*
+ * back end routine to take the session to a new room
  */
 int gotoroom(char *gname)
 {
@@ -729,7 +751,7 @@ int gotoroom(char *gname)
        static long ls = (-1L);
        int err = 0;
 
-       /** store ungoto information */
+       /* store ungoto information */
        strcpy(WC->ugname, WC->wc_roomname);
        WC->uglsn = ls;
 
@@ -815,8 +837,9 @@ char *pop_march(int desired_floor)
 
 
 
-/**
- *\brief Goto next room having unread messages.
+/*
+ * 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.
@@ -826,11 +849,13 @@ char *pop_march(int desired_floor)
 void gotonext(void)
 {
        char buf[256];
-       struct march *mptr, *mptr2;
+       struct march *mptr = NULL;
+       struct march *mptr2 = NULL;
        char room_name[128];
        char next_room[128];
+       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.
         */
@@ -840,6 +865,14 @@ void gotonext(void)
                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, WC->wc_roomname)) {
                                        mptr = (struct march *) malloc(sizeof(struct march));
@@ -847,17 +880,15 @@ void gotonext(void)
                                        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) {
+                                       if (WC->march == NULL) 
                                                WC->march = mptr;
-                                       } else {
-                                               mptr2 = WC->march;
-                                               while (mptr2->next != NULL)
-                                                       mptr2 = mptr2->next;
+                                       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
                 */
@@ -874,7 +905,7 @@ void gotonext(void)
                                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
                 */
@@ -891,19 +922,18 @@ void gotonext(void)
 }
 
 
-/**
- * \brief goto next room
- * \param next_room next room to go to
+/*
+ * goto next room
  */
 void smart_goto(char *next_room) {
        gotoroom(next_room);
-       readloop("readnew");
+       readloop(readnew);
 }
 
 
 
-/**
- * \brief mark all messages in current room as having been read
+/*
+ * mark all messages in current room as having been read
  */
 void slrp_highest(void)
 {
@@ -914,8 +944,8 @@ void slrp_highest(void)
 }
 
 
-/**
- * \brief un-goto the previous room
+/*
+ * un-goto the previous room
  */
 void ungoto(void)
 {
@@ -940,15 +970,25 @@ void ungoto(void)
        smart_goto(buf);
 }
 
+typedef struct __room_states {
+       char password[SIZ];
+       char dirname[SIZ];
+       char name[SIZ];
+       int flags;
+       int floor;
+       int order;
+       int view;
+       int flags2;
+} room_states;
 
 
 
 
-/**
- * \brief Set/clear/read the "self-service list subscribe" flag for a room
+/*
+ * Set/clear/read the "self-service list subscribe" flag for a room
  * 
- * \param newval set to 0 to clear, 1 to set, any other value to leave unchanged.
- * \return return the new value.
+ * set newval to 0 to clear, 1 to set, any other value to leave unchanged.
+ * returns the new value.
  */
 
 int self_service(int newval) {
@@ -958,7 +998,7 @@ int self_service(int newval) {
        char name[SIZ];
        char password[SIZ];
        char dirname[SIZ];
-       int flags, floor, order, view, flags2;
+        int flags, floor, order, view, flags2;
 
        serv_puts("GETR");
        serv_getln(buf, sizeof buf);
@@ -1001,13 +1041,71 @@ int self_service(int newval) {
 
 }
 
+int is_selflist(room_states *RoomFlags)
+{
+       return ((RoomFlags->flags2 & QR2_SELFLIST) != 0);
+}
+
+int is_publiclist(room_states *RoomFlags)
+{
+       return ((RoomFlags->flags2 & QR2_SMTP_PUBLIC) != 0);
+}
 
+int is_moderatedlist(room_states *RoomFlags)
+{
+       return ((RoomFlags->flags2 & QR2_MODERATED) != 0);
+}
 
+/*
+ * Set/clear/read the "self-service list subscribe" flag for a room
+ * 
+ * set newval to 0 to clear, 1 to set, any other value to leave unchanged.
+ * returns the new value.
+ */
 
+int get_roomflags(room_states *RoomOps) 
+{
+       char buf[SIZ];
+       
+       serv_puts("GETR");
+       serv_getln(buf, sizeof buf);
+       if (buf[0] != '2') return(0);
 
+       extract_token(RoomOps->name, &buf[4], 0, '|', sizeof RoomOps->name);
+       extract_token(RoomOps->password, &buf[4], 1, '|', sizeof RoomOps->password);
+       extract_token(RoomOps->dirname, &buf[4], 2, '|', sizeof RoomOps->dirname);
+       RoomOps->flags = extract_int(&buf[4], 3);
+       RoomOps->floor = extract_int(&buf[4], 4);
+       RoomOps->order = extract_int(&buf[4], 5);
+       RoomOps->view = extract_int(&buf[4], 6);
+       RoomOps->flags2 = extract_int(&buf[4], 7);
+       return (1);
+}
 
-/**
- * \brief display the form for editing a room
+int set_roomflags(room_states *RoomOps)
+{
+       char buf[SIZ];
+
+       serv_printf("SETR %s|%s|%s|%d|0|%d|%d|%d|%d",
+                   RoomOps->name, 
+                   RoomOps->password, 
+                   RoomOps->dirname, 
+                   RoomOps->flags,
+                   RoomOps->floor, 
+                   RoomOps->order, 
+                   RoomOps->view, 
+                   RoomOps->flags2);
+       serv_getln(buf, sizeof buf);
+       return (1);
+}
+
+
+
+
+
+
+/*
+ * display the form for editing a room
  */
 void display_editroom(void)
 {
@@ -1033,6 +1131,7 @@ void display_editroom(void)
        int floorvalue = 0;
        char pop3_host[128];
        char pop3_user[32];
+       int bg = 0;
 
        tab = bstr("tab");
        if (IsEmptyStr(tab)) tab = "admin";
@@ -1042,10 +1141,15 @@ void display_editroom(void)
 
        wprintf("<div class=\"fix_scrollbar_bug\">");
 
-       /** print the tabbed dialog */
-       wprintf("<ul class=\"tabbed_dialog\">\n");
+       wprintf("<br />\n");
+
+       /* print the tabbed dialog */
+       wprintf("<div align=\"center\">");
+       wprintf("<table id=\"AdminTabs\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\""
+               "<tr align=\"center\" style=\"cursor:pointer\"><td>&nbsp;</td>"
+               );
 
-       wprintf("<li class=\"tablabel ");
+       wprintf("<td class=\"");
        if (!strcmp(tab, "admin")) {
                wprintf(" tab_cell_label\">");
                wprintf(_("Administration"));
@@ -1055,11 +1159,12 @@ void display_editroom(void)
                wprintf(_("Administration"));
                wprintf("</a>");
        }
-       wprintf("</li>\n");
+       wprintf("</td>\n");
+       wprintf("<td>&nbsp;</td>\n");
 
        if ( (WC->axlevel >= 6) || (WC->is_room_aide) ) {
 
-               wprintf("<li class=\"tablabel ");
+               wprintf("<td class=\"");
                if (!strcmp(tab, "config")) {
                        wprintf(" tab_cell_label\">");
                        wprintf(_("Configuration"));
@@ -1069,9 +1174,10 @@ void display_editroom(void)
                        wprintf(_("Configuration"));
                        wprintf("</a>");
                }
-               wprintf("</li>\n");
+               wprintf("</td>\n");
+               wprintf("<td>&nbsp;</td>\n");
 
-               wprintf("<li class=\"tablabel ");
+               wprintf("<td class=\"");
                if (!strcmp(tab, "expire")) {
                        wprintf(" tab_cell_label\">");
                        wprintf(_("Message expire policy"));
@@ -1081,9 +1187,10 @@ void display_editroom(void)
                        wprintf(_("Message expire policy"));
                        wprintf("</a>");
                }
-               wprintf("</li>\n");
+               wprintf("</td>\n");
+               wprintf("<td>&nbsp;</td>\n");
        
-               wprintf("<li class=\"tablabel ");
+               wprintf("<td class=\"");
                if (!strcmp(tab, "access")) {
                        wprintf(" tab_cell_label\">");
                        wprintf(_("Access controls"));
@@ -1093,9 +1200,10 @@ void display_editroom(void)
                        wprintf(_("Access controls"));
                        wprintf("</a>");
                }
-               wprintf("</li>\n");
+               wprintf("</td>\n");
+               wprintf("<td>&nbsp;</td>\n");
 
-               wprintf("<li class=\"tablabel ");
+               wprintf("<td class=\"");
                if (!strcmp(tab, "sharing")) {
                        wprintf(" tab_cell_label\">");
                        wprintf(_("Sharing"));
@@ -1105,9 +1213,10 @@ void display_editroom(void)
                        wprintf(_("Sharing"));
                        wprintf("</a>");
                }
-               wprintf("</li>\n");
+               wprintf("</td>\n");
+               wprintf("<td>&nbsp;</td>\n");
 
-               wprintf("<li class=\"tablabel ");
+               wprintf("<td class=\"");
                if (!strcmp(tab, "listserv")) {
                        wprintf(" tab_cell_label\">");
                        wprintf(_("Mailing list service"));
@@ -1117,11 +1226,12 @@ void display_editroom(void)
                        wprintf(_("Mailing list service"));
                        wprintf("</a>");
                }
-               wprintf("</li>\n");
+               wprintf("</td>\n");
+               wprintf("<td>&nbsp;</td>\n");
 
        }
 
-       wprintf("<li class=\"tablabel ");
+       wprintf("<td class=\"");
        if (!strcmp(tab, "feeds")) {
                wprintf(" tab_cell_label\">");
                wprintf(_("Remote retrieval"));
@@ -1131,12 +1241,19 @@ void display_editroom(void)
                wprintf(_("Remote retrieval"));
                wprintf("</a>");
        }
-       wprintf("</li>\n");
+       wprintf("</td>\n");
+       wprintf("<td>&nbsp;</td>\n");
+
+       wprintf("</tr></table>\n");
+       wprintf("</div>\n");
+       /* end tabbed dialog */ 
 
-       wprintf("</ul>\n");
-       /** end tabbed dialog */        
+       wprintf("<script type=\"text/javascript\">"
+               " Nifty(\"table#AdminTabs td\", \"small transparent top\");"
+               "</script>"
+       );
 
-       /** begin content of whatever tab is open now */
+       /* begin content of whatever tab is open now */
 
        if (!strcmp(tab, "admin")) {
                wprintf("<div class=\"tabcontent\">");
@@ -1179,7 +1296,7 @@ void display_editroom(void)
                        er_flags2 = extract_int(&buf[4], 7);
        
                        wprintf("<form method=\"POST\" action=\"editroom\">\n");
-                       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+                       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
                
                        wprintf("<ul><li>");
                        wprintf(_("Name of room: "));
@@ -1393,7 +1510,7 @@ void display_editroom(void)
        }
 
 
-       /** Sharing the room with other Citadel nodes... */
+       /* Sharing the room with other Citadel nodes... */
        if (!strcmp(tab, "sharing")) {
                wprintf("<div class=\"tabcontent\">");
 
@@ -1440,7 +1557,7 @@ void display_editroom(void)
                        }
                }
 
-               /** Display the stuff */
+               /* Display the stuff */
                wprintf("<CENTER><br />"
                        "<table border=1 cellpadding=5><tr>"
                        "<td><B><I>");
@@ -1465,7 +1582,7 @@ void display_editroom(void)
                        extract_token(remote_room, buf, 1, '|', sizeof remote_room);
                        if (!IsEmptyStr(node)) {
                                wprintf("<form method=\"POST\" action=\"netedit\">");
-                               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+                               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
                                wprintf("<tr><td>%s</td>\n", node);
 
                                wprintf("<td>");
@@ -1506,7 +1623,7 @@ void display_editroom(void)
                        extract_token(node, not_shared_with, i, '\n', sizeof node);
                        if (!IsEmptyStr(node)) {
                                wprintf("<form method=\"POST\" action=\"netedit\">");
-                               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+                               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
                                wprintf("<tr><td>");
                                escputs(node);
                                wprintf("</td><td>"
@@ -1548,8 +1665,9 @@ void display_editroom(void)
                wprintf("</div>");
        }
 
-       /** Mailing list management */
+       /* Mailing list management */
        if (!strcmp(tab, "listserv")) {
+               room_states RoomFlags;
                wprintf("<div class=\"tabcontent\">");
 
                wprintf("<br /><center>"
@@ -1579,7 +1697,7 @@ void display_editroom(void)
                wprintf("<br /><form method=\"POST\" action=\"netedit\">\n"
                        "<input type=\"hidden\" NAME=\"tab\" VALUE=\"listserv\">\n"
                        "<input type=\"hidden\" NAME=\"prefix\" VALUE=\"listrecp|\">\n");
-               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
                wprintf("<input type=\"text\" id=\"add_as_listrecp\" NAME=\"line\">\n");
                wprintf("<input type=\"submit\" NAME=\"add_button\" VALUE=\"%s\">", _("Add"));
                wprintf("</form>\n");
@@ -1610,7 +1728,7 @@ void display_editroom(void)
                wprintf("<br /><form method=\"POST\" action=\"netedit\">\n"
                        "<input type=\"hidden\" NAME=\"tab\" VALUE=\"listserv\">\n"
                        "<input type=\"hidden\" NAME=\"prefix\" VALUE=\"digestrecp|\">\n");
-               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
                wprintf("<input type=\"text\" id=\"add_as_digestrecp\" NAME=\"line\">\n");
                wprintf("<input type=\"submit\" NAME=\"add_button\" VALUE=\"%s\">", _("Add"));
                wprintf("</form>\n");
@@ -1629,36 +1747,46 @@ void display_editroom(void)
                        _("Add recipients from Contacts or other address books"),
                        _("Add recipients from Contacts or other address books")
                );
-               /** Pop open an address book -- end **/
-
-               wprintf("<hr />");
-               if (self_service(999) == 1) {
-                       wprintf(_("This room is configured to allow "
-                               "self-service subscribe/unsubscribe requests."));
-                       wprintf("<a href=\"toggle_self_service?newval=0&tab=listserv\">");
-                       wprintf(_("Click to disable."));
-                       wprintf("</A><br />\n");
-                       wprintf(_("The URL for subscribe/unsubscribe is: "));
-                       wprintf("<TT>%s://%s/listsub</TT><br />\n",
-                               (is_https ? "https" : "http"),
-                               WC->http_host);
-               }
-               else {
-                       wprintf(_("This room is <i>not</i> configured to allow "
-                               "self-service subscribe/unsubscribe requests."));
-                       wprintf(" <a href=\"toggle_self_service?newval=1&"
-                               "tab=listserv\">");
-                       wprintf(_("Click to enable."));
-                       wprintf("</A><br />\n");
-               }
+               /* Pop open an address book -- end **/
 
+               wprintf("<br />\n<form method=\"GET\" action=\"toggle_self_service\">\n");
+
+               get_roomflags (&RoomFlags);
+               
+               /* Self Service subscription? */
+               wprintf("<table><tr><td>\n");
+               wprintf(_("Allow self-service subscribe/unsubscribe requests."));
+               wprintf("</td><td><input type=\"checkbox\" name=\"QR2_SelfList\" value=\"yes\" %s></td></tr>\n"
+                       " <tr><td colspan=\"2\">\n",
+                       (is_selflist(&RoomFlags))?"checked":"");
+               wprintf(_("The URL for subscribe/unsubscribe is: "));
+               wprintf("<TT>%s://%s/listsub</TT></td></tr>\n",
+                       (is_https ? "https" : "http"),
+                       WC->http_host);
+               /* Public posting? */
+               wprintf("<tr><td>");
+               wprintf(_("Allow non-subscribers to mail to this room."));
+               wprintf("</td><td><input type=\"checkbox\" name=\"QR2_SubsOnly\" value=\"yes\" %s></td></tr>\n",
+                       (is_publiclist(&RoomFlags))?"checked":"");
+               
+               /* Moderated List? */
+               wprintf("<tr><td>");
+               wprintf(_("Room post publication needs Aide permission."));
+               wprintf("</td><td><input type=\"checkbox\" name=\"QR2_Moderated\" value=\"yes\" %s></td></tr>\n",
+                       (is_moderatedlist(&RoomFlags))?"checked":"");
+
+
+               wprintf("<tr><td colspan=\"2\" align=\"center\">"
+                       "<input type=\"submit\" NAME=\"add_button\" VALUE=\"%s\"></td></tr>", _("Save changes"));
+               wprintf("</table></form>");
+                       
 
                wprintf("</CENTER>\n");
                wprintf("</div>");
        }
 
 
-       /** Configuration of The Dreaded Auto-Purger */
+       /* Configuration of The Dreaded Auto-Purger */
        if (!strcmp(tab, "expire")) {
                wprintf("<div class=\"tabcontent\">");
 
@@ -1684,7 +1812,7 @@ void display_editroom(void)
                        }
                        
                        wprintf("<br /><form method=\"POST\" action=\"set_room_policy\">\n");
-                       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+                       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
                        wprintf("<table border=0 cellspacing=5>\n");
                        wprintf("<tr><td>");
                        wprintf(_("Message expire policy for this room"));
@@ -1755,38 +1883,46 @@ void display_editroom(void)
                wprintf("</div>");
        }
 
-       /** Access controls */
+       /* Access controls */
        if (!strcmp(tab, "access")) {
                wprintf("<div class=\"tabcontent\">");
                display_whok();
                wprintf("</div>");
        }
 
-       /** Fetch messages from remote locations */
+       /* Fetch messages from remote locations */
        if (!strcmp(tab, "feeds")) {
                wprintf("<div class=\"tabcontent\">");
 
                wprintf("<i>");
                wprintf(_("Retrieve messages from these remote POP3 accounts and store them in this room:"));
-               wprintf("</i><br /><br />\n");
+               wprintf("</i><br />\n");
 
-               wprintf("<table border=0 cellpadding=5><tr class=\"tab_cell\"><td>");
+               wprintf("<table class=\"altern\" border=0 cellpadding=5>"
+                       "<tr class=\"even\"><th>");
                wprintf(_("Remote host"));
-               wprintf("</td><td>");
+               wprintf("</th><th>");
                wprintf(_("User name"));
-               wprintf("</td><td>");
+               wprintf("</th><th>");
                wprintf(_("Password"));
-               wprintf("</td><td>");
+               wprintf("</th><th>");
                wprintf(_("Keep messages on server?"));
-               wprintf("</td></tr>");
+               wprintf("</th><th>");
+               wprintf(_("Interval"));
+               wprintf("</th><th> </th></tr>");
 
                serv_puts("GNET");
                serv_getln(buf, sizeof buf);
+               bg = 1;
                if (buf[0]=='1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
                        extract_token(cmd, buf, 0, '|', sizeof cmd);
                        if (!strcasecmp(cmd, "pop3client")) {
                                safestrncpy(recp, &buf[11], sizeof recp);
-                               wprintf("<tr>");
+
+                                bg = 1 - bg;
+                                wprintf("<tr class=\"%s\">",
+                                        (bg ? "even" : "odd")
+                                );
 
                                wprintf("<td>");
                                extract_token(pop3_host, buf, 1, '|', sizeof pop3_host);
@@ -1802,12 +1938,14 @@ void display_editroom(void)
 
                                wprintf("<td>%s</td>", extract_int(buf, 4) ? _("Yes") : _("No"));
 
-                               wprintf("<td>");
+                               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|");
                                urlescputs(recp);
                                wprintf("\">");
                                wprintf(_("(remove)"));
-                               wprintf("</A></td>");
+                               wprintf("</a></td>");
                        
                                wprintf("</tr>");
                        }
@@ -1815,9 +1953,9 @@ void display_editroom(void)
 
                wprintf("<form method=\"POST\" action=\"netedit\">\n"
                        "<tr>"
-                       "<input type=\"hidden\" NAME=\"tab\" VALUE=\"feeds\">"
-                       "<input type=\"hidden\" NAME=\"prefix\" VALUE=\"pop3client|\">\n");
-               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+                       "<input type=\"hidden\" name=\"tab\" value=\"feeds\">"
+                       "<input type=\"hidden\" name=\"prefix\" value=\"pop3client|\">\n");
+               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
                wprintf("<td>");
                wprintf("<input type=\"text\" id=\"add_as_pop3host\" NAME=\"line_pop3host\">\n");
                wprintf("</td>");
@@ -1831,15 +1969,74 @@ void display_editroom(void)
                wprintf("<input type=\"checkbox\" id=\"add_as_pop3keep\" NAME=\"line_pop3keep\" VALUE=\"1\">");
                wprintf("</td>");
                wprintf("<td>");
+               wprintf("<input type=\"text\" id=\"add_as_pop3int\" NAME=\"line_pop3int\" MAXLENGTH=\"5\">");
+               wprintf("</td>");
+               wprintf("<td>");
                wprintf("<input type=\"submit\" NAME=\"add_button\" VALUE=\"%s\">", _("Add"));
                wprintf("</td></tr>");
                wprintf("</form></table>\n");
 
+               wprintf("<hr>\n");
+
+               wprintf("<i>");
+               wprintf(_("Fetch the following RSS feeds and store them in this room:"));
+               wprintf("</i><br />\n");
+
+               wprintf("<table class=\"altern\" border=0 cellpadding=5>"
+                       "<tr class=\"even\"><th>");
+               wprintf("<img src=\"static/rss_16x.png\" width=\"16\" height=\"16\" alt=\" \"> ");
+               wprintf(_("Feed URL"));
+               wprintf("</th><th>");
+               wprintf("</th></tr>");
+
+               serv_puts("GNET");
+               serv_getln(buf, sizeof buf);
+               bg = 1;
+               if (buf[0]=='1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+                       extract_token(cmd, buf, 0, '|', sizeof cmd);
+                       if (!strcasecmp(cmd, "rssclient")) {
+                               safestrncpy(recp, &buf[10], sizeof recp);
+
+                                bg = 1 - bg;
+                                wprintf("<tr class=\"%s\">",
+                                        (bg ? "even" : "odd")
+                                );
+
+                               wprintf("<td>");
+                               extract_token(pop3_host, buf, 1, '|', sizeof pop3_host);
+                               escputs(pop3_host);
+                               wprintf("</td>");
+
+                               wprintf("<td class=\"button_link\">");
+                               wprintf(" <a href=\"netedit&cmd=remove&tab=feeds&line=rssclient|");
+                               urlescputs(recp);
+                               wprintf("\">");
+                               wprintf(_("(remove)"));
+                               wprintf("</a></td>");
+                       
+                               wprintf("</tr>");
+                       }
+               }
+
+               wprintf("<form method=\"POST\" action=\"netedit\">\n"
+                       "<tr>"
+                       "<input type=\"hidden\" name=\"tab\" value=\"feeds\">"
+                       "<input type=\"hidden\" name=\"prefix\" value=\"rssclient|\">\n");
+               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+               wprintf("<td>");
+               wprintf("<input type=\"text\" id=\"add_as_pop3host\" size=\"72\" "
+                       "maxlength=\"256\" name=\"line_pop3host\">\n");
+               wprintf("</td>");
+               wprintf("<td>");
+               wprintf("<input type=\"submit\" name=\"add_button\" value=\"%s\">", _("Add"));
+               wprintf("</td></tr>");
+               wprintf("</form></table>\n");
+
                wprintf("</div>");
        }
 
 
-       /** end content of whatever tab is open now */
+       /* end content of whatever tab is open now */
        wprintf("</div>\n");
 
        address_book_popup();
@@ -1847,21 +2044,42 @@ void display_editroom(void)
 }
 
 
-/** 
- * \brief Toggle self-service list subscription
+/* 
+ * Toggle self-service list subscription
  */
 void toggle_self_service(void) {
-       int newval = 0;
+       room_states RoomFlags;
+
+       get_roomflags (&RoomFlags);
 
-       newval = atoi(bstr("newval"));
-       self_service(newval);
+       if (yesbstr("QR2_SelfList")) 
+               RoomFlags.flags2 = RoomFlags.flags2 | QR2_SELFLIST;
+       else 
+               RoomFlags.flags2 = RoomFlags.flags2 & ~QR2_SELFLIST;
+
+       if (yesbstr("QR2_SMTP_PUBLIC")) 
+               RoomFlags.flags2 = RoomFlags.flags2 | QR2_SMTP_PUBLIC;
+       else
+               RoomFlags.flags2 = RoomFlags.flags2 & ~QR2_SMTP_PUBLIC;
+
+       if (yesbstr("QR2_Moderated")) 
+               RoomFlags.flags2 = RoomFlags.flags2 | QR2_MODERATED;
+       else
+               RoomFlags.flags2 = RoomFlags.flags2 & ~QR2_MODERATED;
+       if (yesbstr("QR2_SubsOnly")) 
+               RoomFlags.flags2 = RoomFlags.flags2 | QR2_SMTP_PUBLIC;
+       else
+               RoomFlags.flags2 = RoomFlags.flags2 & ~QR2_SMTP_PUBLIC;
+
+       set_roomflags (&RoomFlags);
+       
        display_editroom();
 }
 
 
 
-/**
- * \brief save new parameters for a room
+/*
+ * save new parameters for a room
  */
 void editroom(void)
 {
@@ -1878,7 +2096,7 @@ void editroom(void)
        int bump;
 
 
-       if (IsEmptyStr(bstr("ok_button"))) {
+       if (!havebstr("ok_button")) {
                strcpy(WC->ImportantMessage,
                        _("Cancelled.  Changes were not saved."));
                display_editroom();
@@ -1944,62 +2162,62 @@ void editroom(void)
                er_flags &= ~QR_MAILBOX;
        }
        
-       if (!strcmp(bstr("prefonly"), "yes")) {
+       if (yesbstr("prefonly")) {
                er_flags |= QR_PREFONLY;
        } else {
                er_flags &= ~QR_PREFONLY;
        }
 
-       if (!strcmp(bstr("readonly"), "yes")) {
+       if (yesbstr("readonly")) {
                er_flags |= QR_READONLY;
        } else {
                er_flags &= ~QR_READONLY;
        }
 
        
-       if (!strcmp(bstr("collabdel"), "yes")) {
+       if (yesbstr("collabdel")) {
                er_flags2 |= QR2_COLLABDEL;
        } else {
                er_flags2 &= ~QR2_COLLABDEL;
        }
 
-       if (!strcmp(bstr("permanent"), "yes")) {
+       if (yesbstr("permanent")) {
                er_flags |= QR_PERMANENT;
        } else {
                er_flags &= ~QR_PERMANENT;
        }
 
-       if (!strcmp(bstr("subjectreq"), "yes")) {
+       if (yesbstr("subjectreq")) {
                er_flags2 |= QR2_SUBJECTREQ;
        } else {
                er_flags2 &= ~QR2_SUBJECTREQ;
        }
 
-       if (!strcmp(bstr("network"), "yes")) {
+       if (yesbstr("network")) {
                er_flags |= QR_NETWORK;
        } else {
                er_flags &= ~QR_NETWORK;
        }
 
-       if (!strcmp(bstr("directory"), "yes")) {
+       if (yesbstr("directory")) {
                er_flags |= QR_DIRECTORY;
        } else {
                er_flags &= ~QR_DIRECTORY;
        }
 
-       if (!strcmp(bstr("ulallowed"), "yes")) {
+       if (yesbstr("ulallowed")) {
                er_flags |= QR_UPLOAD;
        } else {
                er_flags &= ~QR_UPLOAD;
        }
 
-       if (!strcmp(bstr("dlallowed"), "yes")) {
+       if (yesbstr("dlallowed")) {
                er_flags |= QR_DOWNLOAD;
        } else {
                er_flags &= ~QR_DOWNLOAD;
        }
 
-       if (!strcmp(bstr("visdir"), "yes")) {
+       if (yesbstr("visdir")) {
                er_flags |= QR_VISDIR;
        } else {
                er_flags &= ~QR_VISDIR;
@@ -2017,7 +2235,7 @@ void editroom(void)
        if (!strcmp(bstr("bump"), "yes"))
                bump = 1;
 
-       er_floor = atoi(bstr("er_floor"));
+       er_floor = ibstr("er_floor");
 
        sprintf(buf, "SETR %s|%s|%s|%u|%d|%d|%d|%d|%u",
                er_name, er_password, er_dirname, er_flags, bump, er_floor,
@@ -2048,8 +2266,8 @@ void editroom(void)
 }
 
 
-/**
- * \brief Display form for Invite, Kick, and show Who Knows a room
+/*
+ * Display form for Invite, Kick, and show Who Knows a room
  */
 void do_invt_kick(void) {
         char buf[SIZ], room[SIZ], username[SIZ];
@@ -2065,7 +2283,7 @@ void do_invt_kick(void) {
 
         strcpy(username, bstr("username"));
 
-        if (!IsEmptyStr(bstr("kick_button"))) {
+        if (havebstr("kick_button")) {
                 sprintf(buf, "KICK %s", username);
                 serv_puts(buf);
                 serv_getln(buf, sizeof buf);
@@ -2079,7 +2297,7 @@ void do_invt_kick(void) {
                 }
         }
 
-       if (!IsEmptyStr(bstr("invite_button"))) {
+       if (havebstr("invite_button")) {
                 sprintf(buf, "INVT %s", username);
                 serv_puts(buf);
                 serv_getln(buf, sizeof buf);
@@ -2098,8 +2316,8 @@ void do_invt_kick(void) {
 
 
 
-/**
- * \brief Display form for Invite, Kick, and show Who Knows a room
+/*
+ * Display form for Invite, Kick, and show Who Knows a room
  */
 void display_whok(void)
 {
@@ -2122,7 +2340,7 @@ void display_whok(void)
        wprintf("<br /><br />");
        
         wprintf("<CENTER><form method=\"POST\" action=\"do_invt_kick\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
        wprintf("<input type=\"hidden\" NAME=\"tab\" VALUE=\"access\">\n");
         wprintf("<select NAME=\"username\" SIZE=\"10\" style=\"width:100%%\">\n");
         serv_puts("WHOK");
@@ -2147,14 +2365,14 @@ void display_whok(void)
 
         wprintf("<CENTER><form method=\"POST\" action=\"do_invt_kick\">\n");
        wprintf("<input type=\"hidden\" NAME=\"tab\" VALUE=\"access\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
         wprintf(_("Invite:"));
        wprintf(" ");
         wprintf("<input type=\"text\" name=\"username\" id=\"username_id\" style=\"width:100%%\"><br />\n"
                "<input type=\"hidden\" name=\"invite_button\" value=\"Invite\">"
                "<input type=\"submit\" value=\"%s\">"
                "</form></CENTER>\n", _("Invite"));
-               /** Pop open an address book -- begin **/
+               /* Pop open an address book -- begin **/
                wprintf(
                        "<a href=\"javascript:PopOpenAddressBook('username_id|%s');\" "
                        "title=\"%s\">"
@@ -2163,7 +2381,7 @@ void display_whok(void)
                        _("User"), 
                        _("Users"), _("Users")
                );
-               /** Pop open an address book -- end **/
+               /* Pop open an address book -- end **/
 
        wprintf("</td></tr></table>\n");
        address_book_popup();
@@ -2172,8 +2390,8 @@ void display_whok(void)
 
 
 
-/**
- * \brief display the form for entering a new room
+/*
+ * display the form for entering a new room
  */
 void display_entroom(void)
 {
@@ -2191,11 +2409,11 @@ void display_entroom(void)
 
        output_headers(1, 1, 1, 0, 0, 0);
 
-       svprintf("BOXTITLE", WCS_STRING, _("Create a new room"));
-       do_template("beginbox");
+       svprintf(HKEY("BOXTITLE"), WCS_STRING, _("Create a new room"));
+       do_template("beginbox", NULL);
 
        wprintf("<form name=\"create_room_form\" method=\"POST\" action=\"entroom\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
 
        wprintf("<table class=\"altern\"> ");
 
@@ -2220,7 +2438,7 @@ void display_entroom(void)
         wprintf("</select>\n");
         wprintf("</td></tr>");
 
-               /**
+               /*
                 * Our clever little snippet of JavaScript automatically selects
                 * a public room if the view is set to Bulletin Board or wiki, and
                 * it selects a mailbox room otherwise.  The user can override this,
@@ -2314,7 +2532,7 @@ void display_entroom(void)
                fmout("LEFT");
        }
 
-       do_template("endbox");
+       do_template("endbox", NULL);
 
        wDumpContent(1);
 }
@@ -2322,8 +2540,8 @@ void display_entroom(void)
 
 
 
-/**
- * \brief support function for entroom() -- sets the default view 
+/*
+ * support function for entroom() -- sets the default view 
  */
 void er_set_default_view(int newview) {
 
@@ -2358,8 +2576,8 @@ void er_set_default_view(int newview) {
 
 
 
-/**
- * \brief enter a new room
+/*
+ * Create a new room
  */
 void entroom(void)
 {
@@ -2371,7 +2589,7 @@ void entroom(void)
        int er_num_type;
        int er_view;
 
-       if (IsEmptyStr(bstr("ok_button"))) {
+       if (!havebstr("ok_button")) {
                strcpy(WC->ImportantMessage,
                        _("Cancelled.  No new room was created."));
                display_main_menu();
@@ -2380,8 +2598,8 @@ void entroom(void)
        strcpy(er_name, bstr("er_name"));
        strcpy(er_type, bstr("type"));
        strcpy(er_password, bstr("er_password"));
-       er_floor = atoi(bstr("er_floor"));
-       er_view = atoi(bstr("er_view"));
+       er_floor = ibstr("er_floor");
+       er_view = ibstr("er_view");
 
        er_num_type = 0;
        if (!strcmp(er_type, "hidden"))
@@ -2402,6 +2620,10 @@ void entroom(void)
                display_main_menu();
                return;
        }
+       /** TODO: Room created, now udate the left hand icon bar for this user */
+       burn_folder_cache(0);   /* burn the old folder cache */
+       
+       
        gotoroom(er_name);
        do_change_view(er_view);                /* Now go there */
 }
@@ -2412,10 +2634,13 @@ void entroom(void)
  */
 void display_private(char *rname, int req_pass)
 {
+       StrBuf *Buf;
        output_headers(1, 1, 1, 0, 0, 0);
 
-       svprintf("BOXTITLE", WCS_STRING, _("Go to a hidden room"));
-       do_template("beginbox");
+       Buf = NewStrBufPlain(_("Go to a hidden room"), -1);
+       DoTemplate(HKEY("beginbox"), NULL, Buf, CTX_STRBUF);
+
+       FreeStrBuf(&Buf);
 
        wprintf("<p>");
        wprintf(_("If you know the name of a hidden (guess-name) or "
@@ -2426,7 +2651,7 @@ void display_private(char *rname, int req_pass)
        wprintf("</p>");
 
        wprintf("<form method=\"post\" action=\"goto_private\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
 
        wprintf("<table class=\"altern\"> "
                "<tr class=\"even\"><td>");
@@ -2452,7 +2677,7 @@ void display_private(char *rname, int req_pass)
        );
        wprintf("</div></form>\n");
 
-       do_template("endbox");
+       do_template("endbox", NULL);
 
        wDumpContent(1);
 }
@@ -2465,7 +2690,7 @@ void goto_private(void)
        char hold_rm[SIZ];
        char buf[SIZ];
 
-       if (IsEmptyStr(bstr("ok_button"))) {
+       if (!havebstr("ok_button")) {
                display_main_menu();
                return;
        }
@@ -2512,7 +2737,7 @@ void display_zap(void)
                "to do?<br />\n"), WC->wc_roomname);
 
        wprintf("<form method=\"POST\" action=\"zap\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
        wprintf("<input type=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Zap this room"));
        wprintf("&nbsp;");
        wprintf("<input type=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
@@ -2535,7 +2760,7 @@ void zap(void)
         */
        strcpy(final_destination, WC->wc_roomname);
 
-       if (!IsEmptyStr(bstr("ok_button"))) {
+       if (havebstr("ok_button")) {
                serv_printf("GOTO %s", WC->wc_roomname);
                serv_getln(buf, sizeof buf);
                if (buf[0] == '2') {
@@ -2558,8 +2783,10 @@ void delete_room(void)
 {
        char buf[SIZ];
 
+       
        serv_puts("KILL 1");
        serv_getln(buf, sizeof buf);
+       burn_folder_cache(0);   /* Burn the cahce of known rooms to update the icon bar */
        if (buf[0] != '2') {
                strcpy(WC->ImportantMessage, &buf[4]);
                display_main_menu();
@@ -2583,8 +2810,8 @@ void netedit(void) {
        char cmpb0[SIZ];
        char cmpb1[SIZ];
        int i, num_addrs;
-
-       if (!IsEmptyStr(bstr("line_pop3host"))) {
+       // TODO: do line dynamic!
+       if (havebstr("line_pop3host")) {
                strcpy(line, bstr("prefix"));
                strcat(line, bstr("line_pop3host"));
                strcat(line, "|");
@@ -2592,10 +2819,12 @@ void netedit(void) {
                strcat(line, "|");
                strcat(line, bstr("line_pop3pass"));
                strcat(line, "|");
-               strcat(line, atoi(bstr("line_pop3keep")) ? "1" : "0" );
+               strcat(line, ibstr("line_pop3keep") ? "1" : "0" );
+               strcat(line, "|");
+               sprintf(&line[strlen(line)],"%ld", lbstr("line_pop3int"));
                strcat(line, bstr("suffix"));
        }
-       else if (!IsEmptyStr(bstr("line"))) {
+       else if (havebstr("line")) {
                strcpy(line, bstr("prefix"));
                strcat(line, bstr("line"));
                strcat(line, bstr("suffix"));
@@ -2646,7 +2875,7 @@ void netedit(void) {
                serv_puts(buf);
        }
 
-       if (!IsEmptyStr(bstr("add_button"))) {
+       if (havebstr("add_button")) {
                num_addrs = num_tokens(bstr("line"), ',');
                if (num_addrs < 2) {
                        /* just adding one node or address */
@@ -2694,7 +2923,13 @@ void room_to_folder(char *folder, char *room, int floor, int is_mailbox)
         * Otherwise, prefix the floor name as a "public folders" moniker
         */
        else {
-               sprintf(folder, "%s|%s", floorlist[floor], room);
+               if (floor > MAX_FLOORS) {
+                       wc_backtrace ();
+                       sprintf(folder, "%%%%%%|%s", room);
+               }
+               else {
+                       sprintf(folder, "%s|%s", floorlist[floor], room);
+               }
        }
 
        /**
@@ -2730,7 +2965,7 @@ void do_change_view(int newview) {
 void change_view(void) {
        int view;
 
-       view = atol(bstr("view"));
+       view = lbstr("view");
        do_change_view(view);
 }
 
@@ -2864,7 +3099,6 @@ 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];
-       char boxtitle[256];
        int levels, oldlevels;
        int i, t;
        int num_boxes = 0;
@@ -2896,7 +3130,8 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
                if ( (strcasecmp(floor_name, old_floor_name))
                   && (!IsEmptyStr(old_floor_name)) ) {
                        /* End inner box */
-                       do_template("endbox");
+                       do_template("endbox", NULL);
+                       wprintf("<br>");
 
                        ++num_boxes;
                        if ((num_boxes % boxes_per_column) == 0) {
@@ -2909,10 +3144,12 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
                strcpy(old_floor_name, floor_name);
 
                if (levels == 1) {
-                       /** Begin inner box */
-                       stresc(boxtitle, 256, floor_name, 1, 0);
-                       svprintf("BOXTITLE", WCS_STRING, boxtitle);
-                       do_template("beginbox");
+                       StrBuf *Buf;
+                       
+                       Buf = NewStrBufPlain(floor_name, -1);
+                       DoTemplate(HKEY("beginbox"), NULL, Buf, CTX_STRBUF);
+                       
+                       FreeStrBuf(&Buf);
                }
 
                oldlevels = levels;
@@ -2950,7 +3187,7 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
                }
        }
        /** End the final inner box */
-       do_template("endbox");
+       do_template("endbox", NULL);
 
        wprintf("</td></tr></table>\n");
 }
@@ -2959,10 +3196,14 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
  * \brief print a floor div???
  * \param which_floordiv name of the floordiv???
  */
-void set_floordiv_expanded(char *which_floordiv) {
-       begin_ajax_response();
-       safestrncpy(WC->floordiv_expanded, which_floordiv, sizeof WC->floordiv_expanded);
-       end_ajax_response();
+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;
 }
 
 /**
@@ -3010,7 +3251,7 @@ void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
                                "%s</span><br>\n", floordiv_id, floordivtitle);
                        wprintf("<div id=\"%s\" style=\"display:%s\">",
                                floordiv_id,
-                               (!strcasecmp(floordiv_id, WC->floordiv_expanded) ? "block" : "none")
+                               (!strcasecmp(floordiv_id, ChrPtr(WC->floordiv_expanded)) ? "block" : "none")
                        );
                }
 
@@ -3048,7 +3289,7 @@ void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
                                wprintf("<a href=\"dotgoto?room=");
                                urlescputs(fold[i].room);
                                wprintf("\">");
-                               wprintf("<img align=\"middle\" border=0 src=\"static/%s\" alt=\"\"> ", icon);
+                               wprintf("<img  border=0 src=\"static/%s\" alt=\"\"> ", icon);
                        }
                        else {
                                wprintf("<i>");
@@ -3095,9 +3336,9 @@ void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
        }
 
        wprintf("num_drop_targets = %d;\n", num_drop_targets);
-       if ((WC->floordiv_expanded[0] != '\0')&&
-           (WC->floordiv_expanded[1] != '\0')){
-               wprintf("which_div_expanded = '%s';\n", WC->floordiv_expanded);
+       if ((ChrPtr(WC->floordiv_expanded)[0] != '\0')&&
+           (ChrPtr(WC->floordiv_expanded)[1] != '\0')){
+               wprintf("which_div_expanded = '%s';\n", ChrPtr(WC->floordiv_expanded));
        }
 
        wprintf("\">\n");
@@ -3106,6 +3347,25 @@ void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
 
 
 
+/**
+ * \brief Burn the cached folder list.  
+ * \param age How old the cahce needs to be before we burn it.
+ */
+
+void burn_folder_cache(time_t age)
+{
+       /** If our cached folder list is very old, burn it. */
+       if (WC->cache_fold != NULL) {
+               if ((time(NULL) - WC->cache_timestamp) > age) {
+                       free(WC->cache_fold);
+                       WC->cache_fold = NULL;
+               }
+       }
+}
+
+
+
+
 /**
  * \brief Show the room list.  
  * (only should get called by
@@ -3113,27 +3373,25 @@ void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
  * \param viewpref the view preferences???
  */
 
-void list_all_rooms_by_floor(char *viewpref) {
+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 buf2[SIZ];
+       char buf3[SIZ];
        
        /** If our cached folder list is very old, burn it. */
-       if (WC->cache_fold != NULL) {
-               if ((time(NULL) - WC->cache_timestamp) > 300) {
-                       free(WC->cache_fold);
-                       WC->cache_fold = NULL;
-               }
-       }
-
+       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);
@@ -3162,10 +3420,20 @@ void list_all_rooms_by_floor(char *viewpref) {
                }
                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 */
 //     serv_puts("GOTO ");
 //     while (serv_getln(buf, sizeof buf), strcmp(buf, "000"));
@@ -3195,18 +3463,21 @@ void list_all_rooms_by_floor(char *viewpref) {
                                fold[max_folders].is_mailbox);
                fold[max_folders].selectable = 1;
                /* Increase the room count for the associtaed floor */
-               if (fold[max_folders].is_mailbox)
+               if (fold[max_folders].is_mailbox) {
                        fold[0].num_rooms++;
-               else
-                       fold[fold[max_folders].floor+1].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_preference("emptyfloors", buf2, sizeof buf2);
-       if (buf2[0]==0 || (strcasecmp(buf2, "no") == 0))
+       get_pref_yesno("emptyfloors", &ShowEmptyFloors, 0);
+       if (ShowEmptyFloors)
        {
                for (i=0; i<num_floors; i++)
                {
@@ -3271,6 +3542,7 @@ void list_all_rooms_by_floor(char *viewpref) {
        WC->cache_max_folders = max_folders;
        WC->cache_num_floors = num_floors;
        WC->cache_timestamp = time(NULL);
+       free(floor_mapping);
 }
 
 
@@ -3280,35 +3552,41 @@ void list_all_rooms_by_floor(char *viewpref) {
  */
 void knrooms(void)
 {
-       char listviewpref[SIZ];
+       StrBuf *ListView = NULL;
 
        output_headers(1, 1, 2, 0, 0, 0);
 
        /** Determine whether the user is trying to change views */
-       if (bstr("view") != NULL) {
-               if (!IsEmptyStr(bstr("view"))) {
-                       set_preference("roomlistview", bstr("view"), 1);
+       if (havebstr("view")) {
+               ListView = NewStrBufPlain(bstr("view"), -1);
+               set_preference("roomlistview", ListView, 1);
+       }
+       /** Sanitize the input so its safe */
+       if(!get_preference("roomlistview", &ListView) ||
+          ((strcasecmp(ChrPtr(ListView), "folders") != 0) &&
+           (strcasecmp(ChrPtr(ListView), "table") != 0))) 
+       {
+               if (ListView == NULL) {
+                       ListView = NewStrBufPlain("rooms", sizeof("rooms") - 1);
+                       set_preference("roomlistview", ListView, 0);
+               }
+               else {
+                       StrBufPrintf(ListView, "rooms");
+                       save_preferences();
                }
-       }
-
-       get_preference("roomlistview", listviewpref, sizeof listviewpref);
-
-       if ( (strcasecmp(listviewpref, "folders"))
-          && (strcasecmp(listviewpref, "table")) ) {
-               strcpy(listviewpref, "rooms");
        }
 
        /** title bar */
        wprintf("<div id=\"banner\">\n");
        wprintf("<div class=\"room_banner\">");
        wprintf("<h1>");
-       if (!strcasecmp(listviewpref, "rooms")) {
+       if (!strcasecmp(ChrPtr(ListView), "rooms")) {
                wprintf(_("Room list"));
        }
-       if (!strcasecmp(listviewpref, "folders")) {
+       else if (!strcasecmp(ChrPtr(ListView), "folders")) {
                wprintf(_("Folder list"));
        }
-       if (!strcasecmp(listviewpref, "table")) {
+       else if (!strcasecmp(ChrPtr(ListView), "table")) {
                wprintf(_("Room list"));
        }
        wprintf("</h1></div>\n");
@@ -3316,7 +3594,7 @@ void knrooms(void)
        /** offer the ability to switch views */
        wprintf("<ul class=\"room_actions\">\n");
        wprintf("<li class=\"start_page\">");
-       offer_start_page();
+       offer_start_page(NULL, 0, NULL, NULL, CTX_NONE);
        wprintf("</li>");
        wprintf("<li><form name=\"roomlistomatic\">\n"
                "<select name=\"newview\" size=\"1\" "
@@ -3326,13 +3604,13 @@ void knrooms(void)
        wprintf("<option %s value=\"knrooms&view=rooms\">"
                "View as room list"
                "</option>\n",
-               ( !strcasecmp(listviewpref, "rooms") ? "SELECTED" : "" )
+               ( !strcasecmp(ChrPtr(ListView), "rooms") ? "SELECTED" : "" )
        );
 
        wprintf("<option %s value=\"knrooms&view=folders\">"
                "View as folder list"
                "</option>\n",
-               ( !strcasecmp(listviewpref, "folders") ? "SELECTED" : "" )
+               ( !strcasecmp(ChrPtr(ListView), "folders") ? "SELECTED" : "" )
        );
 
        wprintf("</select>");
@@ -3342,7 +3620,7 @@ void knrooms(void)
        wprintf("<div id=\"content\" class=\"service\">\n");
 
        /** Display the room list in the user's preferred format */
-       list_all_rooms_by_floor(listviewpref);
+       list_all_rooms_by_floor(ChrPtr(ListView));
        wDumpContent(1);
 }
 
@@ -3354,20 +3632,20 @@ void knrooms(void)
 void set_room_policy(void) {
        char buf[SIZ];
 
-       if (IsEmptyStr(bstr("ok_button"))) {
+       if (!havebstr("ok_button")) {
                strcpy(WC->ImportantMessage,
                        _("Cancelled.  Changes were not saved."));
                display_editroom();
                return;
        }
 
-       serv_printf("SPEX room|%d|%d", atoi(bstr("roompolicy")), atoi(bstr("roomvalue")));
+       serv_printf("SPEX room|%d|%d", ibstr("roompolicy"), ibstr("roomvalue"));
        serv_getln(buf, sizeof buf);
        strcpy(WC->ImportantMessage, &buf[4]);
 
        if (WC->axlevel >= 6) {
                strcat(WC->ImportantMessage, "<br />\n");
-               serv_printf("SPEX floor|%d|%d", atoi(bstr("floorpolicy")), atoi(bstr("floorvalue")));
+               serv_printf("SPEX floor|%d|%d", ibstr("floorpolicy"), ibstr("floorvalue"));
                serv_getln(buf, sizeof buf);
                strcat(WC->ImportantMessage, &buf[4]);
        }
@@ -3375,4 +3653,241 @@ void set_room_policy(void) {
        display_editroom();
 }
 
+
+void tmplput_RoomName(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+       StrBuf *tmp;
+       tmp = NewStrBufPlain(WC->wc_roomname, -1);;
+       StrBufAppendTemplate(Target, nArgs, Tokens, Context, ContextType, tmp, 0);
+       FreeStrBuf(&tmp);
+}
+
+void _gotonext(void) { slrp_highest(); gotonext(); }
+void dotskip(void) {smart_goto(bstr("room"));}
+void _display_private(void) { display_private("", 0); }
+void dotgoto(void) {
+       if (WC->wc_view != VIEW_MAILBOX) {      /* dotgoto acts like dotskip when we're in a mailbox view */
+               slrp_highest();
+       }
+       smart_goto(bstr("room"));
+}
+
+void tmplput_roombanner(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+       wprintf("<div id=\"banner\">\n");
+       embed_room_banner(NULL, navbar_default);
+       wprintf("</div>\n");
+}
+
+
+void tmplput_ungoto(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+       wcsession *WCC = WC;
+
+       if ((WCC!=NULL) && 
+           (!IsEmptyStr(WCC->ugname)))
+               StrBufAppendBufPlain(Target, WCC->ugname, -1, 0);
+}
+
+
+int ConditionalHaveUngoto(WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) && 
+               (!IsEmptyStr(WCC->ugname)) && 
+               (strcasecmp(WCC->ugname, WCC->wc_roomname) == 0));
+}
+
+
+
+
+int ConditionalRoomHas_QR_PERMANENT(WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_PERMANENT) != 0));
+}
+
+int ConditionalRoomHas_QR_INUSE(WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_INUSE) != 0));
+}
+
+int ConditionalRoomHas_QR_PRIVATE(WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_PRIVATE) != 0));
+}
+
+int ConditionalRoomHas_QR_PASSWORDED(WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_PASSWORDED) != 0));
+}
+
+int ConditionalRoomHas_QR_GUESSNAME(WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_GUESSNAME) != 0));
+}
+
+int ConditionalRoomHas_QR_DIRECTORY(WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_DIRECTORY) != 0));
+}
+
+int ConditionalRoomHas_QR_UPLOAD(WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_UPLOAD) != 0));
+}
+
+int ConditionalRoomHas_QR_DOWNLOAD(WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_DOWNLOAD) != 0));
+}
+
+int ConditionalRoomHas_QR_VISDIR(WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_VISDIR) != 0));
+}
+
+int ConditionalRoomHas_QR_ANONONLY(WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_ANONONLY) != 0));
+}
+
+int ConditionalRoomHas_QR_ANONOPT(WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_ANONOPT) != 0));
+}
+
+int ConditionalRoomHas_QR_NETWORK(WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_NETWORK) != 0));
+}
+
+int ConditionalRoomHas_QR_PREFONLY(WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_PREFONLY) != 0));
+}
+
+int ConditionalRoomHas_QR_READONLY(WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_READONLY) != 0));
+}
+
+int ConditionalRoomHas_QR_MAILBOX(WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_MAILBOX) != 0));
+}
+
+
+
+
+
+
+int ConditionalHaveRoomeditRights(WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+       wcsession *WCC = WC;
+
+       return ( (WCC!= NULL) && 
+                ((WCC->axlevel >= 6) || 
+                 (WCC->is_room_aide) || 
+                 (WCC->is_mailbox) ));
+}
+
+void 
+InitModule_ROOMOPS
+(void)
+{
+       RegisterNamespace("ROOMNAME", 0, 1, tmplput_RoomName, 0);
+
+       WebcitAddUrlHandler(HKEY("knrooms"), knrooms, 0);
+       WebcitAddUrlHandler(HKEY("gotonext"), _gotonext, 0);
+       WebcitAddUrlHandler(HKEY("skip"), gotonext, 0);
+       WebcitAddUrlHandler(HKEY("ungoto"), ungoto, 0);
+       WebcitAddUrlHandler(HKEY("dotgoto"), dotgoto, 0);
+       WebcitAddUrlHandler(HKEY("dotskip"), dotskip, 0);
+       WebcitAddUrlHandler(HKEY("display_private"), _display_private, 0);
+       WebcitAddUrlHandler(HKEY("goto_private"), goto_private, 0);
+       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);
+       RegisterNamespace("ROOMBANNER", 0, 1, tmplput_roombanner, 0);
+
+       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);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_PASSWORDED"), 0, ConditionalRoomHas_QR_PASSWORDED, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_GUESSNAME"), 0, ConditionalRoomHas_QR_GUESSNAME, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_DIRECTORY"), 0, ConditionalRoomHas_QR_DIRECTORY, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_UPLOAD"), 0, ConditionalRoomHas_QR_UPLOAD, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_DOWNLOAD"), 0, ConditionalRoomHas_QR_DOWNLOAD, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_VISIDIR"), 0, ConditionalRoomHas_QR_VISDIR, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_ANONONLY"), 0, ConditionalRoomHas_QR_ANONONLY, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_ANONOPT"), 0, ConditionalRoomHas_QR_ANONOPT, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_NETWORK"), 0, ConditionalRoomHas_QR_NETWORK, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_PREFONLY"), 0, ConditionalRoomHas_QR_PREFONLY, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_READONLY"), 0, ConditionalRoomHas_QR_READONLY, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_MAILBOX"), 0, ConditionalRoomHas_QR_MAILBOX, CTX_NONE);
+
+       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);
+}
+
 /*@}*/