* we have now several bstrs:
[citadel.git] / webcit / roomops.c
index 9573fc9b3860bc681a5593b38d2fd35fbb0fc88f..d2bc437ea8ef25ae615faeb60915237e3b098a40 100644 (file)
@@ -1,15 +1,18 @@
 /*
  * $Id$
- *
  * Lots of different room-related operations.
  */
 
 #include "webcit.h"
+#include "webserver.h"
+#define MAX_FLOORS 128
+char floorlist[MAX_FLOORS][SIZ]; /**< list of our floor names */
 
-char floorlist[128][SIZ];
-
-char *viewdefs[7];
+char *viewdefs[9]; /**< the different kinds of available views */
 
+/*
+ * Initialize the viewdefs with localized strings
+ */
 void initialize_viewdefs(void) {
        viewdefs[0] = _("Bulletin Board");
        viewdefs[1] = _("Mail Folder");
@@ -18,6 +21,33 @@ void initialize_viewdefs(void) {
        viewdefs[4] = _("Task List");
        viewdefs[5] = _("Notes List");
        viewdefs[6] = _("Wiki");
+       viewdefs[7] = _("Calendar List");
+       viewdefs[8] = _("Journal");
+}
+
+/*
+ * Determine which views are allowed as the default for creating a new room.
+ */
+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 */
+       }
 }
 
 
@@ -29,7 +59,7 @@ 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");
@@ -44,6 +74,23 @@ void load_floorlist(void)
 }
 
 
+/*
+ * Free a session's march list
+ */
+void free_march_list(struct 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
  */
@@ -75,7 +122,9 @@ void remove_march(char *aaa)
 
 
 
-
+/*
+ * display rooms in tree structure
+ */
 void room_tree_list(struct roomlisting *rp)
 {
        char rmname[64];
@@ -103,15 +152,18 @@ void room_tree_list(struct roomlisting *rp)
                wprintf(")");
        else
                wprintf("&gt;");
-       wprintf("</A><TT> </TT>\n");
+       wprintf("</a><tt> </tt>\n");
 
        room_tree_list(rp->rnext);
        free(rp);
 }
 
 
-/* 
- * Room ordering stuff (compare first by floor, then by order)
+/** 
+ * \brief Room ordering stuff (compare first by floor, then by order)
+ * \param r1 first roomlist to compare
+ * \param r2 second roomlist co compare
+ * \return are they the same???
  */
 int rordercmp(struct roomlisting *r1, struct roomlisting *r2)
 {
@@ -133,8 +185,9 @@ int rordercmp(struct roomlisting *r1, struct roomlisting *r2)
 }
 
 
-/*
- * Common code for all room listings
+/**
+ * \brief Common code for all room listings
+ * \param variety what???
  */
 void listrms(char *variety)
 {
@@ -145,14 +198,14 @@ void listrms(char *variety)
        struct roomlisting *rp;
        struct roomlisting *rs;
 
-
-       /* Ask the server for a room list */
+       /** Ask the server for a room list */
        serv_puts(variety);
        serv_getln(buf, sizeof buf);
        if (buf[0] != '1') {
                wprintf("&nbsp;");
                return;
        }
+
        while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
                ++num_rooms;
                rp = malloc(sizeof(struct roomlisting));
@@ -188,19 +241,20 @@ void listrms(char *variety)
 
        room_tree_list(rl);
 
-       /* If no rooms were listed, print an nbsp to make the cell
+       /**
+        * If no rooms were listed, print an nbsp to make the cell
         * borders show up anyway.
         */
        if (num_rooms == 0) wprintf("&nbsp;");
 }
 
 
-/*
- * list all forgotten rooms
+/**
+ * \brief list all forgotten rooms
  */
 void zapped_list(void)
 {
-       output_headers(1, 1, 0, 0, 0, 0);
+       output_headers(1, 1, 1, 0, 0, 0);
 
        svprintf("BOXTITLE", WCS_STRING, _("Zapped (forgotten) rooms"));
        do_template("beginbox");
@@ -214,17 +268,42 @@ void zapped_list(void)
 }
 
 
-/*
- * read this room's info file (set v to 1 for verbose mode)
+/**
+ * \brief read this room's info file (set v to 1 for verbose mode)
  */
 void readinfo(void)
 {
-       char buf[SIZ];
+       char buf[256];
+       char briefinfo[128];
+       char fullinfo[8192];
+       int fullinfo_len = 0;
 
        serv_puts("RINF");
        serv_getln(buf, sizeof buf);
        if (buf[0] == '1') {
-               fmout("CENTER");
+
+               while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+                       if (fullinfo_len < (sizeof fullinfo - sizeof buf)) {
+                               strcpy(&fullinfo[fullinfo_len], buf);
+                               fullinfo_len += strlen(buf);
+                       }
+               }
+
+               safestrncpy(briefinfo, fullinfo, sizeof briefinfo);
+               strcpy(&briefinfo[50], "...");
+
+                wprintf("<div class=\"infos\" "
+                "onclick=\"javascript:Effect.Appear('room_infos', { duration: 0.5 });\" "
+                ">");
+               escputs(briefinfo);
+                wprintf("</div><div id=\"room_infos\" style=\"display:none;\">");
+               wprintf("<img class=\"close_infos\" "
+                       "onclick=\"javascript:Effect.Fade('room_infos', { duration: 0.5 });\" "
+                       "src=\"static/closewindow.gif\" alt=\"%s\">",
+                       _("Close window")
+               );
+               escputs(fullinfo);
+                wprintf("</div>");
        }
        else {
                wprintf("&nbsp;");
@@ -234,7 +313,9 @@ void readinfo(void)
 
 
 
-/* Display room banner icon.  The server doesn't actually
+/**
+ * \brief Display room banner icon.  
+ * The server doesn't actually
  * need the room name, but we supply it in order to
  * keep the browser from using a cached icon from 
  * another room.
@@ -245,7 +326,7 @@ void embed_room_graphic(void) {
        serv_puts("OIMG _roompic_");
        serv_getln(buf, sizeof buf);
        if (buf[0] == '2') {
-               wprintf("<IMG HEIGHT=64 src=\"image&name=_roompic_&room=");
+               wprintf("<img height=\"64px\" src=\"image&name=_roompic_&room=");
                urlescputs(WC->wc_roomname);
                wprintf("\">");
                serv_puts("CLOS");
@@ -257,7 +338,7 @@ void embed_room_graphic(void) {
                        "\">"
                );
        }
-       else if (WC->wc_view == VIEW_CALENDAR) {
+       else if ( (WC->wc_view == VIEW_CALENDAR) || (WC->wc_view == VIEW_CALBRIEF) ) {
                wprintf("<img height=48 width=48 src=\""
                        "static/calarea_48x.gif"
                        "\">"
@@ -292,110 +373,157 @@ void embed_room_graphic(void) {
 
 
 
-/*
- * Display the current view and offer an option to change it
+/**
+ * \brief Display the current view and offer an option to change it
  */
 void embed_view_o_matic(void) {
        int i;
 
-       wprintf("<form name=\"viewomatic\" action=\"changeview\">\n"
-               "<span class=\"room_banner_new_messages\">");
+       wprintf("<form name=\"viewomatic\" action=\"changeview\">\n");
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       wprintf("<label for=\"view_name\">");
        wprintf(_("View as:"));
-       wprintf(" "
-               "<SELECT NAME=\"newview\" SIZE=\"1\" "
-               "STYLE=\"font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;"
-               " font-size: 7pt; background: #444455; color: #ddddcc;\" "
+       wprintf("</label> "
+               "<select name=\"newview\" size=\"1\" "
+               "id=\"view_name\" class=\"selectbox\" "
                "OnChange=\"location.href=viewomatic.newview.options"
                "[selectedIndex].value\">\n");
 
        for (i=0; i<(sizeof viewdefs / sizeof (char *)); ++i) {
-               /*
+               /**
                 * Only offer the views that make sense, given the default
                 * view for the room.  For example, don't offer a Calendar
                 * view in a non-Calendar room.
                 */
                if (
                        (i == WC->wc_view)
-                  ||   (i == WC->wc_default_view)
-                  ||   ( (i == 0) && (WC->wc_default_view == 1) )
-                  ||   ( (i == 1) && (WC->wc_default_view == 0) )
+                       ||      (i == WC->wc_default_view)                      /**< default */
+                       ||      ( (i == 0) && (WC->wc_default_view == 1) )      /**< mail or bulletin */
+                       ||      ( (i == 1) && (WC->wc_default_view == 0) )      /**< mail or bulletin */
+                       /** ||  ( (i == 7) && (WC->wc_default_view == 3) )      (calendar list temporarily disabled) */
                ) {
 
-                       wprintf("<OPTION %s VALUE=\"changeview?view=%d\">",
-                               ((i == WC->wc_view) ? "SELECTED" : ""),
+                       wprintf("<option %s value=\"changeview?view=%d\">",
+                               ((i == WC->wc_view) ? "selected" : ""),
                                i );
                        escputs(viewdefs[i]);
-                       wprintf("</OPTION>\n");
+                       wprintf("</option>\n");
                }
        }
-       wprintf("</select></span></form>\n");
+       wprintf("</select></form>\n");
 }
 
 
+/**
+ * \brief Display a search box
+ */
+void embed_search_o_matic(void) {
+       wprintf("<form name=\"searchomatic\" action=\"do_search\">\n");
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       wprintf("<label for=\"search_name\">");
+       wprintf(_("Search: "));
+       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("</form>\n");
+}
 
-void embed_room_banner(char *got, int navbar_style) {
-       char fakegot[SIZ];
 
-       /* We need to have the information returned by a GOTO server command.
+/**
+ * \brief              Embed the room banner
+ *
+ * \param got          The information returned from a GOTO server command
+ * \param navbar_style         Determines which navigation buttons to display
+ *
+ */
+
+void embed_room_banner(char *got, int navbar_style) {
+       char buf[256];
+       char buf2[1024];
+       char sanitized_roomname[256];
+       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) {
                serv_printf("GOTO %s", WC->wc_roomname);
-               serv_getln(fakegot, sizeof fakegot);
-               got = fakegot;
+               serv_getln(buf, sizeof buf);
+               got = buf;
        }
 
-       /* The browser needs some information for its own use */
+       /** The browser needs some information for its own use */
        wprintf("<script type=\"text/javascript\">      \n"
                "       room_is_trash = %d;             \n"
                "</script>\n",
                WC->wc_is_trash
        );
 
-       /* If the user happens to select the "make this my start page" link,
+       /**
+        * If the user happens to select the "make this my start page" link,
         * we want it to remember the URL as a "/dotskip" one instead of
         * a "skip" or "gotonext" or something like that.
         */
        snprintf(WC->this_page, sizeof(WC->this_page), "dotskip&room=%s",
                WC->wc_roomname);
 
-       /* Check for new mail. */
+       /** Check for new mail. */
        WC->new_mail = extract_int(&got[4], 9);
        WC->wc_view = extract_int(&got[4], 11);
 
-       svprintf("ROOMNAME", WCS_STRING, "%s", WC->wc_roomname);
+       /* 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, "");
+               
+       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"),
+               _("%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("SEARCHOMATIC", embed_search_o_matic);
        svcallback("START", offer_start_page);
 
        do_template("roombanner");
        if (navbar_style != navbar_none) {
 
-               wprintf("<div style=\"position:absolute; bottom:0px; left:0px\">\n"
-                       "<table width=\"100%%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr>\n");
-
+               wprintf("<div id=\"navbar\"><ul>");
 
                if (navbar_style == navbar_default) wprintf(
-                       "<td>"
+                       "<li class=\"ungoto\">"
                        "<a href=\"ungoto\">"
                        "<img align=\"middle\" src=\"static/ungoto2_24x.gif\" border=\"0\">"
                        "<span class=\"navbar_link\">%s</span></A>"
-                       "</td>\n", _("Ungoto")
+                       "</li>\n", _("Ungoto")
                );
 
                if ( (navbar_style == navbar_default) && (WC->wc_view == VIEW_BBS) ) {
                        wprintf(
-                               "<td>"
+                               "<li class=\"newmess\">"
                                "<a href=\"readnew\">"
                                "<img align=\"middle\" src=\"static/newmess2_24x.gif\" border=\"0\">"
                                "<span class=\"navbar_link\">%s</span></A>"
-                               "</td>\n", _("Read new messages")
+                               "</li>\n", _("Read new messages")
                        );
                }
 
@@ -403,77 +531,99 @@ void embed_room_banner(char *got, int navbar_style) {
                        switch(WC->wc_view) {
                                case VIEW_ADDRESSBOOK:
                                        wprintf(
-                                               "<td>"
+                                               "<li class=\"viewcontacts\">"
                                                "<a href=\"readfwd\">"
                                                "<img align=\"middle\" src=\"static/viewcontacts_24x.gif\" "
                                                "border=\"0\">"
                                                "<span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("View contacts")
+                                               "</span></a></li>\n", _("View contacts")
                                        );
                                        break;
                                case VIEW_CALENDAR:
                                        wprintf(
-                                               "<td>"
+                                               "<li class=\"staskday\">"
                                                "<a href=\"readfwd?calview=day\">"
                                                "<img align=\"middle\" src=\"static/taskday2_24x.gif\" "
                                                "border=\"0\">"
                                                "<span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("Day view")
+                                               "</span></a></li>\n", _("Day view")
                                        );
                                        wprintf(
-                                               "<td>"
+                                               "<li class=\"monthview\">"
                                                "<a href=\"readfwd?calview=month\">"
                                                "<img align=\"middle\" src=\"static/monthview2_24x.gif\" "
                                                "border=\"0\">"
                                                "<span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("Month view")
+                                               "</span></a></li>\n", _("Month view")
+                                       );
+                                       break;
+                               case VIEW_CALBRIEF:
+                                       wprintf(
+                                               "<li class=\"monthview\">"
+                                               "<a href=\"readfwd?calview=month\">"
+                                               "<img align=\"middle\" src=\"static/monthview2_24x.gif\" "
+                                               "border=\"0\">"
+                                               "<span class=\"navbar_link\">"
+                                               "%s"
+                                               "</span></a></li>\n", _("Calendar list")
                                        );
                                        break;
                                case VIEW_TASKS:
                                        wprintf(
-                                               "<td>"
+                                               "<li class=\"taskmanag\">"
                                                "<a href=\"readfwd\">"
                                                "<img align=\"middle\" src=\"static/taskmanag_24x.gif\" "
                                                "border=\"0\">"
                                                "<span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("View tasks")
+                                               "</span></a></li>\n", _("View tasks")
                                        );
                                        break;
                                case VIEW_NOTES:
                                        wprintf(
-                                               "<td>"
+                                               "<li class=\"viewnotes\">"
                                                "<a href=\"readfwd\">"
                                                "<img align=\"middle\" src=\"static/viewnotes_24x.gif\" "
                                                "border=\"0\">"
                                                "<span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("View notes")
+                                               "</span></a></li>\n", _("View notes")
                                        );
                                        break;
                                case VIEW_MAILBOX:
                                        wprintf(
-                                               "<td>"
+                                               "<li class=\"readallmess\">"
                                                "<a href=\"readfwd\">"
                                                "<img align=\"middle\" src=\"static/readallmess3_24x.gif\" "
                                                "border=\"0\">"
                                                "<span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("View message list")
+                                               "</span></a></li>\n", _("View message list")
+                                       );
+                                       break;
+                               case VIEW_WIKI:
+                                       wprintf(
+                                               "<li class=\"readallmess\">"
+                                               "<a href=\"readfwd\">"
+                                               "<img align=\"middle\" src=\"static/readallmess3_24x.gif\" "
+                                               "border=\"0\">"
+                                               "<span class=\"navbar_link\">"
+                                               "%s"
+                                               "</span></a></li>\n", _("Wiki home")
                                        );
                                        break;
                                default:
                                        wprintf(
-                                               "<td>"
+                                               "<li class=\"readallmess\">"
                                                "<a href=\"readfwd\">"
                                                "<img align=\"middle\" src=\"static/readallmess3_24x.gif\" "
                                                "border=\"0\">"
                                                "<span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("Read all messages")
+                                               "</span></a></li>\n", _("Read all messages")
                                        );
                                        break;
                        }
@@ -483,88 +633,113 @@ void embed_room_banner(char *got, int navbar_style) {
                        switch(WC->wc_view) {
                                case VIEW_ADDRESSBOOK:
                                        wprintf(
-                                               "<td><a href=\"display_enter\">"
+                                               "<li class=\"addnewcontact\">"
+                                               "<a href=\"display_enter\">"
                                                "<img align=\"middle\" src=\"static/addnewcontact_24x.gif\" "
                                                "border=\"0\"><span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("Add new contact")
+                                               "</span></a></li>\n", _("Add new contact")
                                        );
                                        break;
                                case VIEW_CALENDAR:
-                                       wprintf(
-                                               "<td><a href=\"display_enter\">"
+                               case VIEW_CALBRIEF:
+                                       wprintf("<li class=\"addevent\"><a href=\"display_enter");
+                                       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\">"
                                                "%s"
-                                               "</span></a></td>\n", _("Add new event")
+                                               "</span></a></li>\n", _("Add new event")
                                        );
                                        break;
                                case VIEW_TASKS:
                                        wprintf(
-                                               "<td><a href=\"display_enter\">"
+                                               "<li class=\"newmess\">"
+                                               "<a href=\"display_enter\">"
                                                "<img align=\"middle\" src=\"static/newmess3_24x.gif\" "
                                                "border=\"0\"><span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("Add new task")
+                                               "</span></a></li>\n", _("Add new task")
                                        );
                                        break;
                                case VIEW_NOTES:
                                        wprintf(
-                                               "<td><a href=\"display_enter\">"
+                                               "<li class=\"enternewnote\">"
+                                               "<a href=\"javascript:add_new_note();\">"
                                                "<img align=\"middle\" src=\"static/enternewnote_24x.gif\" "
                                                "border=\"0\"><span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("Add new note")
+                                               "</span></a></li>\n", _("Add new note")
                                        );
                                        break;
                                case VIEW_WIKI:
-                                       /* Don't let users create unlinked pages. */
+                                       safestrncpy(buf, bstr("page"), sizeof buf);
+                                       str_wiki_index(buf);
+                                       wprintf(
+                                               "<li class=\"newmess\">"
+                                               "<a href=\"display_enter?wikipage=%s\">"
+                                               "<img align=\"middle\" src=\"static/newmess3_24x.gif\" "
+                                               "border=\"0\"><span class=\"navbar_link\">"
+                                               "%s"
+                                               "</span></a></li>\n", buf, _("Edit this page")
+                                       );
+                                       break;
+                               case VIEW_MAILBOX:
+                                       wprintf(
+                                               "<li class=\"newmess\">"
+                                               "<a href=\"display_enter\">"
+                                               "<img align=\"middle\" src=\"static/newmess3_24x.gif\" "
+                                               "border=\"0\"><span class=\"navbar_link\">"
+                                               "%s"
+                                               "</span></a></li>\n", _("Write mail")
+                                       );
                                        break;
                                default:
                                        wprintf(
-                                               "<td><a href=\"display_enter\">"
+                                               "<li class=\"newmess\">"
+                                               "<a href=\"display_enter\">"
                                                "<img align=\"middle\" src=\"static/newmess3_24x.gif\" "
                                                "border=\"0\"><span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("Enter a message")
+                                               "</span></a></li>\n", _("Enter a message")
                                        );
                                        break;
                        }
                }
 
                if (navbar_style == navbar_default) wprintf(
-                       "<td>"
+                       "<li class=\"skipthisroom\">"
                        "<a href=\"skip\" "
-                       "TITLE=\"%s\">"
+                       "title=\"%s\">"
                        "<img align=\"middle\" src=\"static/skipthisroom_24x.gif\" border=\"0\">"
                        "<span class=\"navbar_link\">%s</span></a>"
-                       "</td>\n",
+                       "</li>\n",
                        _("Leave all messages marked as unread, go to next room with unread messages"),
                        _("Skip this room")
                );
 
                if (navbar_style == navbar_default) wprintf(
-                       "<td>"
+                       "<li class=\"markngo\">"
                        "<a href=\"gotonext\" "
-                       "TITLE=\"%s\">"
+                       "title=\"%s\">"
                        "<img align=\"middle\" src=\"static/markngo_24x.gif\" border=\"0\">"
                        "<span class=\"navbar_link\">%s</span></a>"
-                       "</td>\n",
+                       "</li>\n",
                        _("Mark all messages as read, go to next room with unread messages"),
                        _("Goto next room")
                );
 
-               wprintf("</tr></table></div>\n");
+               wprintf("</ul></div>\n");
        }
 
 }
 
 
-
-
-
-/*
- * back end routine to take the session to a new room
+/**
+ * \brief back end routine to take the session to a new room
+ * \param gname room to go to
  *
  */
 int gotoroom(char *gname)
@@ -573,11 +748,11 @@ 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;
 
-       /* move to the new room */
+       /** move to the new room */
        serv_printf("GOTO %s", gname);
        serv_getln(buf, sizeof buf);
        if (buf[0] != '2') {
@@ -602,6 +777,7 @@ int gotoroom(char *gname)
        WC->wc_view = extract_int(&buf[4], 11);
        WC->wc_default_view = extract_int(&buf[4], 12);
        WC->wc_is_trash = extract_int(&buf[4], 13);
+       WC->room_flags2 = extract_int(&buf[4], 14);
 
        if (WC->is_aide)
                WC->is_room_aide = WC->is_aide;
@@ -616,9 +792,12 @@ int gotoroom(char *gname)
 }
 
 
-/*
- * Locate the room on the march list which we most want to go to.  Each room
+/**
+ * \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)
 {
@@ -655,7 +834,9 @@ char *pop_march(int desired_floor)
 
 
 
-/* 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.
@@ -664,11 +845,15 @@ char *pop_march(int desired_floor)
  */
 void gotonext(void)
 {
-       char buf[SIZ];
-       struct march *mptr, *mptr2;
+       char buf[256];
+       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.
+       /*
+        * 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.
         */
 
@@ -677,25 +862,37 @@ void gotonext(void)
                serv_getln(buf, sizeof buf);
                if (buf[0] == '1')
                        while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-                               mptr = (struct march *) malloc(sizeof(struct march));
-                               mptr->next = NULL;
-                               extract_token(mptr->march_name, buf, 0, '|', 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 = WC->march;
-                                       while (mptr2->next != NULL)
-                                               mptr2 = mptr2->next;
-                                       mptr2->next = mptr;
+                               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));
+                                       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
- */
+               /*
+                * 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;
@@ -705,10 +902,10 @@ 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
- */
+               /*
               * ...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) {
@@ -722,6 +919,9 @@ void gotonext(void)
 }
 
 
+/*
+ * goto next room
+ */
 void smart_goto(char *next_room) {
        gotoroom(next_room);
        readloop("readnew");
@@ -734,15 +934,10 @@ void smart_goto(char *next_room) {
  */
 void slrp_highest(void)
 {
-       char buf[SIZ];
+       char buf[256];
 
-       /* set pointer */
        serv_puts("SLRP HIGHEST");
        serv_getln(buf, sizeof buf);
-       if (buf[0] != '2') {
-               wprintf("<EM>%s</EM><br />\n", &buf[4]);
-               return;
-       }
 }
 
 
@@ -772,6 +967,16 @@ 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;
 
 
 
@@ -779,8 +984,8 @@ void ungoto(void)
 /*
  * 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.
- * Always returns 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) {
@@ -790,7 +995,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);
@@ -833,6 +1038,64 @@ 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);
+}
+
+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);
+}
+
 
 
 
@@ -844,15 +1107,16 @@ int self_service(int newval) {
 void display_editroom(void)
 {
        char buf[SIZ];
-       char cmd[SIZ];
-       char node[SIZ];
-       char remote_room[SIZ];
-       char recp[SIZ];
+       char cmd[1024];
+       char node[256];
+       char remote_room[128];
+       char recp[1024];
        char er_name[128];
        char er_password[10];
        char er_dirname[15];
        char er_roomaide[26];
        unsigned er_flags;
+       unsigned er_flags2;
        int er_floor;
        int i, j;
        char *tab;
@@ -862,335 +1126,377 @@ void display_editroom(void)
        int roomvalue = 0;
        int floorpolicy = 0;
        int floorvalue = 0;
+       char pop3_host[128];
+       char pop3_user[32];
+       int bg = 0;
 
        tab = bstr("tab");
-       if (strlen(tab) == 0) tab = "admin";
+       if (IsEmptyStr(tab)) tab = "admin";
 
        load_floorlist();
-       serv_puts("GETR");
-       serv_getln(buf, sizeof buf);
-
-       if (buf[0] != '2') {
-               strcpy(WC->ImportantMessage, &buf[4]);
-               display_main_menu();
-               return;
-       }
-       extract_token(er_name, &buf[4], 0, '|', sizeof er_name);
-       extract_token(er_password, &buf[4], 1, '|', sizeof er_password);
-       extract_token(er_dirname, &buf[4], 2, '|', sizeof er_dirname);
-       er_flags = extract_int(&buf[4], 3);
-       er_floor = extract_int(&buf[4], 4);
-
        output_headers(1, 1, 1, 0, 0, 0);
 
-       /* print the tabbed dialog */
-       wprintf("<br />"
-               "<div class=\"fix_scrollbar_bug\">"
-               "<TABLE border=0 cellspacing=0 cellpadding=0 width=100%%>"
-               "<TR ALIGN=CENTER>"
-               "<TD>&nbsp;</TD>\n");
-
-       if (!strcmp(tab, "admin")) {
-               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
-       }
-       else {
-               wprintf("<TD BGCOLOR=\"#CCCCCC\"><a href=\"display_editroom&tab=admin\">");
-       }
-       wprintf(_("Administration"));
-       if (!strcmp(tab, "admin")) {
-               wprintf("</SPAN></TD>\n");
-       }
-       else {
-               wprintf("</A></TD>\n");
-       }
+       wprintf("<div class=\"fix_scrollbar_bug\">");
 
-       wprintf("<TD>&nbsp;</TD>\n");
+       /** print the tabbed dialog */
+       wprintf("<ul class=\"tabbed_dialog\">\n");
 
-       if (!strcmp(tab, "config")) {
-               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
-       }
-       else {
-               wprintf("<TD BGCOLOR=\"#CCCCCC\"><a href=\"display_editroom&tab=config\">");
-       }
-       wprintf(_("Configuration"));
-       if (!strcmp(tab, "config")) {
-               wprintf("</SPAN></TD>\n");
+       wprintf("<li class=\"tablabel ");
+       if (!strcmp(tab, "admin")) {
+               wprintf(" tab_cell_label\">");
+               wprintf(_("Administration"));
        }
        else {
-               wprintf("</A></TD>\n");
+               wprintf("< tab_cell_edit\"><a href=\"display_editroom&tab=admin\">");
+               wprintf(_("Administration"));
+               wprintf("</a>");
        }
+       wprintf("</li>\n");
 
-       wprintf("<TD>&nbsp;</TD>\n");
+       if ( (WC->axlevel >= 6) || (WC->is_room_aide) ) {
 
-       if (!strcmp(tab, "expire")) {
-               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
-       }
-       else {
-               wprintf("<TD BGCOLOR=\"#CCCCCC\"><a href=\"display_editroom&tab=expire\">");
-       }
-       wprintf(_("Message expire policy"));
-       if (!strcmp(tab, "expire")) {
-               wprintf("</SPAN></TD>\n");
-       }
-       else {
-               wprintf("</A></TD>\n");
-       }
+               wprintf("<li class=\"tablabel ");
+               if (!strcmp(tab, "config")) {
+                       wprintf(" tab_cell_label\">");
+                       wprintf(_("Configuration"));
+               }
+               else {
+                       wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=config\">");
+                       wprintf(_("Configuration"));
+                       wprintf("</a>");
+               }
+               wprintf("</li>\n");
 
-       wprintf("<TD>&nbsp;</TD>\n");
+               wprintf("<li class=\"tablabel ");
+               if (!strcmp(tab, "expire")) {
+                       wprintf(" tab_cell_label\">");
+                       wprintf(_("Message expire policy"));
+               }
+               else {
+                       wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=expire\">");
+                       wprintf(_("Message expire policy"));
+                       wprintf("</a>");
+               }
+               wprintf("</li>\n");
+       
+               wprintf("<li class=\"tablabel ");
+               if (!strcmp(tab, "access")) {
+                       wprintf(" tab_cell_label\">");
+                       wprintf(_("Access controls"));
+               }
+               else {
+                       wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=access\">");
+                       wprintf(_("Access controls"));
+                       wprintf("</a>");
+               }
+               wprintf("</li>\n");
 
-       if (!strcmp(tab, "access")) {
-               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
-       }
-       else {
-               wprintf("<TD BGCOLOR=\"#CCCCCC\"><a href=\"display_editroom&tab=access\">");
-       }
-       wprintf(_("Access controls"));
-       if (!strcmp(tab, "access")) {
-               wprintf("</SPAN></TD>\n");
-       }
-       else {
-               wprintf("</A></TD>\n");
-       }
+               wprintf("<li class=\"tablabel ");
+               if (!strcmp(tab, "sharing")) {
+                       wprintf(" tab_cell_label\">");
+                       wprintf(_("Sharing"));
+               }
+               else {
+                       wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=sharing\">");
+                       wprintf(_("Sharing"));
+                       wprintf("</a>");
+               }
+               wprintf("</li>\n");
 
-       wprintf("<TD>&nbsp;</TD>\n");
+               wprintf("<li class=\"tablabel ");
+               if (!strcmp(tab, "listserv")) {
+                       wprintf(" tab_cell_label\">");
+                       wprintf(_("Mailing list service"));
+               }
+               else {
+                       wprintf("< tab_cell_edit\"><a href=\"display_editroom&tab=listserv\">");
+                       wprintf(_("Mailing list service"));
+                       wprintf("</a>");
+               }
+               wprintf("</li>\n");
 
-       if (!strcmp(tab, "sharing")) {
-               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
-       }
-       else {
-               wprintf("<TD BGCOLOR=\"#CCCCCC\"><a href=\"display_editroom&tab=sharing\">");
-       }
-       wprintf(_("Sharing"));
-       if (!strcmp(tab, "sharing")) {
-               wprintf("</SPAN></TD>\n");
-       }
-       else {
-               wprintf("</A></TD>\n");
        }
 
-       wprintf("<TD>&nbsp;</TD>\n");
-
-       if (!strcmp(tab, "listserv")) {
-               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
-       }
-       else {
-               wprintf("<TD BGCOLOR=\"#CCCCCC\"><a href=\"display_editroom&tab=listserv\">");
-       }
-       wprintf(_("Mailing list service"));
-       if (!strcmp(tab, "listserv")) {
-               wprintf("</SPAN></TD>\n");
+       wprintf("<li class=\"tablabel ");
+       if (!strcmp(tab, "feeds")) {
+               wprintf(" tab_cell_label\">");
+               wprintf(_("Remote retrieval"));
        }
        else {
-               wprintf("</A></TD>\n");
+               wprintf("< tab_cell_edit\"><a href=\"display_editroom&tab=feeds\">");
+               wprintf(_("Remote retrieval"));
+               wprintf("</a>");
        }
+       wprintf("</li>\n");
 
-       wprintf("<TD>&nbsp;</TD>\n");
-
-       wprintf("</TR></TABLE></div>\n");
+       wprintf("</ul>\n");
        /* end tabbed dialog */ 
 
        /* begin content of whatever tab is open now */
-       wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<TABLE border=0 width=100%% bgcolor=\"#FFFFFF\">\n"
-               "<TR><TD>\n");
 
        if (!strcmp(tab, "admin")) {
-               wprintf("<UL>"
-                       "<LI><a href=\"delete_room\" "
+               wprintf("<div class=\"tabcontent\">");
+               wprintf("<ul>"
+                       "<li><a href=\"delete_room\" "
                        "onClick=\"return confirm('");
                wprintf(_("Are you sure you want to delete this room?"));
                wprintf("');\">\n");
                wprintf(_("Delete this room"));
-               wprintf("</A>\n"
-                       "<LI><a href=\"display_editroompic\">\n");
+               wprintf("</a>\n"
+                       "<li><a href=\"display_editroompic\">\n");
                wprintf(_("Set or change the icon for this room's banner"));
-               wprintf("</A>\n"
-                       "<LI><a href=\"display_editinfo\">\n");
+               wprintf("</a>\n"
+                       "<li><a href=\"display_editinfo\">\n");
                wprintf(_("Edit this room's Info file"));
-               wprintf("</A>\n"
-                       "</UL>");
+               wprintf("</a>\n"
+                       "</ul>");
+               wprintf("</div>");
        }
 
        if (!strcmp(tab, "config")) {
-               wprintf("<FORM METHOD=\"POST\" action=\"editroom\">\n");
-       
-               wprintf("<UL><LI>");
-               wprintf(_("Name of room: "));
-               wprintf("<INPUT TYPE=\"text\" NAME=\"er_name\" VALUE=\"%s\" MAXLENGTH=\"%d\">\n",
-                       er_name,
-                       (sizeof(er_name)-1)
-               );
-       
-               wprintf("<LI>");
-               wprintf(_("Resides on floor: "));
-               wprintf("<SELECT NAME=\"er_floor\" SIZE=\"1\">\n");
-               for (i = 0; i < 128; ++i)
-                       if (strlen(floorlist[i]) > 0) {
-                               wprintf("<OPTION ");
-                               if (i == er_floor)
-                                       wprintf("SELECTED ");
-                               wprintf("VALUE=\"%d\">", i);
-                               escputs(floorlist[i]);
-                               wprintf("</OPTION>\n");
-                       }
-               wprintf("</SELECT>\n");
-       
-               wprintf("<LI>");
-               wprintf(_("Type of room:"));
-               wprintf("<UL>\n");
-
-               wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"public\" ");
-               if ((er_flags & QR_PRIVATE) == 0)
-               wprintf("CHECKED ");
-               wprintf("> ");
-               wprintf(_("Public room"));
-               wprintf("\n");
-
-               wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"hidden\" ");
-               if ((er_flags & QR_PRIVATE) &&
-                   (er_flags & QR_GUESSNAME))
-                       wprintf("CHECKED ");
-               wprintf("> ");
-               wprintf(_("Private - guess name"));
-       
-               wprintf("\n<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"passworded\" ");
-               if ((er_flags & QR_PRIVATE) &&
-                   (er_flags & QR_PASSWORDED))
-                       wprintf("CHECKED ");
-               wprintf("> ");
-               wprintf(_("Private - require password:"));
-               wprintf("\n<INPUT TYPE=\"text\" NAME=\"er_password\" VALUE=\"%s\" MAXLENGTH=\"9\">\n",
-                       er_password);
-       
-               wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"invonly\" ");
-               if ((er_flags & QR_PRIVATE)
-                   && ((er_flags & QR_GUESSNAME) == 0)
-                   && ((er_flags & QR_PASSWORDED) == 0))
-                       wprintf("CHECKED ");
-               wprintf("> ");
-               wprintf(_("Private - invitation only"));
-       
-               wprintf("\n<LI><INPUT TYPE=\"checkbox\" NAME=\"bump\" VALUE=\"yes\" ");
-               wprintf("> ");
-               wprintf(_("If private, cause current users to forget room"));
-       
-               wprintf("\n</UL>\n");
-       
-               wprintf("<LI><INPUT TYPE=\"checkbox\" NAME=\"prefonly\" VALUE=\"yes\" ");
-               if (er_flags & QR_PREFONLY)
-                       wprintf("CHECKED ");
-               wprintf("> ");
-               wprintf(_("Preferred users only"));
-       
-               wprintf("\n<LI><INPUT TYPE=\"checkbox\" NAME=\"readonly\" VALUE=\"yes\" ");
-               if (er_flags & QR_READONLY)
-                       wprintf("CHECKED ");
-               wprintf("> ");
-               wprintf(_("Read-only room"));
-       
-       /* directory stuff */
-               wprintf("\n<LI><INPUT TYPE=\"checkbox\" NAME=\"directory\" VALUE=\"yes\" ");
-               if (er_flags & QR_DIRECTORY)
-                       wprintf("CHECKED ");
-               wprintf("> ");
-               wprintf(_("File directory room"));
+               wprintf("<div class=\"tabcontent\">");
+               serv_puts("GETR");
+               serv_getln(buf, sizeof buf);
 
-               wprintf("\n<UL><LI>");
-               wprintf(_("Directory name: "));
-               wprintf("<INPUT TYPE=\"text\" NAME=\"er_dirname\" VALUE=\"%s\" MAXLENGTH=\"14\">\n",
-                       er_dirname);
+               if (!strncmp(buf, "550", 3)) {
+                       wprintf("<br><br><div align=center>%s</div><br><br>\n",
+                               _("Higher access is required to access this function.")
+                       );
+               }
+               else if (buf[0] != '2') {
+                       wprintf("<br><br><div align=center>%s</div><br><br>\n", &buf[4]);
+               }
+               else {
+                       extract_token(er_name, &buf[4], 0, '|', sizeof er_name);
+                       extract_token(er_password, &buf[4], 1, '|', sizeof er_password);
+                       extract_token(er_dirname, &buf[4], 2, '|', sizeof er_dirname);
+                       er_flags = extract_int(&buf[4], 3);
+                       er_floor = extract_int(&buf[4], 4);
+                       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("<ul><li>");
+                       wprintf(_("Name of room: "));
+                       wprintf("<input type=\"text\" NAME=\"er_name\" VALUE=\"%s\" MAXLENGTH=\"%d\">\n",
+                               er_name,
+                               (sizeof(er_name)-1)
+                       );
+               
+                       wprintf("<li>");
+                       wprintf(_("Resides on floor: "));
+                       wprintf("<select NAME=\"er_floor\" SIZE=\"1\"");
+                       if (er_flags & QR_MAILBOX)
+                               wprintf("disabled >\n");
+                       for (i = 0; i < 128; ++i)
+                               if (!IsEmptyStr(floorlist[i])) {
+                                       wprintf("<OPTION ");
+                                       if (i == er_floor )
+                                               wprintf("SELECTED ");
+                                       wprintf("VALUE=\"%d\">", i);
+                                       escputs(floorlist[i]);
+                                       wprintf("</OPTION>\n");
+                               }
+                       wprintf("</select>\n");
 
-               wprintf("<LI><INPUT TYPE=\"checkbox\" NAME=\"ulallowed\" VALUE=\"yes\" ");
-               if (er_flags & QR_UPLOAD)
-                       wprintf("CHECKED ");
-               wprintf("> ");
-               wprintf(_("Uploading allowed"));
+                       wprintf("<li>");
+                       wprintf(_("Type of room:"));
+                       wprintf("<ul>\n");
        
-               wprintf("\n<LI><INPUT TYPE=\"checkbox\" NAME=\"dlallowed\" VALUE=\"yes\" ");
-               if (er_flags & QR_DOWNLOAD)
-                       wprintf("CHECKED ");
-               wprintf("> ");
-               wprintf(_("Downloading allowed"));
+                       wprintf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"public\" ");
+                       if ((er_flags & (QR_PRIVATE + QR_MAILBOX)) == 0)
+                               wprintf("CHECKED ");
+                       wprintf("OnChange=\""
+                               "       if (this.form.type[0].checked == true) {        "
+                               "               this.form.er_floor.disabled = false;    "
+                               "       }                                               "
+                               "\"> ");
+                       wprintf(_("Public (automatically appears to everyone)"));
+                       wprintf("\n");
        
-               wprintf("\n<LI><INPUT TYPE=\"checkbox\" NAME=\"visdir\" VALUE=\"yes\" ");
-               if (er_flags & QR_VISDIR)
-                       wprintf("CHECKED ");
-               wprintf("> ");
-               wprintf(_("Visible directory"));
-               wprintf("</UL>\n");
+                       wprintf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"hidden\" ");
+                       if ((er_flags & QR_PRIVATE) &&
+                       (er_flags & QR_GUESSNAME))
+                               wprintf("CHECKED ");
+                       wprintf(" OnChange=\""
+                               "       if (this.form.type[1].checked == true) {        "
+                               "               this.form.er_floor.disabled = false;    "
+                               "       }                                               "
+                               "\"> ");
+                       wprintf(_("Private - hidden (accessible to anyone who knows its name)"));
+               
+                       wprintf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"passworded\" ");
+                       if ((er_flags & QR_PRIVATE) &&
+                       (er_flags & QR_PASSWORDED))
+                               wprintf("CHECKED ");
+                       wprintf(" OnChange=\""
+                               "       if (this.form.type[2].checked == true) {        "
+                               "               this.form.er_floor.disabled = false;    "
+                               "       }                                               "
+                               "\"> ");
+                       wprintf(_("Private - require password: "));
+                       wprintf("\n<input type=\"text\" NAME=\"er_password\" VALUE=\"%s\" MAXLENGTH=\"9\">\n",
+                               er_password);
+               
+                       wprintf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"invonly\" ");
+                       if ((er_flags & QR_PRIVATE)
+                       && ((er_flags & QR_GUESSNAME) == 0)
+                       && ((er_flags & QR_PASSWORDED) == 0))
+                               wprintf("CHECKED ");
+                       wprintf(" OnChange=\""
+                               "       if (this.form.type[3].checked == true) {        "
+                               "               this.form.er_floor.disabled = false;    "
+                               "       }                                               "
+                               "\"> ");
+                       wprintf(_("Private - invitation only"));
+               
+                       wprintf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"personal\" ");
+                       if (er_flags & QR_MAILBOX)
+                               wprintf("CHECKED ");
+                       wprintf (" OnChange=\""
+                               "       if (this.form.type[4].checked == true) {        "
+                               "               this.form.er_floor.disabled = true;     "
+                               "       }                                               "
+                               "\"> ");
+                       wprintf(_("Personal (mailbox for you only)"));
+                       
+                       wprintf("\n<li><input type=\"checkbox\" NAME=\"bump\" VALUE=\"yes\" ");
+                       wprintf("> ");
+                       wprintf(_("If private, cause current users to forget room"));
+               
+                       wprintf("\n</ul>\n");
+               
+                       wprintf("<li><input type=\"checkbox\" NAME=\"prefonly\" VALUE=\"yes\" ");
+                       if (er_flags & QR_PREFONLY)
+                               wprintf("CHECKED ");
+                       wprintf("> ");
+                       wprintf(_("Preferred users only"));
+               
+                       wprintf("\n<li><input type=\"checkbox\" NAME=\"readonly\" VALUE=\"yes\" ");
+                       if (er_flags & QR_READONLY)
+                               wprintf("CHECKED ");
+                       wprintf("> ");
+                       wprintf(_("Read-only room"));
+               
+                       wprintf("\n<li><input type=\"checkbox\" NAME=\"collabdel\" VALUE=\"yes\" ");
+                       if (er_flags2 & QR2_COLLABDEL)
+                               wprintf("CHECKED ");
+                       wprintf("> ");
+                       wprintf(_("All users allowed to post may also delete messages"));
+               
+                       /** directory stuff */
+                       wprintf("\n<li><input type=\"checkbox\" NAME=\"directory\" VALUE=\"yes\" ");
+                       if (er_flags & QR_DIRECTORY)
+                               wprintf("CHECKED ");
+                       wprintf("> ");
+                       wprintf(_("File directory room"));
        
-       /* end of directory stuff */
+                       wprintf("\n<ul><li>");
+                       wprintf(_("Directory name: "));
+                       wprintf("<input type=\"text\" NAME=\"er_dirname\" VALUE=\"%s\" MAXLENGTH=\"14\">\n",
+                               er_dirname);
        
-               wprintf("<LI><INPUT TYPE=\"checkbox\" NAME=\"network\" VALUE=\"yes\" ");
-               if (er_flags & QR_NETWORK)
-                       wprintf("CHECKED ");
-               wprintf("> ");
-               wprintf(_("Network shared room"));
-
-               wprintf("\n<LI><INPUT TYPE=\"checkbox\" NAME=\"permanent\" VALUE=\"yes\" ");
-               if (er_flags & QR_PERMANENT)
+                       wprintf("<li><input type=\"checkbox\" NAME=\"ulallowed\" VALUE=\"yes\" ");
+                       if (er_flags & QR_UPLOAD)
                        wprintf("CHECKED ");
-               wprintf("> ");
-               wprintf(_("Permanent (does not auto-purge)"));
-
-       /* start of anon options */
-       
-               wprintf("\n<LI>");
-               wprintf(_("Anonymous messages"));
-               wprintf("<UL>\n");
+                       wprintf("> ");
+                       wprintf(_("Uploading allowed"));
+               
+                       wprintf("\n<li><input type=\"checkbox\" NAME=\"dlallowed\" VALUE=\"yes\" ");
+                       if (er_flags & QR_DOWNLOAD)
+                               wprintf("CHECKED ");
+                       wprintf("> ");
+                       wprintf(_("Downloading allowed"));
+               
+                       wprintf("\n<li><input type=\"checkbox\" NAME=\"visdir\" VALUE=\"yes\" ");
+                       if (er_flags & QR_VISDIR)
+                               wprintf("CHECKED ");
+                       wprintf("> ");
+                       wprintf(_("Visible directory"));
+                       wprintf("</ul>\n");
+               
+                       /** end of directory stuff */
        
-               wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"anon\" VALUE=\"no\" ");
-               if (((er_flags & QR_ANONONLY) == 0)
-                   && ((er_flags & QR_ANONOPT) == 0))
-                       wprintf("CHECKED ");
-               wprintf("> ");
-               wprintf(_("No anonymous messages"));
+                       wprintf("<li><input type=\"checkbox\" NAME=\"network\" VALUE=\"yes\" ");
+                       if (er_flags & QR_NETWORK)
+                               wprintf("CHECKED ");
+                       wprintf("> ");
+                       wprintf(_("Network shared room"));
        
-               wprintf("\n<LI><INPUT TYPE=\"radio\" NAME=\"anon\" VALUE=\"anononly\" ");
-               if (er_flags & QR_ANONONLY)
-                       wprintf("CHECKED ");
-               wprintf("> ");
-               wprintf(_("All messages are anonymous"));
+                       wprintf("\n<li><input type=\"checkbox\" NAME=\"permanent\" VALUE=\"yes\" ");
+                       if (er_flags & QR_PERMANENT)
+                               wprintf("CHECKED ");
+                       wprintf("> ");
+                       wprintf(_("Permanent (does not auto-purge)"));
        
-               wprintf("\n<LI><INPUT TYPE=\"radio\" NAME=\"anon\" VALUE=\"anon2\" ");
-               if (er_flags & QR_ANONOPT)
-                       wprintf("CHECKED ");
-               wprintf("> ");
-               wprintf(_("Prompt user when entering messages"));
-               wprintf("</UL>\n");
+                       wprintf("\n<li><input type=\"checkbox\" NAME=\"subjectreq\" VALUE=\"yes\" ");
+                       if (er_flags2 & QR2_SUBJECTREQ)
+                               wprintf("CHECKED ");
+                       wprintf("> ");
+                       wprintf(_("Subject Required (Force users to specify a message subject)"));
        
-       /* end of anon options */
+                       /** start of anon options */
+               
+                       wprintf("\n<li>");
+                       wprintf(_("Anonymous messages"));
+                       wprintf("<ul>\n");
+               
+                       wprintf("<li><input type=\"radio\" NAME=\"anon\" VALUE=\"no\" ");
+                       if (((er_flags & QR_ANONONLY) == 0)
+                       && ((er_flags & QR_ANONOPT) == 0))
+                               wprintf("CHECKED ");
+                       wprintf("> ");
+                       wprintf(_("No anonymous messages"));
        
-               wprintf("<LI>");
-               wprintf(_("Room aide: "));
-               serv_puts("GETA");
-               serv_getln(buf, sizeof buf);
-               if (buf[0] != '2') {
-                       wprintf("<EM>%s</EM>\n", &buf[4]);
-               } else {
-                       extract_token(er_roomaide, &buf[4], 0, '|', sizeof er_roomaide);
-                       wprintf("<INPUT TYPE=\"text\" NAME=\"er_roomaide\" VALUE=\"%s\" MAXLENGTH=\"25\">\n", er_roomaide);
+                       wprintf("\n<li><input type=\"radio\" NAME=\"anon\" VALUE=\"anononly\" ");
+                       if (er_flags & QR_ANONONLY)
+                               wprintf("CHECKED ");
+                       wprintf("> ");
+                       wprintf(_("All messages are anonymous"));
+               
+                       wprintf("\n<li><input type=\"radio\" NAME=\"anon\" VALUE=\"anon2\" ");
+                       if (er_flags & QR_ANONOPT)
+                               wprintf("CHECKED ");
+                       wprintf("> ");
+                       wprintf(_("Prompt user when entering messages"));
+                       wprintf("</ul>\n");
+               
+               /* end of anon options */
+               
+                       wprintf("<li>");
+                       wprintf(_("Room aide: "));
+                       serv_puts("GETA");
+                       serv_getln(buf, sizeof buf);
+                       if (buf[0] != '2') {
+                               wprintf("<em>%s</em>\n", &buf[4]);
+                       } else {
+                               extract_token(er_roomaide, &buf[4], 0, '|', sizeof er_roomaide);
+                               wprintf("<input type=\"text\" NAME=\"er_roomaide\" VALUE=\"%s\" MAXLENGTH=\"25\">\n", er_roomaide);
+                       }
+               
+                       wprintf("</ul><CENTER>\n");
+                       wprintf("<input type=\"hidden\" NAME=\"tab\" VALUE=\"config\">\n"
+                               "<input type=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">"
+                               "&nbsp;"
+                               "<input type=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">"
+                               "</CENTER>\n",
+                               _("Save changes"),
+                               _("Cancel")
+                       );
                }
-       
-               wprintf("</UL><CENTER>\n");
-               wprintf("<INPUT TYPE=\"hidden\" NAME=\"tab\" VALUE=\"config\">\n"
-                       "<INPUT TYPE=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">"
-                       "&nbsp;"
-                       "<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">"
-                       "</CENTER>\n",
-                       _("Save changes"),
-                       _("Cancel")
-               );
+               wprintf("</div>");
        }
 
 
        /* Sharing the room with other Citadel nodes... */
        if (!strcmp(tab, "sharing")) {
+               wprintf("<div class=\"tabcontent\">");
 
                shared_with = strdup("");
                not_shared_with = strdup("");
 
-               /* Learn the current configuration */
+               /** Learn the current configuration */
                serv_puts("CONF getsys|application/x-citadel-ignet-config");
                serv_getln(buf, sizeof buf);
                if (buf[0]=='1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
@@ -1211,7 +1517,7 @@ void display_editroom(void)
                                shared_with = realloc(shared_with,
                                                strlen(shared_with) + 32);
                                strcat(shared_with, node);
-                               if (strlen(remote_room) > 0) {
+                               if (!IsEmptyStr(remote_room)) {
                                        strcat(shared_with, "|");
                                        strcat(shared_with, remote_room);
                                }
@@ -1232,119 +1538,120 @@ void display_editroom(void)
 
                /* Display the stuff */
                wprintf("<CENTER><br />"
-                       "<TABLE border=1 cellpadding=5><TR>"
-                       "<TD><B><I>");
+                       "<table border=1 cellpadding=5><tr>"
+                       "<td><B><I>");
                wprintf(_("Shared with"));
-               wprintf("</I></B></TD>"
-                       "<TD><B><I>");
+               wprintf("</I></B></td>"
+                       "<td><B><I>");
                wprintf(_("Not shared with"));
-               wprintf("</I></B></TD></TR>\n"
-                       "<TR><TD VALIGN=TOP>\n");
+               wprintf("</I></B></td></tr>\n"
+                       "<tr><td VALIGN=TOP>\n");
 
-               wprintf("<TABLE border=0 cellpadding=5><TR BGCOLOR=\"#CCCCCC\"><TD>");
+               wprintf("<table border=0 cellpadding=5><tr class=\"tab_cell\"><td>");
                wprintf(_("Remote node name"));
-               wprintf("</TD><TD>");
+               wprintf("</td><td>");
                wprintf(_("Remote room name"));
-               wprintf("</TD><TD>");
+               wprintf("</td><td>");
                wprintf(_("Actions"));
-               wprintf("</TD></TR>\n");
+               wprintf("</td></tr>\n");
 
                for (i=0; i<num_tokens(shared_with, '\n'); ++i) {
                        extract_token(buf, shared_with, i, '\n', sizeof buf);
                        extract_token(node, buf, 0, '|', sizeof node);
                        extract_token(remote_room, buf, 1, '|', sizeof remote_room);
-                       if (strlen(node) > 0) {
-                               wprintf("<FORM METHOD=\"POST\" "
-                                       "action=\"netedit\">"
-                                       "<TR><TD>%s</TD>\n", node);
+                       if (!IsEmptyStr(node)) {
+                               wprintf("<form method=\"POST\" action=\"netedit\">");
+                               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+                               wprintf("<tr><td>%s</td>\n", node);
 
-                               wprintf("<TD>");
-                               if (strlen(remote_room) > 0) {
+                               wprintf("<td>");
+                               if (!IsEmptyStr(remote_room)) {
                                        escputs(remote_room);
                                }
-                               wprintf("</TD>");
+                               wprintf("</td>");
 
-                               wprintf("<TD>");
+                               wprintf("<td>");
                
-                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"line\" "
+                               wprintf("<input type=\"hidden\" NAME=\"line\" "
                                        "VALUE=\"ignet_push_share|");
                                urlescputs(node);
-                               if (strlen(remote_room) > 0) {
+                               if (!IsEmptyStr(remote_room)) {
                                        wprintf("|");
                                        urlescputs(remote_room);
                                }
                                wprintf("\">");
-                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"tab\" "
-                                       "VALUE=\"sharing\">\n");
-                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"cmd\" "
-                                       "VALUE=\"remove\">\n");
-                               wprintf("<INPUT TYPE=\"submit\" "
+                               wprintf("<input type=\"hidden\" NAME=\"tab\" VALUE=\"sharing\">\n");
+                               wprintf("<input type=\"hidden\" NAME=\"cmd\" VALUE=\"remove\">\n");
+                               wprintf("<input type=\"submit\" "
                                        "NAME=\"unshare_button\" VALUE=\"%s\">", _("Unshare"));
-                               wprintf("</TD></TR></FORM>\n");
+                               wprintf("</td></tr></form>\n");
                        }
                }
 
-               wprintf("</TABLE>\n");
-               wprintf("</TD><TD VALIGN=TOP>\n");
-               wprintf("<TABLE border=0 cellpadding=5><TR BGCOLOR=\"#CCCCCC\"><TD>");
+               wprintf("</table>\n");
+               wprintf("</td><td VALIGN=TOP>\n");
+               wprintf("<table border=0 cellpadding=5><tr class=\"tab_cell\"><td>");
                wprintf(_("Remote node name"));
-               wprintf("</TD><TD>");
+               wprintf("</td><td>");
                wprintf(_("Remote room name"));
-               wprintf("</TD><TD>");
+               wprintf("</td><td>");
                wprintf(_("Actions"));
-               wprintf("</TD></TR>\n");
+               wprintf("</td></tr>\n");
 
                for (i=0; i<num_tokens(not_shared_with, '\n'); ++i) {
                        extract_token(node, not_shared_with, i, '\n', sizeof node);
-                       if (strlen(node) > 0) {
-                               wprintf("<FORM METHOD=\"POST\" "
-                                       "action=\"netedit\">"
-                                       "<TR><TD>");
+                       if (!IsEmptyStr(node)) {
+                               wprintf("<form method=\"POST\" action=\"netedit\">");
+                               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+                               wprintf("<tr><td>");
                                escputs(node);
-                               wprintf("</TD><TD>"
-                                       "<INPUT TYPE=\"INPUT\" "
+                               wprintf("</td><td>"
+                                       "<input type=\"INPUT\" "
                                        "NAME=\"suffix\" "
                                        "MAXLENGTH=128>"
-                                       "</TD><TD>");
-                               wprintf("<INPUT TYPE=\"hidden\" "
+                                       "</td><td>");
+                               wprintf("<input type=\"hidden\" "
                                        "NAME=\"line\" "
                                        "VALUE=\"ignet_push_share|");
                                urlescputs(node);
                                wprintf("|\">");
-                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"tab\" "
+                               wprintf("<input type=\"hidden\" NAME=\"tab\" "
                                        "VALUE=\"sharing\">\n");
-                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"cmd\" "
+                               wprintf("<input type=\"hidden\" NAME=\"cmd\" "
                                        "VALUE=\"add\">\n");
-                               wprintf("<INPUT TYPE=\"submit\" "
+                               wprintf("<input type=\"submit\" "
                                        "NAME=\"add_button\" VALUE=\"%s\">", _("Share"));
-                               wprintf("</TD></TR></FORM>\n");
+                               wprintf("</td></tr></form>\n");
                        }
                }
 
-               wprintf("</TABLE>\n");
-               wprintf("</TD></TR>"
-                       "</TABLE></CENTER><br />\n"
-                       "<I><B>%s</B><UL><LI>", _("Notes:"));
+               wprintf("</table>\n");
+               wprintf("</td></tr>"
+                       "</table></CENTER><br />\n"
+                       "<I><B>%s</B><ul><li>", _("Notes:"));
                wprintf(_("When sharing a room, "
                        "it must be shared from both ends.  Adding a node to "
                        "the 'shared' list sends messages out, but in order to"
                        " receive messages, the other nodes must be configured"
                        " to send messages out to your system as well. "
-                       "<LI>If the remote room name is blank, it is assumed "
+                       "<li>If the remote room name is blank, it is assumed "
                        "that the room name is identical on the remote node."
-                       "<LI>If the remote room name is different, the remote "
+                       "<li>If the remote room name is different, the remote "
                        "node must also configure the name of the room here."
-                       "</UL></I><br />\n"
+                       "</ul></I><br />\n"
                ));
 
+               wprintf("</div>");
        }
 
        /* Mailing list management */
        if (!strcmp(tab, "listserv")) {
+               room_states RoomFlags;
+               wprintf("<div class=\"tabcontent\">");
 
                wprintf("<br /><center>"
-                       "<TABLE BORDER=0 WIDTH=100%% CELLPADDING=5>"
-                       "<TR><TD VALIGN=TOP>");
+                       "<table BORDER=0 WIDTH=100%% CELLPADDING=5>"
+                       "<tr><td VALIGN=TOP>");
 
                wprintf(_("<i>The contents of this room are being "
                        "mailed <b>as individual messages</b> "
@@ -1359,22 +1666,22 @@ void display_editroom(void)
                                extract_token(recp, buf, 1, '|', sizeof recp);
                        
                                escputs(recp);
-                               wprintf(" <a href=\"netedit&cmd=remove&line="
-                                       "listrecp|");
+                               wprintf(" <a href=\"netedit&cmd=remove&tab=listserv&line=listrecp|");
                                urlescputs(recp);
-                               wprintf("&tab=listserv\">");
+                               wprintf("\">");
                                wprintf(_("(remove)"));
                                wprintf("</A><br />");
                        }
                }
-               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=\"text\" NAME=\"line\">\n");
-               wprintf("<INPUT TYPE=\"submit\" NAME=\"add_button\" VALUE=\"%s\">", _("Add"));
-               wprintf("</FORM>\n");
-
-               wprintf("</TD><TD VALIGN=TOP>\n");
+               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=\"text\" id=\"add_as_listrecp\" NAME=\"line\">\n");
+               wprintf("<input type=\"submit\" NAME=\"add_button\" VALUE=\"%s\">", _("Add"));
+               wprintf("</form>\n");
+
+               wprintf("</td><td VALIGN=TOP>\n");
                
                wprintf(_("<i>The contents of this room are being "
                        "mailed <b>in digest form</b> "
@@ -1389,142 +1696,329 @@ void display_editroom(void)
                                extract_token(recp, buf, 1, '|', sizeof recp);
                        
                                escputs(recp);
-                               wprintf(" <a href=\"netedit&cmd=remove&line="
+                               wprintf(" <a href=\"netedit&cmd=remove&tab=listserv&line="
                                        "digestrecp|");
                                urlescputs(recp);
-                               wprintf("&tab=listserv\">");
+                               wprintf("\">");
                                wprintf(_("(remove)"));
                                wprintf("</A><br />");
                        }
                }
-               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=\"text\" NAME=\"line\">\n");
-               wprintf("<INPUT TYPE=\"submit\" NAME=\"add_button\" VALUE=\"%s\">", _("Add"));
-               wprintf("</FORM>\n");
+               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=\"text\" id=\"add_as_digestrecp\" NAME=\"line\">\n");
+               wprintf("<input type=\"submit\" NAME=\"add_button\" VALUE=\"%s\">", _("Add"));
+               wprintf("</form>\n");
                
-               wprintf("</TD></TR></TABLE><hr />\n");
-
-               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");
-               }
+               wprintf("</td></tr></table>\n");
+
+               /** Pop open an address book -- begin **/
+               wprintf("<div align=right>"
+                       "<a href=\"javascript:PopOpenAddressBook('add_as_listrecp|%s|add_as_digestrecp|%s');\" "
+                       "title=\"%s\">"
+                       "<img align=middle border=0 width=24 height=24 src=\"static/viewcontacts_24x.gif\">"
+                       "&nbsp;%s</a>"
+                       "</div>",
+                       _("List"),
+                       _("Digest"),
+                       _("Add recipients from Contacts or other address books"),
+                       _("Add recipients from Contacts or other address books")
+               );
+               /* 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>");
        }
 
 
-       /* Mailing list management */
+       /* Configuration of The Dreaded Auto-Purger */
        if (!strcmp(tab, "expire")) {
+               wprintf("<div class=\"tabcontent\">");
 
                serv_puts("GPEX room");
                serv_getln(buf, sizeof buf);
-               if (buf[0] == '2') {
-                       roompolicy = extract_int(&buf[4], 0);
-                       roomvalue = extract_int(&buf[4], 1);
+               if (!strncmp(buf, "550", 3)) {
+                       wprintf("<br><br><div align=center>%s</div><br><br>\n",
+                               _("Higher access is required to access this function.")
+                       );
                }
-               
-               serv_puts("GPEX floor");
-               serv_getln(buf, sizeof buf);
-               if (buf[0] == '2') {
-                       floorpolicy = extract_int(&buf[4], 0);
-                       floorvalue = extract_int(&buf[4], 1);
+               else if (buf[0] != '2') {
+                       wprintf("<br><br><div align=center>%s</div><br><br>\n", &buf[4]);
                }
+               else {
+                       roompolicy = extract_int(&buf[4], 0);
+                       roomvalue = extract_int(&buf[4], 1);
                
-               wprintf("<br /><FORM METHOD=\"POST\" action=\"set_room_policy\">\n");
-               wprintf("<TABLE border=0 cellspacing=5>\n");
-               wprintf("<TR><TD>");
-               wprintf(_("Message expire policy for this room"));
-               wprintf("<br />(");
-               escputs(WC->wc_roomname);
-               wprintf(")</TD><TD>");
-               wprintf("<INPUT TYPE=\"radio\" NAME=\"roompolicy\" VALUE=\"0\" %s>",
-                       ((roompolicy == 0) ? "CHECKED" : "") );
-               wprintf(_("Use the default policy for this floor"));
-               wprintf("<br />\n");
-               wprintf("<INPUT TYPE=\"radio\" NAME=\"roompolicy\" VALUE=\"1\" %s>",
-                       ((roompolicy == 1) ? "CHECKED" : "") );
-               wprintf(_("Never automatically expire messages"));
-               wprintf("<br />\n");
-               wprintf("<INPUT TYPE=\"radio\" NAME=\"roompolicy\" VALUE=\"2\" %s>",
-                       ((roompolicy == 2) ? "CHECKED" : "") );
-               wprintf(_("Expire by message count"));
-               wprintf("<br />\n");
-               wprintf("<INPUT TYPE=\"radio\" NAME=\"roompolicy\" VALUE=\"3\" %s>",
-                       ((roompolicy == 3) ? "CHECKED" : "") );
-               wprintf(_("Expire by message age"));
-               wprintf("<br />");
-               wprintf(_("Number of messages or days: "));
-               wprintf("<INPUT TYPE=\"text\" NAME=\"roomvalue\" MAXLENGTH=\"5\" VALUE=\"%d\">", roomvalue);
-               wprintf("</TD></TR>\n");
-
-               if (WC->axlevel >= 6) {
-                       wprintf("<TR><TD COLSPAN=2><hr /></TD></TR>\n");
-                       wprintf("<TR><TD>");
-                       wprintf(_("Message expire policy for this floor"));
+                       serv_puts("GPEX floor");
+                       serv_getln(buf, sizeof buf);
+                       if (buf[0] == '2') {
+                               floorpolicy = extract_int(&buf[4], 0);
+                               floorvalue = extract_int(&buf[4], 1);
+                       }
+                       
+                       wprintf("<br /><form method=\"POST\" action=\"set_room_policy\">\n");
+                       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+                       wprintf("<table border=0 cellspacing=5>\n");
+                       wprintf("<tr><td>");
+                       wprintf(_("Message expire policy for this room"));
                        wprintf("<br />(");
-                       escputs(floorlist[WC->wc_floor]);
-                       wprintf(")</TD><TD>");
-                       wprintf("<INPUT TYPE=\"radio\" NAME=\"floorpolicy\" VALUE=\"0\" %s>",
-                               ((floorpolicy == 0) ? "CHECKED" : "") );
-                       wprintf(_("Use the system default"));
+                       escputs(WC->wc_roomname);
+                       wprintf(")</td><td>");
+                       wprintf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"0\" %s>",
+                               ((roompolicy == 0) ? "CHECKED" : "") );
+                       wprintf(_("Use the default policy for this floor"));
                        wprintf("<br />\n");
-                       wprintf("<INPUT TYPE=\"radio\" NAME=\"floorpolicy\" VALUE=\"1\" %s>",
-                               ((floorpolicy == 1) ? "CHECKED" : "") );
+                       wprintf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"1\" %s>",
+                               ((roompolicy == 1) ? "CHECKED" : "") );
                        wprintf(_("Never automatically expire messages"));
                        wprintf("<br />\n");
-                       wprintf("<INPUT TYPE=\"radio\" NAME=\"floorpolicy\" VALUE=\"2\" %s>",
-                               ((floorpolicy == 2) ? "CHECKED" : "") );
+                       wprintf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"2\" %s>",
+                               ((roompolicy == 2) ? "CHECKED" : "") );
                        wprintf(_("Expire by message count"));
                        wprintf("<br />\n");
-                       wprintf("<INPUT TYPE=\"radio\" NAME=\"floorpolicy\" VALUE=\"3\" %s>",
-                               ((floorpolicy == 3) ? "CHECKED" : "") );
+                       wprintf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"3\" %s>",
+                               ((roompolicy == 3) ? "CHECKED" : "") );
                        wprintf(_("Expire by message age"));
                        wprintf("<br />");
                        wprintf(_("Number of messages or days: "));
-                       wprintf("<INPUT TYPE=\"text\" NAME=\"floorvalue\" MAXLENGTH=\"5\" VALUE=\"%d\">",
-                               floorvalue);
+                       wprintf("<input type=\"text\" NAME=\"roomvalue\" MAXLENGTH=\"5\" VALUE=\"%d\">", roomvalue);
+                       wprintf("</td></tr>\n");
+       
+                       if (WC->axlevel >= 6) {
+                               wprintf("<tr><td COLSPAN=2><hr /></td></tr>\n");
+                               wprintf("<tr><td>");
+                               wprintf(_("Message expire policy for this floor"));
+                               wprintf("<br />(");
+                               escputs(floorlist[WC->wc_floor]);
+                               wprintf(")</td><td>");
+                               wprintf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"0\" %s>",
+                                       ((floorpolicy == 0) ? "CHECKED" : "") );
+                               wprintf(_("Use the system default"));
+                               wprintf("<br />\n");
+                               wprintf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"1\" %s>",
+                                       ((floorpolicy == 1) ? "CHECKED" : "") );
+                               wprintf(_("Never automatically expire messages"));
+                               wprintf("<br />\n");
+                               wprintf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"2\" %s>",
+                                       ((floorpolicy == 2) ? "CHECKED" : "") );
+                               wprintf(_("Expire by message count"));
+                               wprintf("<br />\n");
+                               wprintf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"3\" %s>",
+                                       ((floorpolicy == 3) ? "CHECKED" : "") );
+                               wprintf(_("Expire by message age"));
+                               wprintf("<br />");
+                               wprintf(_("Number of messages or days: "));
+                               wprintf("<input type=\"text\" NAME=\"floorvalue\" MAXLENGTH=\"5\" VALUE=\"%d\">",
+                                       floorvalue);
+                       }
+       
+                       wprintf("<CENTER>\n");
+                       wprintf("<tr><td COLSPAN=2><hr /><CENTER>\n");
+                       wprintf("<input type=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Save changes"));
+                       wprintf("&nbsp;");
+                       wprintf("<input type=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
+                       wprintf("</CENTER></td><tr>\n");
+       
+                       wprintf("</table>\n"
+                               "<input type=\"hidden\" NAME=\"tab\" VALUE=\"expire\">\n"
+                               "</form>\n"
+                       );
                }
 
-               wprintf("<CENTER>\n");
-               wprintf("<TR><TD COLSPAN=2><hr /><CENTER>\n");
-               wprintf("<INPUT TYPE=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Save changes"));
-               wprintf("&nbsp;");
-               wprintf("<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
-               wprintf("</CENTER></TD><TR>\n");
-
-               wprintf("</TABLE>\n"
-                       "<INPUT TYPE=\"hidden\" NAME=\"tab\" VALUE=\"expire\">\n"
-                       "</FORM>\n"
-               );
-
+               wprintf("</div>");
        }
 
-       /* Mailing list management */
+       /* Access controls */
        if (!strcmp(tab, "access")) {
+               wprintf("<div class=\"tabcontent\">");
                display_whok();
+               wprintf("</div>");
+       }
+
+       /* 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 />\n");
+
+               wprintf("<table class=\"altern\" border=0 cellpadding=5>"
+                       "<tr class=\"even\"><th>");
+               wprintf(_("Remote host"));
+               wprintf("</th><th>");
+               wprintf(_("User name"));
+               wprintf("</th><th>");
+               wprintf(_("Password"));
+               wprintf("</th><th>");
+               wprintf(_("Keep messages on server?"));
+               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);
+
+                                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>");
+                               extract_token(pop3_user, buf, 2, '|', sizeof pop3_user);
+                               escputs(pop3_user);
+                               wprintf("</td>");
+
+                               wprintf("<td>*****</td>");              /* Don't show the password */
+
+                               wprintf("<td>%s</td>", extract_int(buf, 4) ? _("Yes") : _("No"));
+
+                               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("</tr>");
+                       }
+               }
+
+               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);
+               wprintf("<td>");
+               wprintf("<input type=\"text\" id=\"add_as_pop3host\" NAME=\"line_pop3host\">\n");
+               wprintf("</td>");
+               wprintf("<td>");
+               wprintf("<input type=\"text\" id=\"add_as_pop3user\" NAME=\"line_pop3user\">\n");
+               wprintf("</td>");
+               wprintf("<td>");
+               wprintf("<input type=\"password\" id=\"add_as_pop3pass\" NAME=\"line_pop3pass\">\n");
+               wprintf("</td>");
+               wprintf("<td>");
+               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=\"%ld\">\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 */
-       wprintf("</TD></TR></TABLE></div>\n");
+       wprintf("</div>\n");
 
+       address_book_popup();
        wDumpContent(1);
 }
 
@@ -1533,10 +2027,31 @@ void display_editroom(void)
  * Toggle self-service list subscription
  */
 void toggle_self_service(void) {
-       int newval = 0;
+       room_states RoomFlags;
 
-       newval = atoi(bstr("newval"));
-       self_service(newval);
+       get_roomflags (&RoomFlags);
+
+       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();
 }
 
@@ -1554,10 +2069,13 @@ void editroom(void)
        char er_roomaide[26];
        int er_floor;
        unsigned er_flags;
+       int er_listingorder;
+       int er_defaultview;
+       unsigned er_flags2;
        int bump;
 
 
-       if (strlen(bstr("ok_button")) == 0) {
+       if (!havebstr("ok_button")) {
                strcpy(WC->ImportantMessage,
                        _("Cancelled.  Changes were not saved."));
                display_editroom();
@@ -1575,9 +2093,12 @@ void editroom(void)
        extract_token(er_password, &buf[4], 1, '|', sizeof er_password);
        extract_token(er_dirname, &buf[4], 2, '|', sizeof er_dirname);
        er_flags = extract_int(&buf[4], 3);
+       er_listingorder = extract_int(&buf[4], 5);
+       er_defaultview = extract_int(&buf[4], 6);
+       er_flags2 = extract_int(&buf[4], 7);
 
        strcpy(er_roomaide, bstr("er_roomaide"));
-       if (strlen(er_roomaide) == 0) {
+       if (IsEmptyStr(er_roomaide)) {
                serv_puts("GETA");
                serv_getln(buf, sizeof buf);
                if (buf[0] != '2') {
@@ -1588,18 +2109,18 @@ void editroom(void)
        }
        strcpy(buf, bstr("er_name"));
        buf[128] = 0;
-       if (strlen(buf) > 0) {
+       if (!IsEmptyStr(buf)) {
                strcpy(er_name, buf);
        }
 
        strcpy(buf, bstr("er_password"));
        buf[10] = 0;
-       if (strlen(buf) > 0)
+       if (!IsEmptyStr(buf))
                strcpy(er_password, buf);
 
        strcpy(buf, bstr("er_dirname"));
        buf[15] = 0;
-       if (strlen(buf) > 0)
+       if (!IsEmptyStr(buf))
                strcpy(er_dirname, buf);
 
        strcpy(buf, bstr("type"));
@@ -1614,49 +2135,68 @@ void editroom(void)
        if (!strcmp(buf, "passworded")) {
                er_flags |= (QR_PRIVATE | QR_PASSWORDED);
        }
-       if (!strcmp(bstr("prefonly"), "yes")) {
+       if (!strcmp(buf, "personal")) {
+               er_flags |= QR_MAILBOX;
+       } else {
+               er_flags &= ~QR_MAILBOX;
+       }
+       
+       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("permanent"), "yes")) {
+       
+       if (yesbstr("collabdel")) {
+               er_flags2 |= QR2_COLLABDEL;
+       } else {
+               er_flags2 &= ~QR2_COLLABDEL;
+       }
+
+       if (yesbstr("permanent")) {
                er_flags |= QR_PERMANENT;
        } else {
                er_flags &= ~QR_PERMANENT;
        }
 
-       if (!strcmp(bstr("network"), "yes")) {
+       if (yesbstr("subjectreq")) {
+               er_flags2 |= QR2_SUBJECTREQ;
+       } else {
+               er_flags2 &= ~QR2_SUBJECTREQ;
+       }
+
+       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;
@@ -1674,10 +2214,11 @@ 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",
-            er_name, er_password, er_dirname, er_flags, bump, 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,
+               er_listingorder, er_defaultview, er_flags2);
        serv_puts(buf);
        serv_getln(buf, sizeof buf);
        if (buf[0] != '2') {
@@ -1687,7 +2228,7 @@ void editroom(void)
        }
        gotoroom(er_name);
 
-       if (strlen(er_roomaide) > 0) {
+       if (!IsEmptyStr(er_roomaide)) {
                sprintf(buf, "SETA %s", er_roomaide);
                serv_puts(buf);
                serv_getln(buf, sizeof buf);
@@ -1721,7 +2262,7 @@ void do_invt_kick(void) {
 
         strcpy(username, bstr("username"));
 
-        if (strlen(bstr("kick_button")) > 0) {
+        if (havebstr("kick_button")) {
                 sprintf(buf, "KICK %s", username);
                 serv_puts(buf);
                 serv_getln(buf, sizeof buf);
@@ -1735,7 +2276,7 @@ void do_invt_kick(void) {
                 }
         }
 
-       if (strlen(bstr("invite_button")) > 0) {
+       if (havebstr("invite_button")) {
                 sprintf(buf, "INVT %s", username);
                 serv_puts(buf);
                 serv_getln(buf, sizeof buf);
@@ -1771,15 +2312,16 @@ void display_whok(void)
         extract_token(room, &buf[4], 0, '|', sizeof room);
 
         
-       wprintf("<TABLE border=0 CELLSPACING=10><TR VALIGN=TOP><TD>");
+       wprintf("<table border=0 CELLSPACING=10><tr VALIGN=TOP><td>");
        wprintf(_("The users listed below have access to this room.  "
                "To remove a user from the access list, select the user "
                "name from the list and click 'Kick'."));
        wprintf("<br /><br />");
        
-        wprintf("<CENTER><FORM METHOD=\"POST\" action=\"do_invt_kick\">\n");
-       wprintf("<INPUT TYPE=\"hidden\" NAME=\"tab\" VALUE=\"access\">\n");
-        wprintf("<SELECT NAME=\"username\" SIZE=\"10\" style=\"width:100%%\">\n");
+        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=\"tab\" VALUE=\"access\">\n");
+        wprintf("<select NAME=\"username\" SIZE=\"10\" style=\"width:100%%\">\n");
         serv_puts("WHOK");
         serv_getln(buf, sizeof buf);
         if (buf[0] == '1') {
@@ -1790,26 +2332,38 @@ void display_whok(void)
                         wprintf("\n");
                 }
         }
-        wprintf("</SELECT><br />\n");
+        wprintf("</select><br />\n");
 
         wprintf("<input type=\"submit\" name=\"kick_button\" value=\"%s\">", _("Kick"));
-        wprintf("</FORM></CENTER>\n");
+        wprintf("</form></CENTER>\n");
 
-       wprintf("</TD><TD>");
+       wprintf("</td><td>");
        wprintf(_("To grant another user access to this room, enter the "
                "user name in the box below and click 'Invite'."));
        wprintf("<br /><br />");
 
-        wprintf("<CENTER><FORM METHOD=\"POST\" action=\"do_invt_kick\">\n");
-       wprintf("<INPUT TYPE=\"hidden\" NAME=\"tab\" VALUE=\"access\">\n");
+        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(_("Invite:"));
        wprintf(" ");
-        wprintf("<input type=\"text\" name=\"username\" style=\"width:100%%\"><br />\n"
+        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"));
+               "</form></CENTER>\n", _("Invite"));
+               /* Pop open an address book -- begin **/
+               wprintf(
+                       "<a href=\"javascript:PopOpenAddressBook('username_id|%s');\" "
+                       "title=\"%s\">"
+                       "<img align=middle border=0 width=24 height=24 src=\"static/viewcontacts_24x.gif\">"
+                       "&nbsp;%s</a>",
+                       _("User"), 
+                       _("Users"), _("Users")
+               );
+               /* Pop open an address book -- end **/
 
-       wprintf("</TD></TR></TABLE>\n");
+       wprintf("</td></tr></table>\n");
+       address_book_popup();
         wDumpContent(1);
 }
 
@@ -1832,46 +2386,47 @@ void display_entroom(void)
                return;
        }
 
-       output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n"
-               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
-               "<SPAN CLASS=\"titlebar\">");
-       wprintf(_("Create a new room"));
-       wprintf("</SPAN>"
-               "</TD></TR></TABLE>\n"
-               "</div>\n<div id=\"content\">\n"
-       );
+       output_headers(1, 1, 1, 0, 0, 0);
 
-       wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
+       svprintf("BOXTITLE", WCS_STRING, _("Create a new room"));
+       do_template("beginbox");
 
        wprintf("<form name=\"create_room_form\" method=\"POST\" action=\"entroom\">\n");
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
 
-       wprintf("<UL><LI>");
+       wprintf("<table class=\"altern\"> ");
+
+       wprintf("<tr class=\"even\"><td>");
        wprintf(_("Name of room: "));
-       wprintf("<INPUT TYPE=\"text\" NAME=\"er_name\" MAXLENGTH=\"127\">\n");
+       wprintf("</td><td>");
+       wprintf("<input type=\"text\" NAME=\"er_name\" MAXLENGTH=\"127\">\n");
+        wprintf("</td></tr>");
 
-        wprintf("<LI>");
+       wprintf("<tr class=\"odd\"><td>");
        wprintf(_("Resides on floor: "));
+       wprintf("</td><td>");
         load_floorlist(); 
-        wprintf("<SELECT NAME=\"er_floor\" SIZE=\"1\">\n");
+        wprintf("<select name=\"er_floor\" size=\"1\">\n");
         for (i = 0; i < 128; ++i)
-                if (strlen(floorlist[i]) > 0) {
-                        wprintf("<OPTION ");
-                        wprintf("VALUE=\"%d\">", i);
+                if (!IsEmptyStr(floorlist[i])) {
+                        wprintf("<option ");
+                        wprintf("value=\"%d\">", i);
                         escputs(floorlist[i]);
-                        wprintf("</OPTION>\n");
+                        wprintf("</option>\n");
                 }
-        wprintf("</SELECT>\n");
+        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,
-        * of course.  We also disable the floor selector for mailboxes.
-        */
-       wprintf("<LI>");
+               /*
+                * 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,
+                * of course.  We also disable the floor selector for mailboxes.
+                */
+       wprintf("<tr class=\"even\"><td>");
        wprintf(_("Default view for room: "));
-        wprintf("<SELECT NAME=\"er_view\" SIZE=\"1\" OnChange=\""
+       wprintf("</td><td>");
+        wprintf("<select name=\"er_view\" size=\"1\" OnChange=\""
                "       if ( (this.form.er_view.value == 0)             "
                "          || (this.form.er_view.value == 6) ) {        "
                "               this.form.type[0].checked=true;         "
@@ -1883,69 +2438,81 @@ void display_entroom(void)
                "       }                                               "
                "\">\n");
        for (i=0; i<(sizeof viewdefs / sizeof (char *)); ++i) {
-               wprintf("<OPTION %s VALUE=\"%d\">",
-                       ((i == 0) ? "SELECTED" : ""), i );
-               escputs(viewdefs[i]);
-               wprintf("</OPTION>\n");
+               if (is_view_allowed_as_default(i)) {
+                       wprintf("<option %s value=\"%d\">",
+                               ((i == 0) ? "selected" : ""), i );
+                       escputs(viewdefs[i]);
+                       wprintf("</option>\n");
+               }
        }
-       wprintf("</SELECT>\n");
+       wprintf("</select>\n");
+       wprintf("</td></tr>");
 
-       wprintf("<LI>");
+       wprintf("<tr class=\"even\"><td>");
        wprintf(_("Type of room:"));
-       wprintf("<UL>\n");
+       wprintf("</td><td>");
+       wprintf("<ul class=\"adminlist\">\n");
 
-       wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"public\" ");
+       wprintf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"public\" ");
        wprintf("CHECKED OnChange=\""
                "       if (this.form.type[0].checked == true) {        "
                "               this.form.er_floor.disabled = false;    "
                "       }                                               "
                "\"> ");
        wprintf(_("Public (automatically appears to everyone)"));
+       wprintf("</li>");
 
-       wprintf("\n<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"hidden\" OnChange=\""
+       wprintf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"hidden\" OnChange=\""
                "       if (this.form.type[1].checked == true) {        "
                "               this.form.er_floor.disabled = false;    "
                "       }                                               "
                "\"> ");
        wprintf(_("Private - hidden (accessible to anyone who knows its name)"));
+       wprintf("</li>");
 
-       wprintf("\n<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"passworded\" OnChange=\""
+       wprintf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"passworded\" OnChange=\""
                "       if (this.form.type[2].checked == true) {        "
                "               this.form.er_floor.disabled = false;    "
                "       }                                               "
                "\"> ");
        wprintf(_("Private - require password: "));
-       wprintf("<INPUT TYPE=\"text\" NAME=\"er_password\" MAXLENGTH=\"9\">\n");
+       wprintf("<input type=\"text\" NAME=\"er_password\" MAXLENGTH=\"9\">\n");
+       wprintf("</li>");
 
-       wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"invonly\" OnChange=\""
+       wprintf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"invonly\" OnChange=\""
                "       if (this.form.type[3].checked == true) {        "
                "               this.form.er_floor.disabled = false;    "
                "       }                                               "
                "\"> ");
        wprintf(_("Private - invitation only"));
+       wprintf("</li>");
 
-       wprintf("\n<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"personal\" "
+       wprintf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"personal\" "
                "OnChange=\""
                "       if (this.form.type[4].checked == true) {        "
                "               this.form.er_floor.disabled = true;     "
                "       }                                               "
                "\"> ");
        wprintf(_("Personal (mailbox for you only)"));
+       wprintf("</li>");
 
-       wprintf("\n</UL>\n");
+       wprintf("\n</ul>\n");
+       wprintf("</td></tr></table>\n");
 
-       wprintf("<CENTER>\n");
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Create new room"));
+       wprintf("<div class=\"buttons\">\n");
+       wprintf("<input type=\"submit\" name=\"ok_button\" value=\"%s\">", _("Create new room"));
        wprintf("&nbsp;");
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
-       wprintf("</CENTER>\n");
-       wprintf("</FORM>\n<hr />");
+       wprintf("<input type=\"submit\" name=\"cancel_button\" value=\"%s\">", _("Cancel"));
+       wprintf("</div>\n");
+       wprintf("</form>\n<hr />");
        serv_printf("MESG roomaccess");
        serv_getln(buf, sizeof buf);
        if (buf[0] == '1') {
-               fmout("CENTER");
+               fmout("LEFT");
        }
-       wprintf("</td></tr></table></div>\n");
+
+       do_template("endbox");
+
        wDumpContent(1);
 }
 
@@ -1989,7 +2556,7 @@ void er_set_default_view(int newview) {
 
 
 /*
- * enter a new room
+ * Create a new room
  */
 void entroom(void)
 {
@@ -2001,7 +2568,7 @@ void entroom(void)
        int er_num_type;
        int er_view;
 
-       if (strlen(bstr("ok_button")) == 0) {
+       if (!havebstr("ok_button")) {
                strcpy(WC->ImportantMessage,
                        _("Cancelled.  No new room was created."));
                display_main_menu();
@@ -2010,8 +2577,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"))
@@ -2032,76 +2599,74 @@ 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 */
 }
 
 
-/*
- * display the screen to enter a private room
+/**
+ * \brief display the screen to enter a private room
  */
 void display_private(char *rname, int req_pass)
 {
-       output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n"
-               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
-               "<SPAN CLASS=\"titlebar\">");
-       wprintf(_("Go to a hidden room"));
-       wprintf("</SPAN>"
-               "</TD></TR></TABLE>\n"
-               "</div>\n<div id=\"content\">\n"
-       );
+       output_headers(1, 1, 1, 0, 0, 0);
 
-       wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
+       svprintf("BOXTITLE", WCS_STRING, _("Go to a hidden room"));
+       do_template("beginbox");
 
-       wprintf("<CENTER>\n");
-       wprintf("<br />");
+       wprintf("<p>");
        wprintf(_("If you know the name of a hidden (guess-name) or "
                "passworded room, you can enter that room by typing "
                "its name below.  Once you gain access to a private "
                "room, it will appear in your regular room listings "
                "so you don't have to keep returning here."));
-       wprintf("\n<br /><br />");
+       wprintf("</p>");
 
-       wprintf("<FORM METHOD=\"POST\" action=\"goto_private\">\n");
+       wprintf("<form method=\"post\" action=\"goto_private\">\n");
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
 
-       wprintf("<table border=\"0\" cellspacing=\"5\" "
-               "cellpadding=\"5\" BGCOLOR=\"#EEEEEE\">\n"
-               "<TR><TD>");
+       wprintf("<table class=\"altern\"> "
+               "<tr class=\"even\"><td>");
        wprintf(_("Enter room name:"));
-       wprintf("</TD><TD>"
-               "<INPUT TYPE=\"text\" NAME=\"gr_name\" "
-               "VALUE=\"%s\" MAXLENGTH=\"128\">\n", rname);
+       wprintf("</td><td>"
+               "<input type=\"text\" name=\"gr_name\" "
+               "value=\"%s\" maxlength=\"128\">\n", rname);
 
        if (req_pass) {
-               wprintf("</TD></TR><TR><TD>");
+               wprintf("</td></tr><tr class=\"odd\"><td>");
                wprintf(_("Enter room password:"));
-               wprintf("</TD><TD>");
-               wprintf("<INPUT TYPE=\"password\" NAME=\"gr_pass\" MAXLENGTH=\"9\">\n");
+               wprintf("</td><td>");
+               wprintf("<input type=\"password\" name=\"gr_pass\" maxlength=\"9\">\n");
        }
-       wprintf("</TD></TR></TABLE><br />\n");
+       wprintf("</td></tr></table>\n");
 
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">"
+       wprintf("<div class=\"buttons\">\n");
+       wprintf("<input type=\"submit\" name=\"ok_button\" value=\"%s\">"
                "&nbsp;"
-               "<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">",
+               "<input type=\"submit\" name=\"cancel_button\" value=\"%s\">",
                _("Go there"),
                _("Cancel")
        );
-       wprintf("</FORM>\n");
-       wprintf("</td></tr></table></div>\n");
+       wprintf("</div></form>\n");
+
+       do_template("endbox");
+
        wDumpContent(1);
 }
 
-/* 
- * goto a private room
+/**
+ * \brief goto a private room
  */
 void goto_private(void)
 {
        char hold_rm[SIZ];
        char buf[SIZ];
 
-       if (strlen(bstr("ok_button")) == 0) {
+       if (!havebstr("ok_button")) {
                display_main_menu();
                return;
        }
@@ -2128,48 +2693,50 @@ void goto_private(void)
 }
 
 
-/*
- * display the screen to zap a room
+/**
+ * \brief display the screen to zap a room
  */
 void display_zap(void)
 {
        output_headers(1, 1, 2, 0, 0, 0);
 
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
-       wprintf("<SPAN CLASS=\"titlebar\">");
+       wprintf("<h1>");
        wprintf(_("Zap (forget/unsubscribe) the current room"));
-       wprintf("</SPAN>\n");
-       wprintf("</TD></TR></TABLE>\n");
-       wprintf("</div>\n<div id=\"content\">\n");
+       wprintf("</h1>\n");
+       wprintf("</div>\n");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf(_("If you select this option, <em>%s</em> will "
                "disappear from your room list.  Is this what you wish "
                "to do?<br />\n"), WC->wc_roomname);
 
-       wprintf("<FORM METHOD=\"POST\" action=\"zap\">\n");
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Zap this room"));
+       wprintf("<form method=\"POST\" action=\"zap\">\n");
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\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"));
-       wprintf("</FORM>\n");
+       wprintf("<input type=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
+       wprintf("</form>\n");
        wDumpContent(1);
 }
 
 
-/* 
- * zap a room
+/**
+ * \brief zap a room
  */
 void zap(void)
 {
        char buf[SIZ];
        char final_destination[SIZ];
 
-       /* If the forget-room routine fails for any reason, we fall back
+       /**
+        * If the forget-room routine fails for any reason, we fall back
         * to the current room; otherwise, we go to the Lobby
         */
        strcpy(final_destination, WC->wc_roomname);
 
-       if (strlen(bstr("ok_button")) > 0) {
+       if (havebstr("ok_button")) {
                serv_printf("GOTO %s", WC->wc_roomname);
                serv_getln(buf, sizeof buf);
                if (buf[0] == '2') {
@@ -2185,15 +2752,17 @@ void zap(void)
 
 
 
-/*
- * Delete the current room
+/**
+ * \brief Delete the current room
  */
 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();
@@ -2205,8 +2774,8 @@ void delete_room(void)
 
 
 
-/*
- * Perform changes to a room's network configuration
+/**
+ * \brief Perform changes to a room's network configuration
  */
 void netedit(void) {
        FILE *fp;
@@ -2216,15 +2785,31 @@ void netedit(void) {
        char cmpa1[SIZ];
        char cmpb0[SIZ];
        char cmpb1[SIZ];
-
-       if (strlen(bstr("line"))==0) {
+       int i, num_addrs;
+       // TODO: do line dynamic!
+       if (havebstr("line_pop3host")) {
+               strcpy(line, bstr("prefix"));
+               strcat(line, bstr("line_pop3host"));
+               strcat(line, "|");
+               strcat(line, bstr("line_pop3user"));
+               strcat(line, "|");
+               strcat(line, bstr("line_pop3pass"));
+               strcat(line, "|");
+               strcat(line, ibstr("line_pop3keep") ? "1" : "0" );
+               strcat(line, "|");
+               sprintf(&line[strlen(line)],"%ld", lbstr("line_pop3int"));
+               strcat(line, bstr("suffix"));
+       }
+       else if (havebstr("line")) {
+               strcpy(line, bstr("prefix"));
+               strcat(line, bstr("line"));
+               strcat(line, bstr("suffix"));
+       }
+       else {
                display_editroom();
                return;
        }
 
-       strcpy(line, bstr("prefix"));
-       strcat(line, bstr("line"));
-       strcat(line, bstr("suffix"));
 
        fp = tmpfile();
        if (fp == NULL) {
@@ -2240,7 +2825,7 @@ void netedit(void) {
                return;
        }
 
-       /* This loop works for add *or* remove.  Spiffy, eh? */
+       /** This loop works for add *or* remove.  Spiffy, eh? */
        while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
                extract_token(cmpa0, buf, 0, '|', sizeof cmpa0);
                extract_token(cmpa1, buf, 1, '|', sizeof cmpa1);
@@ -2266,8 +2851,23 @@ void netedit(void) {
                serv_puts(buf);
        }
 
-       if (strlen(bstr("add_button")) > 0) {
-               serv_puts(line);
+       if (havebstr("add_button")) {
+               num_addrs = num_tokens(bstr("line"), ',');
+               if (num_addrs < 2) {
+                       /* just adding one node or address */
+                       serv_puts(line);
+               }
+               else {
+                       /* adding multiple addresses separated by commas */
+                       for (i=0; i<num_addrs; ++i) {
+                               strcpy(line, bstr("prefix"));
+                               extract_token(buf, bstr("line"), i, ',', sizeof buf);
+                               striplt(buf);
+                               strcat(line, buf);
+                               strcat(line, bstr("suffix"));
+                               serv_puts(line);
+                       }
+               }
        }
 
        serv_puts("000");
@@ -2277,31 +2877,42 @@ void netedit(void) {
 
 
 
-/*
- * Convert a room name to a folder-ish-looking name.
+/**
+ * \brief Convert a room name to a folder-ish-looking name.
+ * \param folder the folderish name
+ * \param room the room name
+ * \param floor the floor name
+ * \param is_mailbox is it a mailbox?
  */
 void room_to_folder(char *folder, char *room, int floor, int is_mailbox)
 {
-       int i;
+       int i, len;
 
-       /*
+       /**
         * For mailboxes, just do it straight...
         */
        if (is_mailbox) {
                sprintf(folder, "My folders|%s", room);
        }
 
-       /*
+       /**
         * 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);
+               }
        }
 
-       /*
+       /**
         * Replace "\" characters with "|" for pseudo-folder-delimiting
         */
-       for (i=0; i<strlen(folder); ++i) {
+       len = strlen (folder);
+       for (i=0; i<len; ++i) {
                if (folder[i] == '\\') folder[i] = '|';
        }
 }
@@ -2309,8 +2920,9 @@ void room_to_folder(char *folder, char *room, int floor, int is_mailbox)
 
 
 
-/*
- * Back end for change_view()
+/**
+ * \brief Back end for change_view()
+ * \param newview set newview???
  */
 void do_change_view(int newview) {
        char buf[SIZ];
@@ -2323,19 +2935,22 @@ void do_change_view(int newview) {
 
 
 
-/*
- * Change the view for this room
+/**
+ * \brief Change the view for this room
  */
 void change_view(void) {
        int view;
 
-       view = atol(bstr("view"));
+       view = lbstr("view");
        do_change_view(view);
 }
 
 
-/*
- * One big expanded tree list view --- like a folder list
+/**
+ * \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];
@@ -2346,13 +2961,13 @@ void do_folder_view(struct folder *fold, int max_folders, int num_floors) {
 
        parents = malloc(max_folders * sizeof(int));
 
-       /* BEGIN TREE MENU */
+       /** BEGIN TREE MENU */
        wprintf("<div id=\"roomlist_div\">Loading folder list...</div>\n");
 
-       /* include NanoTree */
+       /** include NanoTree */
        wprintf("<script type=\"text/javascript\" src=\"static/nanotree.js\"></script>\n");
 
-       /* initialize NanoTree */
+       /** initialize NanoTree */
        wprintf("<script type=\"text/javascript\">                      \n"
                "       showRootNode = false;                           \n"
                "       sortNodes = false;                              \n"
@@ -2372,8 +2987,10 @@ void do_folder_view(struct folder *fold, int max_folders, int num_floors) {
 
                has_subfolders = 0;
                if ((i+1) < max_folders) {
-                       if ( (!strncasecmp(fold[i].name, fold[i+1].name, strlen(fold[i].name)))
-                          && (fold[i+1].name[strlen(fold[i].name)] == '|') ) {
+                       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;
                        }
                }
@@ -2390,17 +3007,17 @@ void do_folder_view(struct folder *fold, int max_folders, int num_floors) {
                }
 
                if (levels == 1) {
-                       wprintf("<SPAN CLASS=\"roomlist_floor\">");
+                       wprintf("<span class=\"roomlist_floor\">");
                }
                else if (fold[i].hasnewmsgs) {
-                       wprintf("<SPAN CLASS=\"roomlist_new\">");
+                       wprintf("<span class=\"roomlist_new\">");
                }
                else {
-                       wprintf("<SPAN CLASS=\"roomlist_old\">");
+                       wprintf("<span class=\"roomlist_old\">");
                }
                extract_token(buf, fold[i].name, levels-1, '|', sizeof buf);
                escputs(buf);
-               wprintf("</SPAN>");
+               wprintf("</span>");
 
                wprintf("</a>', ");
                if (has_subfolders) {
@@ -2412,6 +3029,9 @@ void do_folder_view(struct folder *fold, int max_folders, int num_floors) {
                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'");
                }
@@ -2442,11 +3062,14 @@ void do_folder_view(struct folder *fold, int max_folders, int num_floors) {
        );
 
        free(parents);
-       /* END TREE MENU */
+       /** END TREE MENU */
 }
 
-/*
- * Boxes and rooms and lists ... oh my!
+/**
+ * \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];
@@ -2469,8 +3092,8 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
        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>"
+       /** Outer table (for columnization) */
+       wprintf("<table BORDER=0 WIDTH=96%% CELLPADDING=5>"
                "<tr><td valign=top>");
 
        levels = 0;
@@ -2482,9 +3105,10 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
                        '|', sizeof floor_name);
 
                if ( (strcasecmp(floor_name, old_floor_name))
-                  && (strlen(old_floor_name) > 0) ) {
+                  && (!IsEmptyStr(old_floor_name)) ) {
                        /* End inner box */
                        do_template("endbox");
+                       wprintf("<br>");
 
                        ++num_boxes;
                        if ((num_boxes % boxes_per_column) == 0) {
@@ -2497,8 +3121,8 @@ 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, floor_name, 1, 0);
+                       /** Begin inner box */
+                       stresc(boxtitle, 256, floor_name, 1, 0);
                        svprintf("BOXTITLE", WCS_STRING, boxtitle);
                        do_template("beginbox");
                }
@@ -2517,14 +3141,14 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
                                wprintf("<i>");
                        }
                        if (fold[i].hasnewmsgs) {
-                               wprintf("<SPAN CLASS=\"roomlist_new\">");
+                               wprintf("<span class=\"roomlist_new\">");
                        }
                        else {
-                               wprintf("<SPAN CLASS=\"roomlist_old\">");
+                               wprintf("<span class=\"roomlist_old\">");
                        }
                        extract_token(buf, fold[i].name, levels-1, '|', sizeof buf);
                        escputs(buf);
-                       wprintf("</SPAN>");
+                       wprintf("</span>");
                        if (fold[i].selectable) {
                                wprintf("</A>");
                        }
@@ -2537,21 +3161,27 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
                        wprintf("<br />\n");
                }
        }
-       /* End the final inner box */
+       /** End the final inner box */
        do_template("endbox");
 
-       wprintf("</TD></TR></TABLE>\n");
+       wprintf("</td></tr></table>\n");
 }
 
-
+/**
+ * \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();
 }
 
-/*
- *
+/**
+ * \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];
@@ -2576,16 +3206,16 @@ void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
                        '|', sizeof floor_name);
 
                if ( (strcasecmp(floor_name, old_floor_name))
-                  && (strlen(old_floor_name) > 0) ) {
-                       /* End inner box */
+                  && (!IsEmptyStr(old_floor_name)) ) {
+                       /** End inner box */
                        wprintf("<br>\n");
-                       wprintf("</div>\n");    /* floordiv */
+                       wprintf("</div>\n");    /** floordiv */
                }
                strcpy(old_floor_name, floor_name);
 
                if (levels == 1) {
-                       /* Begin floor */
-                       stresc(floordivtitle, floor_name, 0, 0);
+                       /** 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')\">"
@@ -2603,13 +3233,16 @@ void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
                        wprintf("&nbsp;");
                        if (levels>2) for (t=0; t<(levels-2); ++t) wprintf("&nbsp;");
 
-                       /* choose the icon */
+                       /** 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" ;
                        }
@@ -2633,17 +3266,17 @@ void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
                                wprintf("<i>");
                        }
                        if (fold[i].hasnewmsgs) {
-                               wprintf("<SPAN CLASS=\"ib_roomlist_new\">");
+                               wprintf("<span class=\"ib_roomlist_new\">");
                        }
                        else {
-                               wprintf("<SPAN CLASS=\"ib_roomlist_old\">");
+                               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>");
+                       wprintf("</span>");
                        if (fold[i].selectable) {
                                wprintf("</A>");
                        }
@@ -2651,13 +3284,13 @@ void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
                                wprintf("</i>");
                        }
                        wprintf("<br />");
-                       wprintf("</div>\n");    /* roomdiv */
+                       wprintf("</div>\n");    /** roomdiv */
                }
        }
-       wprintf("</div>\n");    /* floordiv */
+       wprintf("</div>\n");    /** floordiv */
 
 
-       /* BEGIN: The old invisible pixel trick, to get our JavaScript to initialize */
+       /** BEGIN: The old invisible pixel trick, to get our JavaScript to initialize */
        wprintf("<img src=\"static/blank.gif\" onLoad=\"\n");
 
        num_drop_targets = 0;
@@ -2674,19 +3307,41 @@ void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
        }
 
        wprintf("num_drop_targets = %d;\n", num_drop_targets);
-       if (strlen(WC->floordiv_expanded) > 1) {
+       if ((WC->floordiv_expanded[0] != '\0')&&
+           (WC->floordiv_expanded[1] != '\0')){
                wprintf("which_div_expanded = '%s';\n", WC->floordiv_expanded);
        }
 
        wprintf("\">\n");
-       /* END: The old invisible pixel trick, to get our JavaScript to initialize */
+       /** END: The old invisible pixel trick, to get our JavaScript to initialize */
 }
 
 
 
-/*
- * Show the room list.  (only should get called by
+/**
+ * \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
  * knrooms() because that's where output_headers() is called from)
+ * \param viewpref the view preferences???
  */
 
 void list_all_rooms_by_floor(char *viewpref) {
@@ -2696,29 +3351,28 @@ void list_all_rooms_by_floor(char *viewpref) {
        struct folder ftmp;
        int max_folders = 0;
        int alloc_folders = 0;
+       int *floor_mapping;
+       int IDMax;
        int i, j;
        int ra_flags = 0;
        int flags = 0;
-       int num_floors = 1;     /* add an extra one for private folders */
-
-       /* 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;
-               }
-       }
-
-       /* Can we do the iconbar roomlist from cache? */
+       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. */
+       burn_folder_cache(300);
+       
+       /** Can we do the iconbar roomlist from cache? */
        if ((WC->cache_fold != NULL) && (!strcasecmp(viewpref, "iconbar"))) {
                do_iconbar_view(WC->cache_fold, WC->cache_max_folders, WC->cache_num_floors);
                return;
        }
 
-       /* Grab the floor table so we know how to build the list... */
+       /** Grab the floor table so we know how to build the list... */
        load_floorlist();
 
-       /* Start with the mailboxes */
+       /** Start with the mailboxes */
        max_folders = 1;
        alloc_folders = 1;
        fold = malloc(sizeof(struct folder));
@@ -2726,7 +3380,7 @@ void list_all_rooms_by_floor(char *viewpref) {
        strcpy(fold[0].name, "My folders");
        fold[0].is_mailbox = 1;
 
-       /* Then add floors */
+       /** Then add floors */
        serv_puts("LFLR");
        serv_getln(buf, sizeof buf);
        if (buf[0]=='1') while(serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
@@ -2737,11 +3391,24 @@ 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;
        }
-
-       /* Now add rooms */
+       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"));
+       /** Now add rooms */
        serv_puts("LKRA");
        serv_getln(buf, sizeof buf);
        if (buf[0]=='1') while(serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
@@ -2766,10 +3433,37 @@ void list_all_rooms_by_floor(char *viewpref) {
                                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;
        }
-
-       /* Bubble-sort the folder list */
+       
+       /*
+        * Remove any floors that don't have rooms
+        */
+       get_preference("emptyfloors", buf2, sizeof buf2);
+       if (buf2[0]==0 || (strcasecmp(buf2, "no") == 0))
+       {
+               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) {
@@ -2819,20 +3513,23 @@ 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);
 }
 
 
-/* Do either a known rooms list or a folders list, depending on the
+/**
+ * \brief Do either a known rooms list or a folders list, depending on the
  * user's preference
  */
-void knrooms() {
+void knrooms(void)
+{
        char listviewpref[SIZ];
 
        output_headers(1, 1, 2, 0, 0, 0);
 
-       /* Determine whether the user is trying to change views */
+       /** Determine whether the user is trying to change views */
        if (bstr("view") != NULL) {
-               if (strlen(bstr("view")) > 0) {
+               if (havebstr("view")) {
                        set_preference("roomlistview", bstr("view"), 1);
                }
        }
@@ -2844,11 +3541,10 @@ void knrooms() {
                strcpy(listviewpref, "rooms");
        }
 
-       /* title bar */
-       wprintf("<div id=\"banner\">\n"
-               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
-               "<SPAN CLASS=\"titlebar\">"
-       );
+       /** title bar */
+       wprintf("<div id=\"banner\">\n");
+       wprintf("<div class=\"room_banner\">");
+       wprintf("<h1>");
        if (!strcasecmp(listviewpref, "rooms")) {
                wprintf(_("Room list"));
        }
@@ -2858,63 +3554,68 @@ void knrooms() {
        if (!strcasecmp(listviewpref, "table")) {
                wprintf(_("Room list"));
        }
-       wprintf("</SPAN></TD>\n");
+       wprintf("</h1></div>\n");
 
-       /* offer the ability to switch views */
-       wprintf("<TD ALIGN=RIGHT><FORM NAME=\"roomlistomatic\">\n"
-               "<SELECT NAME=\"newview\" SIZE=\"1\" "
+       /** offer the ability to switch views */
+       wprintf("<ul class=\"room_actions\">\n");
+       wprintf("<li class=\"start_page\">");
+       offer_start_page();
+       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\">"
+       wprintf("<option %s value=\"knrooms&view=rooms\">"
                "View as room list"
-               "</OPTION>\n",
+               "</option>\n",
                ( !strcasecmp(listviewpref, "rooms") ? "SELECTED" : "" )
        );
 
-       wprintf("<OPTION %s VALUE=\"knrooms&view=folders\">"
+       wprintf("<option %s value=\"knrooms&view=folders\">"
                "View as folder list"
-               "</OPTION>\n",
+               "</option>\n",
                ( !strcasecmp(listviewpref, "folders") ? "SELECTED" : "" )
        );
 
-       wprintf("</SELECT><br />");
-       offer_start_page();
-       wprintf("</FORM></TD></TR></TABLE>\n");
-       wprintf("</div>\n"
-               "</div>\n"
-               "<div id=\"content\">\n");
+       wprintf("</select>");
+       wprintf("</form></li>");
+       wprintf("</ul></div>\n");
 
-       /* Display the room list in the user's preferred format */
+       wprintf("<div id=\"content\" class=\"service\">\n");
+
+       /** Display the room list in the user's preferred format */
        list_all_rooms_by_floor(listviewpref);
        wDumpContent(1);
 }
 
 
 
-/* 
- * Set the message expire policy for this room and/or floor
+/**
+ * \brief Set the message expire policy for this room and/or floor
  */
 void set_room_policy(void) {
        char buf[SIZ];
 
-       if (strlen(bstr("ok_button")) == 0) {
+       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"), bstr("floorvalue"));
                serv_getln(buf, sizeof buf);
                strcat(WC->ImportantMessage, &buf[4]);
        }
 
        display_editroom();
 }
+
+/*@}*/