* lets start knit-picking on buffersizes.
[citadel.git] / webcit / roomops.c
index 23bb57d2eafa22d0b734e8ddb115e5c83ff65da7..1327f55d68099fd65652ac5b8011b0946cecdf0d 100644 (file)
@@ -10,7 +10,7 @@
 
 char floorlist[128][SIZ]; /**< list of our floor names */
 
-char *viewdefs[8]; /**< the different kinds of available views */
+char *viewdefs[9]; /**< the different kinds of available views */
 
 /**
  * \brief initialize the viewdefs with localized strings
@@ -24,6 +24,28 @@ void initialize_viewdefs(void) {
        viewdefs[5] = _("Notes List");
        viewdefs[6] = _("Wiki");
        viewdefs[7] = _("Calendar List");
+       viewdefs[8] = _("Journal");
+}
+
+/**
+ * \brief      Determine which views are allowed as the default for creating a new room.
+ *
+ * \param      which_view      The view ID being queried.
+ */
+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);
+               case VIEW_WIKI:         return(0);      /**< because it isn't finished yet */
+               case VIEW_CALBRIEF:     return(0);
+               case VIEW_JOURNAL:      return(0);
+               default:                return(0);      /**< should never get here */
+       }
 }
 
 
@@ -50,6 +72,25 @@ void load_floorlist(void)
 }
 
 
+/**
+ * \brief      Free a session's march list
+ *
+ * \param      wcf             Pointer to session being cleared
+ */
+void free_march_list(struct wcsession *wcf)
+{
+       struct march *mptr;
+
+       while (wcf->march != NULL) {
+               mptr = wcf->march->next;
+               free(wcf->march);
+               wcf->march = mptr;
+       }
+
+}
+
+
+
 /**
  * \brief remove a room from the march list
  */
@@ -112,7 +153,7 @@ 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);
@@ -158,7 +199,6 @@ void listrms(char *variety)
        struct roomlisting *rp;
        struct roomlisting *rs;
 
-
        /** Ask the server for a room list */
        serv_puts(variety);
        serv_getln(buf, sizeof buf);
@@ -166,6 +206,7 @@ void listrms(char *variety)
                wprintf("&nbsp;");
                return;
        }
+
        while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
                ++num_rooms;
                rp = malloc(sizeof(struct roomlisting));
@@ -214,7 +255,7 @@ void listrms(char *variety)
  */
 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");
@@ -233,12 +274,37 @@ void zapped_list(void)
  */
 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;");
@@ -261,7 +327,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");
@@ -273,7 +339,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"
                        "\">"
@@ -314,12 +380,13 @@ void embed_room_graphic(void) {
 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-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");
 
@@ -331,30 +398,50 @@ void embed_view_o_matic(void) {
                 */
                if (
                        (i == WC->wc_view)
-                       ||      (i == WC->wc_default_view) /**< default */
-                       ||      ( (i == 0) && (WC->wc_default_view == 1) ) /**< mail or bulletin */
-                       ||      ( (i == 1) && (WC->wc_default_view == 0) ) /**< mail or bulletin */
-                       ||  ( (i == 7) && (WC->wc_default_view == 3) ) /**< calendar */
+                       ||      (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 view room banner
- * \param got what???
- * \param navbar_style
+ * \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 "
+               "type=\"text\" name=\"query\" size=\"15\" maxlength=\"128\" "
+               "id=\"search_name\" class=\"inputbox\">\n"
+       );
+       wprintf("</select></form>\n");
+}
+
+
+/**
+ * \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 sanitized_roomname[256];
 
        /**
         * We need to have the information returned by a GOTO server command.
@@ -385,7 +472,8 @@ void embed_room_banner(char *got, int navbar_style) {
        WC->new_mail = extract_int(&got[4], 9);
        WC->wc_view = extract_int(&got[4], 11);
 
-       svprintf("ROOMNAME", WCS_STRING, "%s", WC->wc_roomname);
+       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"),
                extract_int(&got[4], 1),
@@ -394,30 +482,29 @@ void embed_room_banner(char *got, int navbar_style) {
        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")
                        );
                }
 
@@ -425,88 +512,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(
+                                               "<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", _("Month view")
                                        );
+                                       break;
+                               case VIEW_CALBRIEF:
                                        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", _("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(
-                                               "<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", _("Wiki home")
+                                               "</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;
                        }
@@ -516,94 +614,110 @@ 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 (!IsEmptyStr(bstr("year" ))) wprintf("?year=%s", bstr("year"));
+                                       if (!IsEmptyStr(bstr("month"))) wprintf("?month=%s", bstr("month"));
+                                       if (!IsEmptyStr(bstr("day"  ))) wprintf("?day=%s", bstr("day"));
+                                       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=\"javascript:add_new_note();\">"
+                                               "<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:
                                        safestrncpy(buf, bstr("page"), sizeof buf);
                                        str_wiki_index(buf);
                                        wprintf(
-                                               "<td><a href=\"display_enter?wikipage=%s\">"
+                                               "<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></td>\n", buf, _("Edit this page")
+                                               "</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");
        }
 
 }
 
 
-
-
-
 /**
  * \brief back end routine to take the session to a new room
  * \param gname room to go to
@@ -644,6 +758,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;
@@ -710,8 +825,9 @@ char *pop_march(int desired_floor)
  */
 void gotonext(void)
 {
-       char buf[SIZ];
+       char buf[256];
        struct march *mptr, *mptr2;
+       char room_name[128];
        char next_room[128];
 
        /**
@@ -724,18 +840,21 @@ 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;
+                               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 = WC->march;
+                                               while (mptr2->next != NULL)
+                                                       mptr2 = mptr2->next;
+                                               mptr2->next = mptr;
+                                       }
                                }
                        }
                /**
@@ -744,6 +863,8 @@ void gotonext(void)
                 */
                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;
@@ -786,15 +907,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;
-       }
 }
 
 
@@ -896,15 +1012,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;
@@ -916,7 +1033,7 @@ void display_editroom(void)
        int floorvalue = 0;
 
        tab = bstr("tab");
-       if (strlen(tab) == 0) tab = "admin";
+       if (IsEmptyStr(tab)) tab = "admin";
 
        load_floorlist();
        serv_puts("GETR");
@@ -932,152 +1049,128 @@ void display_editroom(void)
        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);
 
        output_headers(1, 1, 1, 0, 0, 0);
 
+       wprintf("<div class=\"fix_scrollbar_bug\">");
+
        /** 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");
+       wprintf("<ul class=\"tabbed_dialog\">\n");
 
+       wprintf("<li class=\"tablabel ");
        if (!strcmp(tab, "admin")) {
-               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
+               wprintf(" tab_cell_label\">");
+               wprintf(_("Administration"));
        }
        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("< tab_cell_edit\"><a href=\"display_editroom&tab=admin\">");
+               wprintf(_("Administration"));
+               wprintf("</a>");
        }
+       wprintf("</li>\n");
 
-       wprintf("<TD>&nbsp;</TD>\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"));
+       wprintf("<li class=\"tablabel ");
        if (!strcmp(tab, "config")) {
-               wprintf("</SPAN></TD>\n");
-       }
-       else {
-               wprintf("</A></TD>\n");
-       }
-
-       wprintf("<TD>&nbsp;</TD>\n");
-
-       if (!strcmp(tab, "expire")) {
-               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
+               wprintf(" tab_cell_label\">");
+               wprintf(_("Configuration"));
        }
        else {
-               wprintf("<TD BGCOLOR=\"#CCCCCC\"><a href=\"display_editroom&tab=expire\">");
+               wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=config\">");
+               wprintf(_("Configuration"));
+               wprintf("</a>");
        }
-       wprintf(_("Message expire policy"));
+       wprintf("</li>\n");
+       
+       wprintf("<li class=\"tablabel ");
        if (!strcmp(tab, "expire")) {
-               wprintf("</SPAN></TD>\n");
+               wprintf(" tab_cell_label\">");
+               wprintf(_("Message expire policy"));
        }
        else {
-               wprintf("</A></TD>\n");
+               wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=expire\">");
+               wprintf(_("Message expire policy"));
+               wprintf("</a>");
        }
+       wprintf("</li>\n");
 
-       wprintf("<TD>&nbsp;</TD>\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"));
+       wprintf("<li class=\"tablabel ");
        if (!strcmp(tab, "access")) {
-               wprintf("</SPAN></TD>\n");
+               wprintf(" tab_cell_label\">");
+               wprintf(_("Access controls"));
        }
        else {
-               wprintf("</A></TD>\n");
+               wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=access\">");
+               wprintf(_("Access controls"));
+               wprintf("</a>");
        }
+       wprintf("</li>\n");
 
-       wprintf("<TD>&nbsp;</TD>\n");
-
+       wprintf("<li class=\"tablabel ");
        if (!strcmp(tab, "sharing")) {
-               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
+               wprintf(" tab_cell_label\">");
+               wprintf(_("Sharing"));
        }
        else {
-               wprintf("<TD BGCOLOR=\"#CCCCCC\"><a href=\"display_editroom&tab=sharing\">");
-       }
-       wprintf(_("Sharing"));
-       if (!strcmp(tab, "sharing")) {
-               wprintf("</SPAN></TD>\n");
+               wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=sharing\">");
+               wprintf(_("Sharing"));
+               wprintf("</a>");
        }
-       else {
-               wprintf("</A></TD>\n");
-       }
-
-       wprintf("<TD>&nbsp;</TD>\n");
+       wprintf("</li>\n");
 
+       wprintf("<li class=\"tablabel ");
        if (!strcmp(tab, "listserv")) {
-               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
+               wprintf(" tab_cell_label\">");
+               wprintf(_("Mailing list service"));
        }
        else {
-               wprintf("<TD BGCOLOR=\"#CCCCCC\"><a href=\"display_editroom&tab=listserv\">");
+               wprintf("< tab_cell_edit\"><a href=\"display_editroom&tab=listserv\">");
+               wprintf(_("Mailing list service"));
+               wprintf("</a>");
        }
-       wprintf(_("Mailing list service"));
-       if (!strcmp(tab, "listserv")) {
-               wprintf("</SPAN></TD>\n");
-       }
-       else {
-               wprintf("</A></TD>\n");
-       }
-
-       wprintf("<TD>&nbsp;</TD>\n");
+       wprintf("</li>\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("<div class=\"tabcontent\">");
+               wprintf("<form method=\"POST\" action=\"editroom\">\n");
+               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
        
-               wprintf("<UL><LI>");
+               wprintf("<ul><li>");
                wprintf(_("Name of room: "));
-               wprintf("<INPUT TYPE=\"text\" NAME=\"er_name\" VALUE=\"%s\" MAXLENGTH=\"%d\">\n",
+               wprintf("<input type=\"text\" NAME=\"er_name\" VALUE=\"%s\" MAXLENGTH=\"%d\">\n",
                        er_name,
                        (sizeof(er_name)-1)
                );
        
-               wprintf("<LI>");
+               wprintf("<li>");
                wprintf(_("Resides on floor: "));
-               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) {
+                       if (!IsEmptyStr(floorlist[i])) {
                                wprintf("<OPTION ");
                                if (i == er_floor)
                                        wprintf("SELECTED ");
@@ -1085,36 +1178,36 @@ void display_editroom(void)
                                escputs(floorlist[i]);
                                wprintf("</OPTION>\n");
                        }
-               wprintf("</SELECT>\n");
+               wprintf("</select>\n");
        
-               wprintf("<LI>");
+               wprintf("<li>");
                wprintf(_("Type of room:"));
-               wprintf("<UL>\n");
+               wprintf("<ul>\n");
 
-               wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"public\" ");
+               wprintf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"public\" ");
                if ((er_flags & QR_PRIVATE) == 0)
                wprintf("CHECKED ");
                wprintf("> ");
-               wprintf(_("Public room"));
+               wprintf(_("Public (automatically appears to everyone)"));
                wprintf("\n");
 
-               wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"hidden\" ");
+               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(_("Private - hidden (accessible to anyone who knows its name)"));
        
-               wprintf("\n<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"passworded\" ");
+               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",
+               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\" ");
+               wprintf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"invonly\" ");
                if ((er_flags & QR_PRIVATE)
                    && ((er_flags & QR_GUESSNAME) == 0)
                    && ((er_flags & QR_PASSWORDED) == 0))
@@ -1122,122 +1215,136 @@ void display_editroom(void)
                wprintf("> ");
                wprintf(_("Private - invitation only"));
        
-               wprintf("\n<LI><INPUT TYPE=\"checkbox\" NAME=\"bump\" VALUE=\"yes\" ");
+               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("\n</ul>\n");
        
-               wprintf("<LI><INPUT TYPE=\"checkbox\" NAME=\"prefonly\" VALUE=\"yes\" ");
+               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\" ");
+               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\" ");
+               wprintf("\n<li><input type=\"checkbox\" NAME=\"directory\" VALUE=\"yes\" ");
                if (er_flags & QR_DIRECTORY)
                        wprintf("CHECKED ");
                wprintf("> ");
                wprintf(_("File directory room"));
 
-               wprintf("\n<UL><LI>");
+               wprintf("\n<ul><li>");
                wprintf(_("Directory name: "));
-               wprintf("<INPUT TYPE=\"text\" NAME=\"er_dirname\" VALUE=\"%s\" MAXLENGTH=\"14\">\n",
+               wprintf("<input type=\"text\" NAME=\"er_dirname\" VALUE=\"%s\" MAXLENGTH=\"14\">\n",
                        er_dirname);
 
-               wprintf("<LI><INPUT TYPE=\"checkbox\" NAME=\"ulallowed\" VALUE=\"yes\" ");
+               wprintf("<li><input type=\"checkbox\" NAME=\"ulallowed\" VALUE=\"yes\" ");
                if (er_flags & QR_UPLOAD)
                        wprintf("CHECKED ");
                wprintf("> ");
                wprintf(_("Uploading allowed"));
        
-               wprintf("\n<LI><INPUT TYPE=\"checkbox\" NAME=\"dlallowed\" VALUE=\"yes\" ");
+               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\" ");
+               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("</ul>\n");
        
                /** end of directory stuff */
        
-               wprintf("<LI><INPUT TYPE=\"checkbox\" NAME=\"network\" VALUE=\"yes\" ");
+               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\" ");
+               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=\"checkbox\" NAME=\"subjectreq\" VALUE=\"yes\" ");
+               if (er_flags2 & QR2_SUBJECTREQ)
+                       wprintf("CHECKED ");
+               wprintf("> ");
+               wprintf(_("Subject Required (Force users to specify a message subject)"));
+
                /** start of anon options */
        
-               wprintf("\n<LI>");
+               wprintf("\n<li>");
                wprintf(_("Anonymous messages"));
-               wprintf("<UL>\n");
+               wprintf("<ul>\n");
        
-               wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"anon\" VALUE=\"no\" ");
+               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("\n<LI><INPUT TYPE=\"radio\" NAME=\"anon\" VALUE=\"anononly\" ");
+               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\" ");
+               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("</ul>\n");
        
        /* end of anon options */
        
-               wprintf("<LI>");
+               wprintf("<li>");
                wprintf(_("Room aide: "));
                serv_puts("GETA");
                serv_getln(buf, sizeof buf);
                if (buf[0] != '2') {
-                       wprintf("<EM>%s</EM>\n", &buf[4]);
+                       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("<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\">"
+               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\">"
+                       "<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("");
@@ -1263,7 +1370,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);
                                }
@@ -1284,119 +1391,121 @@ 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\" "
+                               wprintf("<input type=\"hidden\" NAME=\"tab\" "
                                        "VALUE=\"sharing\">\n");
-                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"cmd\" "
+                               wprintf("<input type=\"hidden\" NAME=\"cmd\" "
                                        "VALUE=\"remove\">\n");
-                               wprintf("<INPUT TYPE=\"submit\" "
+                               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")) {
+               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> "
@@ -1411,22 +1520,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> "
@@ -1441,23 +1550,39 @@ 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");
+               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("<hr />");
                if (self_service(999) == 1) {
                        wprintf(_("This room is configured to allow "
                                "self-service subscribe/unsubscribe requests."));
@@ -1480,11 +1605,13 @@ void display_editroom(void)
 
 
                wprintf("</CENTER>\n");
+               wprintf("</div>");
        }
 
 
        /** Mailing list management */
        if (!strcmp(tab, "expire")) {
+               wprintf("<div class=\"tabcontent\">");
 
                serv_puts("GPEX room");
                serv_getln(buf, sizeof buf);
@@ -1500,83 +1627,88 @@ void display_editroom(void)
                        floorvalue = 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("<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(WC->wc_roomname);
-               wprintf(")</TD><TD>");
-               wprintf("<INPUT TYPE=\"radio\" NAME=\"roompolicy\" VALUE=\"0\" %s>",
+               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>",
+               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>",
+               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>",
+               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");
+               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("<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>",
+                       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>",
+                       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>",
+                       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>",
+                       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\">",
+                       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("<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("<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("</table>\n"
+                       "<input type=\"hidden\" NAME=\"tab\" VALUE=\"expire\">\n"
+                       "</form>\n"
                );
 
+               wprintf("</div>");
        }
 
        /** Mailing list management */
        if (!strcmp(tab, "access")) {
+               wprintf("<div class=\"tabcontent\">");
                display_whok();
+               wprintf("</div>");
        }
 
        /** end content of whatever tab is open now */
-       wprintf("</TD></TR></TABLE></div>\n");
+       wprintf("</div>\n");
 
+       address_book_popup();
        wDumpContent(1);
 }
 
@@ -1606,10 +1738,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 (IsEmptyStr(bstr("ok_button"))) {
                strcpy(WC->ImportantMessage,
                        _("Cancelled.  Changes were not saved."));
                display_editroom();
@@ -1627,9 +1762,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') {
@@ -1640,18 +1778,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"));
@@ -1678,12 +1816,24 @@ void editroom(void)
                er_flags &= ~QR_READONLY;
        }
 
+       if (!strcmp(bstr("collabdel"), "yes")) {
+               er_flags2 |= QR2_COLLABDEL;
+       } else {
+               er_flags2 &= ~QR2_COLLABDEL;
+       }
+
        if (!strcmp(bstr("permanent"), "yes")) {
                er_flags |= QR_PERMANENT;
        } else {
                er_flags &= ~QR_PERMANENT;
        }
 
+       if (!strcmp(bstr("subjectreq"), "yes")) {
+               er_flags2 |= QR2_SUBJECTREQ;
+       } else {
+               er_flags2 &= ~QR2_SUBJECTREQ;
+       }
+
        if (!strcmp(bstr("network"), "yes")) {
                er_flags |= QR_NETWORK;
        } else {
@@ -1728,8 +1878,9 @@ void editroom(void)
 
        er_floor = atoi(bstr("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') {
@@ -1739,7 +1890,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);
@@ -1773,7 +1924,7 @@ void do_invt_kick(void) {
 
         strcpy(username, bstr("username"));
 
-        if (strlen(bstr("kick_button")) > 0) {
+        if (!IsEmptyStr(bstr("kick_button"))) {
                 sprintf(buf, "KICK %s", username);
                 serv_puts(buf);
                 serv_getln(buf, sizeof buf);
@@ -1787,7 +1938,7 @@ void do_invt_kick(void) {
                 }
         }
 
-       if (strlen(bstr("invite_button")) > 0) {
+       if (!IsEmptyStr(bstr("invite_button"))) {
                 sprintf(buf, "INVT %s", username);
                 serv_puts(buf);
                 serv_getln(buf, sizeof buf);
@@ -1823,15 +1974,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') {
@@ -1842,26 +1994,27 @@ 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"
                "<input type=\"hidden\" name=\"invite_button\" value=\"Invite\">"
                "<input type=\"submit\" value=\"%s\">"
-               "</FORM></CENTER>\n", _("Invite"));
+               "</form></CENTER>\n", _("Invite"));
 
-       wprintf("</TD></TR></TABLE>\n");
+       wprintf("</td></tr></table>\n");
         wDumpContent(1);
 }
 
@@ -1884,37 +2037,36 @@ 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
@@ -1922,9 +2074,10 @@ void display_entroom(void)
                 * it selects a mailbox room otherwise.  The user can override this,
                 * of course.  We also disable the floor selector for mailboxes.
                 */
-               wprintf("<LI>");
-               wprintf(_("Default view for room: "));
-        wprintf("<SELECT NAME=\"er_view\" SIZE=\"1\" OnChange=\""
+       wprintf("<tr class=\"even\"><td>");
+       wprintf(_("Default view for room: "));
+       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;         "
@@ -1936,69 +2089,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);
 }
 
@@ -2054,7 +2219,7 @@ void entroom(void)
        int er_num_type;
        int er_view;
 
-       if (strlen(bstr("ok_button")) == 0) {
+       if (IsEmptyStr(bstr("ok_button"))) {
                strcpy(WC->ImportantMessage,
                        _("Cancelled.  No new room was created."));
                display_main_menu();
@@ -2095,54 +2260,48 @@ void entroom(void)
  */
 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);
 }
 
@@ -2154,7 +2313,7 @@ void goto_private(void)
        char hold_rm[SIZ];
        char buf[SIZ];
 
-       if (strlen(bstr("ok_button")) == 0) {
+       if (IsEmptyStr(bstr("ok_button"))) {
                display_main_menu();
                return;
        }
@@ -2189,22 +2348,23 @@ 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);
 }
 
@@ -2223,7 +2383,7 @@ void zap(void)
         */
        strcpy(final_destination, WC->wc_roomname);
 
-       if (strlen(bstr("ok_button")) > 0) {
+       if (!IsEmptyStr(bstr("ok_button"))) {
                serv_printf("GOTO %s", WC->wc_roomname);
                serv_getln(buf, sizeof buf);
                if (buf[0] == '2') {
@@ -2270,8 +2430,9 @@ void netedit(void) {
        char cmpa1[SIZ];
        char cmpb0[SIZ];
        char cmpb1[SIZ];
+       int i, num_addrs;
 
-       if (strlen(bstr("line"))==0) {
+       if (IsEmptyStr(bstr("line"))) {
                display_editroom();
                return;
        }
@@ -2320,8 +2481,23 @@ void netedit(void) {
                serv_puts(buf);
        }
 
-       if (strlen(bstr("add_button")) > 0) {
-               serv_puts(line);
+       if (!IsEmptyStr(bstr("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");
@@ -2340,7 +2516,7 @@ void netedit(void) {
  */
 void room_to_folder(char *folder, char *room, int floor, int is_mailbox)
 {
-       int i;
+       int i, len;
 
        /**
         * For mailboxes, just do it straight...
@@ -2359,7 +2535,8 @@ void room_to_folder(char *folder, char *room, int floor, int is_mailbox)
        /**
         * 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] = '|';
        }
 }
@@ -2434,8 +2611,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;
                        }
                }
@@ -2452,17 +2631,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) {
@@ -2474,6 +2653,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'");
                }
@@ -2535,7 +2717,7 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
        if (boxes_per_column < 1) boxes_per_column = 1;
 
        /** Outer table (for columnization) */
-       wprintf("<TABLE BORDER=0 WIDTH=96%% CELLPADDING=5>"
+       wprintf("<table BORDER=0 WIDTH=96%% CELLPADDING=5>"
                "<tr><td valign=top>");
 
        levels = 0;
@@ -2547,7 +2729,7 @@ 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");
 
@@ -2563,7 +2745,7 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
 
                if (levels == 1) {
                        /** Begin inner box */
-                       stresc(boxtitle, floor_name, 1, 0);
+                       stresc(boxtitle, 256, floor_name, 1, 0);
                        svprintf("BOXTITLE", WCS_STRING, boxtitle);
                        do_template("beginbox");
                }
@@ -2582,14 +2764,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>");
                        }
@@ -2605,7 +2787,7 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
        /** End the final inner box */
        do_template("endbox");
 
-       wprintf("</TD></TR></TABLE>\n");
+       wprintf("</td></tr></table>\n");
 }
 
 /**
@@ -2647,7 +2829,7 @@ 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) ) {
+                  && (!IsEmptyStr(old_floor_name)) ) {
                        /** End inner box */
                        wprintf("<br>\n");
                        wprintf("</div>\n");    /** floordiv */
@@ -2656,7 +2838,7 @@ void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
 
                if (levels == 1) {
                        /** Begin floor */
-                       stresc(floordivtitle, floor_name, 0, 0);
+                       stresc(floordivtitle, 256, floor_name, 0, 0);
                        sprintf(floordiv_id, "floordiv%d", i);
                        wprintf("<span class=\"ib_roomlist_floor\" "
                                "onClick=\"expand_floor('%s')\">"
@@ -2681,6 +2863,9 @@ void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
                        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" ;
                        }
@@ -2704,17 +2889,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>");
                        }
@@ -2745,7 +2930,8 @@ 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);
        }
 
@@ -2814,6 +3000,9 @@ void list_all_rooms_by_floor(char *viewpref) {
                ++num_floors;
        }
 
+       /** 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);
@@ -2907,7 +3096,7 @@ void knrooms(void)
 
        /** Determine whether the user is trying to change views */
        if (bstr("view") != NULL) {
-               if (strlen(bstr("view")) > 0) {
+               if (!IsEmptyStr(bstr("view"))) {
                        set_preference("roomlistview", bstr("view"), 1);
                }
        }
@@ -2920,10 +3109,9 @@ void knrooms(void)
        }
 
        /** title bar */
-       wprintf("<div id=\"banner\">\n"
-               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
-               "<SPAN CLASS=\"titlebar\">"
-       );
+       wprintf("<div id=\"banner\">\n");
+       wprintf("<div class=\"room_banner\">");
+       wprintf("<h1>");
        if (!strcasecmp(listviewpref, "rooms")) {
                wprintf(_("Room list"));
        }
@@ -2933,32 +3121,35 @@ void knrooms(void)
        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\" "
+       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");
+
+       wprintf("<div id=\"content\" class=\"service\">\n");
 
        /** Display the room list in the user's preferred format */
        list_all_rooms_by_floor(listviewpref);
@@ -2973,7 +3164,7 @@ void knrooms(void)
 void set_room_policy(void) {
        char buf[SIZ];
 
-       if (strlen(bstr("ok_button")) == 0) {
+       if (IsEmptyStr(bstr("ok_button"))) {
                strcpy(WC->ImportantMessage,
                        _("Cancelled.  Changes were not saved."));
                display_editroom();
@@ -2994,5 +3185,4 @@ void set_room_policy(void) {
        display_editroom();
 }
 
-
 /*@}*/