Nearly all <FORM> blocks now contain a hidden input
[citadel.git] / webcit / roomops.c
index 9573fc9b3860bc681a5593b38d2fd35fbb0fc88f..832b622d1e4ae39d8e6d6bbeac4d792329c46e99 100644 (file)
@@ -1,15 +1,20 @@
 /*
  * $Id$
- *
- * Lots of different room-related operations.
  */
-
+/**
+ * \defgroup RoomOps Lots of different room-related operations.
+ * \ingroup CitadelCommunitacion
+ */
+/*@{*/
 #include "webcit.h"
 
-char floorlist[128][SIZ];
+char floorlist[128][SIZ]; /**< list of our floor names */
 
-char *viewdefs[7];
+char *viewdefs[8]; /**< the different kinds of available views */
 
+/**
+ * \brief initialize the viewdefs with localized strings
+ */
 void initialize_viewdefs(void) {
        viewdefs[0] = _("Bulletin Board");
        viewdefs[1] = _("Mail Folder");
@@ -18,11 +23,32 @@ void initialize_viewdefs(void) {
        viewdefs[4] = _("Task List");
        viewdefs[5] = _("Notes List");
        viewdefs[6] = _("Wiki");
+       viewdefs[7] = _("Calendar List");
 }
 
+/**
+ * \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);
+               default:                return(0);      /**< should never get here */
+       }
+}
 
-/*
- * load the list of floors
+
+/**
+ * \brief load the list of floors
  */
 void load_floorlist(void)
 {
@@ -44,8 +70,27 @@ void load_floorlist(void)
 }
 
 
-/*
- * remove a room from the march list
+/**
+ * \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
  */
 void remove_march(char *aaa)
 {
@@ -75,7 +120,10 @@ void remove_march(char *aaa)
 
 
 
-
+/**
+ * \brief display rooms in tree structure???
+ * \param rp the roomlist to build a tree from
+ */
 void room_tree_list(struct roomlisting *rp)
 {
        char rmname[64];
@@ -110,8 +158,11 @@ void room_tree_list(struct roomlisting *rp)
 }
 
 
-/* 
- * Room ordering stuff (compare first by floor, then by order)
+/** 
+ * \brief Room ordering stuff (compare first by floor, then by order)
+ * \param r1 first roomlist to compare
+ * \param r2 second roomlist co compare
+ * \return are they the same???
  */
 int rordercmp(struct roomlisting *r1, struct roomlisting *r2)
 {
@@ -133,8 +184,9 @@ int rordercmp(struct roomlisting *r1, struct roomlisting *r2)
 }
 
 
-/*
- * Common code for all room listings
+/**
+ * \brief Common code for all room listings
+ * \param variety what???
  */
 void listrms(char *variety)
 {
@@ -145,14 +197,14 @@ void listrms(char *variety)
        struct roomlisting *rp;
        struct roomlisting *rs;
 
-
-       /* Ask the server for a room list */
+       /** Ask the server for a room list */
        serv_puts(variety);
        serv_getln(buf, sizeof buf);
        if (buf[0] != '1') {
                wprintf("&nbsp;");
                return;
        }
+
        while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
                ++num_rooms;
                rp = malloc(sizeof(struct roomlisting));
@@ -188,15 +240,16 @@ void listrms(char *variety)
 
        room_tree_list(rl);
 
-       /* If no rooms were listed, print an nbsp to make the cell
+       /**
+        * If no rooms were listed, print an nbsp to make the cell
         * borders show up anyway.
         */
        if (num_rooms == 0) wprintf("&nbsp;");
 }
 
 
-/*
- * list all forgotten rooms
+/**
+ * \brief list all forgotten rooms
  */
 void zapped_list(void)
 {
@@ -214,17 +267,42 @@ void zapped_list(void)
 }
 
 
-/*
- * read this room's info file (set v to 1 for verbose mode)
+/**
+ * \brief read this room's info file (set v to 1 for verbose mode)
  */
 void readinfo(void)
 {
-       char buf[SIZ];
+       char buf[256];
+       char briefinfo[128];
+       char fullinfo[8192];
+       int fullinfo_len = 0;
 
        serv_puts("RINF");
        serv_getln(buf, sizeof buf);
        if (buf[0] == '1') {
-               fmout("CENTER");
+
+               while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+                       if (fullinfo_len < (sizeof fullinfo - sizeof buf)) {
+                               strcpy(&fullinfo[fullinfo_len], buf);
+                               fullinfo_len += strlen(buf);
+                       }
+               }
+
+               safestrncpy(briefinfo, fullinfo, sizeof briefinfo);
+               strcpy(&briefinfo[50], "...");
+
+                wprintf("<div class=\"infos\" "
+                "onclick=\"javascript:Effect.Appear('room_infos', { duration: 0.5 });\" "
+                ">");
+               escputs(briefinfo);
+                wprintf("</div><div id=\"room_infos\" style=\"display:none;\">");
+               wprintf("<img class=\"close_infos\" "
+                       "onclick=\"javascript:Effect.Fade('room_infos', { duration: 0.5 });\" "
+                       "src=\"static/closewindow.gif\" alt=\"%s\">",
+                       _("Close window")
+               );
+               escputs(fullinfo);
+                wprintf("</div>");
        }
        else {
                wprintf("&nbsp;");
@@ -234,7 +312,9 @@ void readinfo(void)
 
 
 
-/* Display room banner icon.  The server doesn't actually
+/**
+ * \brief Display room banner icon.  
+ * The server doesn't actually
  * need the room name, but we supply it in order to
  * keep the browser from using a cached icon from 
  * another room.
@@ -257,7 +337,7 @@ void embed_room_graphic(void) {
                        "\">"
                );
        }
-       else if (WC->wc_view == VIEW_CALENDAR) {
+       else if ( (WC->wc_view == VIEW_CALENDAR) || (WC->wc_view == VIEW_CALBRIEF) ) {
                wprintf("<img height=48 width=48 src=\""
                        "static/calarea_48x.gif"
                        "\">"
@@ -292,78 +372,103 @@ void embed_room_graphic(void) {
 
 
 
-/*
- * Display the current view and offer an option to change it
+/**
+ * \brief Display the current view and offer an option to change it
  */
 void embed_view_o_matic(void) {
        int i;
 
        wprintf("<form name=\"viewomatic\" action=\"changeview\">\n"
-               "<span class=\"room_banner_new_messages\">");
+               "<label for=\"view_name\">");
        wprintf(_("View as:"));
-       wprintf(" "
-               "<SELECT NAME=\"newview\" SIZE=\"1\" "
-               "STYLE=\"font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;"
-               " font-size: 7pt; background: #444455; color: #ddddcc;\" "
+       wprintf("</label> "
+               "<select name=\"newview\" size=\"1\" "
+               "id=\"view_name\" class=\"selectbox\" "
                "OnChange=\"location.href=viewomatic.newview.options"
                "[selectedIndex].value\">\n");
 
        for (i=0; i<(sizeof viewdefs / sizeof (char *)); ++i) {
-               /*
+               /**
                 * Only offer the views that make sense, given the default
                 * view for the room.  For example, don't offer a Calendar
                 * view in a non-Calendar room.
                 */
                if (
                        (i == WC->wc_view)
-                  ||   (i == WC->wc_default_view)
-                  ||   ( (i == 0) && (WC->wc_default_view == 1) )
-                  ||   ( (i == 1) && (WC->wc_default_view == 0) )
+                       ||      (i == WC->wc_default_view)                      /**< default */
+                       ||      ( (i == 0) && (WC->wc_default_view == 1) )      /**< mail or bulletin */
+                       ||      ( (i == 1) && (WC->wc_default_view == 0) )      /**< mail or bulletin */
+                       /** ||  ( (i == 7) && (WC->wc_default_view == 3) )      (calendar list temporarily disabled) */
                ) {
 
-                       wprintf("<OPTION %s VALUE=\"changeview?view=%d\">",
-                               ((i == WC->wc_view) ? "SELECTED" : ""),
+                       wprintf("<option %s value=\"changeview?view=%d\">",
+                               ((i == WC->wc_view) ? "selected" : ""),
                                i );
                        escputs(viewdefs[i]);
-                       wprintf("</OPTION>\n");
+                       wprintf("</option>\n");
                }
        }
-       wprintf("</select></span></form>\n");
+       wprintf("</select></form>\n");
 }
 
 
+/**
+ * \brief Display a search box
+ */
+void embed_search_o_matic(void) {
+       wprintf("<form name=\"searchomatic\" action=\"do_search\">\n"
+               "<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 fakegot[SIZ];
+       char buf[256];
 
-       /* We need to have the information returned by a GOTO server command.
+       /**
+        * We need to have the information returned by a GOTO server command.
         * If it isn't supplied, we fake it by issuing our own GOTO.
         */
        if (got == NULL) {
                serv_printf("GOTO %s", WC->wc_roomname);
-               serv_getln(fakegot, sizeof fakegot);
-               got = fakegot;
+               serv_getln(buf, sizeof buf);
+               got = buf;
        }
 
-       /* The browser needs some information for its own use */
+       /** The browser needs some information for its own use */
        wprintf("<script type=\"text/javascript\">      \n"
                "       room_is_trash = %d;             \n"
                "</script>\n",
                WC->wc_is_trash
        );
 
-       /* If the user happens to select the "make this my start page" link,
+       /**
+        * If the user happens to select the "make this my start page" link,
         * we want it to remember the URL as a "/dotskip" one instead of
         * a "skip" or "gotonext" or something like that.
         */
        snprintf(WC->this_page, sizeof(WC->this_page), "dotskip&room=%s",
                WC->wc_roomname);
 
-       /* Check for new mail. */
+       /** Check for new mail. */
        WC->new_mail = extract_int(&got[4], 9);
        WC->wc_view = extract_int(&got[4], 11);
 
-       svprintf("ROOMNAME", WCS_STRING, "%s", WC->wc_roomname);
+       stresc(buf, WC->wc_roomname, 1, 1);
+       svprintf("ROOMNAME", WCS_STRING, "%s", buf);
        svprintf("NUMMSGS", WCS_STRING,
                _("%d new of %d messages"),
                extract_int(&got[4], 1),
@@ -372,30 +477,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")
                        );
                }
 
@@ -403,77 +507,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></li>\n", _("View message list")
+                                       );
+                                       break;
+                               case VIEW_WIKI:
+                                       wprintf(
+                                               "<li class=\"readallmess\">"
                                                "<a href=\"readfwd\">"
                                                "<img align=\"middle\" src=\"static/readallmess3_24x.gif\" "
                                                "border=\"0\">"
                                                "<span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("View message list")
+                                               "</span></a></li>\n", _("Wiki home")
                                        );
                                        break;
                                default:
                                        wprintf(
-                                               "<td>"
+                                               "<li class=\"readallmess\">"
                                                "<a href=\"readfwd\">"
                                                "<img align=\"middle\" src=\"static/readallmess3_24x.gif\" "
                                                "border=\"0\">"
                                                "<span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("Read all messages")
+                                               "</span></a></li>\n", _("Read all messages")
                                        );
                                        break;
                        }
@@ -483,88 +609,113 @@ void embed_room_banner(char *got, int navbar_style) {
                        switch(WC->wc_view) {
                                case VIEW_ADDRESSBOOK:
                                        wprintf(
-                                               "<td><a href=\"display_enter\">"
+                                               "<li class=\"addnewcontact\">"
+                                               "<a href=\"display_enter\">"
                                                "<img align=\"middle\" src=\"static/addnewcontact_24x.gif\" "
                                                "border=\"0\"><span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("Add new contact")
+                                               "</span></a></li>\n", _("Add new contact")
                                        );
                                        break;
                                case VIEW_CALENDAR:
-                                       wprintf(
-                                               "<td><a href=\"display_enter\">"
+                               case VIEW_CALBRIEF:
+                                       wprintf("<li class=\"addevent\"><a href=\"display_enter");
+                                       if (strlen(bstr("year")) > 0) wprintf("?year=%s", bstr("year"));
+                                       if (strlen(bstr("month")) > 0) wprintf("?month=%s", bstr("month"));
+                                       if (strlen(bstr("day")) > 0) wprintf("?day=%s", bstr("day"));
+                                       wprintf("\">"
                                                "<img align=\"middle\" src=\"static/addevent_24x.gif\" "
                                                "border=\"0\"><span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("Add new event")
+                                               "</span></a></li>\n", _("Add new event")
                                        );
                                        break;
                                case VIEW_TASKS:
                                        wprintf(
-                                               "<td><a href=\"display_enter\">"
+                                               "<li class=\"newmess\">"
+                                               "<a href=\"display_enter\">"
                                                "<img align=\"middle\" src=\"static/newmess3_24x.gif\" "
                                                "border=\"0\"><span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("Add new task")
+                                               "</span></a></li>\n", _("Add new task")
                                        );
                                        break;
                                case VIEW_NOTES:
                                        wprintf(
-                                               "<td><a href=\"display_enter\">"
+                                               "<li class=\"enternewnote\">"
+                                               "<a href=\"javascript:add_new_note();\">"
                                                "<img align=\"middle\" src=\"static/enternewnote_24x.gif\" "
                                                "border=\"0\"><span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("Add new note")
+                                               "</span></a></li>\n", _("Add new note")
                                        );
                                        break;
                                case VIEW_WIKI:
-                                       /* Don't let users create unlinked pages. */
+                                       safestrncpy(buf, bstr("page"), sizeof buf);
+                                       str_wiki_index(buf);
+                                       wprintf(
+                                               "<li class=\"newmess\">"
+                                               "<a href=\"display_enter?wikipage=%s\">"
+                                               "<img align=\"middle\" src=\"static/newmess3_24x.gif\" "
+                                               "border=\"0\"><span class=\"navbar_link\">"
+                                               "%s"
+                                               "</span></a></li>\n", buf, _("Edit this page")
+                                       );
+                                       break;
+                               case VIEW_MAILBOX:
+                                       wprintf(
+                                               "<li class=\"newmess\">"
+                                               "<a href=\"display_enter\">"
+                                               "<img align=\"middle\" src=\"static/newmess3_24x.gif\" "
+                                               "border=\"0\"><span class=\"navbar_link\">"
+                                               "%s"
+                                               "</span></a></li>\n", _("Write mail")
+                                       );
                                        break;
                                default:
                                        wprintf(
-                                               "<td><a href=\"display_enter\">"
+                                               "<li class=\"newmess\">"
+                                               "<a href=\"display_enter\">"
                                                "<img align=\"middle\" src=\"static/newmess3_24x.gif\" "
                                                "border=\"0\"><span class=\"navbar_link\">"
                                                "%s"
-                                               "</span></a></td>\n", _("Enter a message")
+                                               "</span></a></li>\n", _("Enter a message")
                                        );
                                        break;
                        }
                }
 
                if (navbar_style == navbar_default) wprintf(
-                       "<td>"
+                       "<li class=\"skipthisroom\">"
                        "<a href=\"skip\" "
-                       "TITLE=\"%s\">"
+                       "title=\"%s\">"
                        "<img align=\"middle\" src=\"static/skipthisroom_24x.gif\" border=\"0\">"
                        "<span class=\"navbar_link\">%s</span></a>"
-                       "</td>\n",
+                       "</li>\n",
                        _("Leave all messages marked as unread, go to next room with unread messages"),
                        _("Skip this room")
                );
 
                if (navbar_style == navbar_default) wprintf(
-                       "<td>"
+                       "<li class=\"markngo\">"
                        "<a href=\"gotonext\" "
-                       "TITLE=\"%s\">"
+                       "title=\"%s\">"
                        "<img align=\"middle\" src=\"static/markngo_24x.gif\" border=\"0\">"
                        "<span class=\"navbar_link\">%s</span></a>"
-                       "</td>\n",
+                       "</li>\n",
                        _("Mark all messages as read, go to next room with unread messages"),
                        _("Goto next room")
                );
 
-               wprintf("</tr></table></div>\n");
+               wprintf("</ul></div>\n");
        }
 
 }
 
 
-
-
-
-/*
- * back end routine to take the session to a new room
+/**
+ * \brief back end routine to take the session to a new room
+ * \param gname room to go to
  *
  */
 int gotoroom(char *gname)
@@ -573,11 +724,11 @@ int gotoroom(char *gname)
        static long ls = (-1L);
        int err = 0;
 
-       /* store ungoto information */
+       /** store ungoto information */
        strcpy(WC->ugname, WC->wc_roomname);
        WC->uglsn = ls;
 
-       /* move to the new room */
+       /** move to the new room */
        serv_printf("GOTO %s", gname);
        serv_getln(buf, sizeof buf);
        if (buf[0] != '2') {
@@ -602,6 +753,7 @@ int gotoroom(char *gname)
        WC->wc_view = extract_int(&buf[4], 11);
        WC->wc_default_view = extract_int(&buf[4], 12);
        WC->wc_is_trash = extract_int(&buf[4], 13);
+       WC->room_flags2 = extract_int(&buf[4], 14);
 
        if (WC->is_aide)
                WC->is_room_aide = WC->is_aide;
@@ -616,9 +768,12 @@ int gotoroom(char *gname)
 }
 
 
-/*
- * Locate the room on the march list which we most want to go to.  Each room
+/**
+ * \brief Locate the room on the march list which we most want to go to.  
+ * Each room
  * is measured given a "weight" of preference based on various factors.
+ * \param desired_floor the room number on the citadel server
+ * \return the roomname
  */
 char *pop_march(int desired_floor)
 {
@@ -655,7 +810,8 @@ char *pop_march(int desired_floor)
 
 
 
-/* Goto next room having unread messages.
+/**
+ *\brief Goto next room having unread messages.
  * We want to skip over rooms that the user has already been to, and take the
  * user back to the lobby when done.  The room we end up in is placed in
  * newroom - which is set to 0 (the lobby) initially.
@@ -664,11 +820,13 @@ 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];
 
-       /* First check to see if the march-mode list is already allocated.
+       /**
+        * First check to see if the march-mode list is already allocated.
         * If it is, pop the first room off the list and go there.
         */
 
@@ -677,23 +835,27 @@ 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;
+                                       }
                                }
                        }
-/* add _BASEROOM_ to the end of the march list, so the user will end up
- * in the system base room (usually the Lobby>) at the end of the loop
- */
+               /**
+                * add _BASEROOM_ to the end of the march list, so the user will end up
+                * in the system base room (usually the Lobby>) at the end of the loop
+                */
                mptr = (struct march *) malloc(sizeof(struct march));
                mptr->next = NULL;
                strcpy(mptr->march_name, "_BASEROOM_");
@@ -705,10 +867,10 @@ void gotonext(void)
                                mptr2 = mptr2->next;
                        mptr2->next = mptr;
                }
-/*
- * ...and remove the room we're currently in, so a <G>oto doesn't make us
- * walk around in circles
- */
+               /**
               * ...and remove the room we're currently in, so a <G>oto doesn't make us
               * walk around in circles
               */
                remove_march(WC->wc_roomname);
        }
        if (WC->march != NULL) {
@@ -722,6 +884,10 @@ void gotonext(void)
 }
 
 
+/**
+ * \brief goto next room
+ * \param next_room next room to go to
+ */
 void smart_goto(char *next_room) {
        gotoroom(next_room);
        readloop("readnew");
@@ -729,25 +895,20 @@ void smart_goto(char *next_room) {
 
 
 
-/*
- * mark all messages in current room as having been read
+/**
+ * \brief mark all messages in current room as having been read
  */
 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;
-       }
 }
 
 
-/*
- * un-goto the previous room
+/**
+ * \brief un-goto the previous room
  */
 void ungoto(void)
 {
@@ -776,11 +937,11 @@ void ungoto(void)
 
 
 
-/*
- * Set/clear/read the "self-service list subscribe" flag for a room
+/**
+ * \brief Set/clear/read the "self-service list subscribe" flag for a room
  * 
- * Set 'newval' to 0 to clear, 1 to set, any other value to leave unchanged.
- * Always returns the new value.
+ * \param newval set to 0 to clear, 1 to set, any other value to leave unchanged.
+ * \return return the new value.
  */
 
 int self_service(int newval) {
@@ -838,21 +999,22 @@ int self_service(int newval) {
 
 
 
-/*
- * display the form for editing a room
+/**
+ * \brief display the form for editing a room
  */
 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;
@@ -880,10 +1042,11 @@ 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);
 
-       /* print the tabbed dialog */
+       /** print the tabbed dialog */
        wprintf("<br />"
                "<div class=\"fix_scrollbar_bug\">"
                "<TABLE border=0 cellspacing=0 cellpadding=0 width=100%%>"
@@ -891,10 +1054,10 @@ void display_editroom(void)
                "<TD>&nbsp;</TD>\n");
 
        if (!strcmp(tab, "admin")) {
-               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
+               wprintf("<TD class=\"roomops_cell_label\"><SPAN CLASS=\"tablabel\">");
        }
        else {
-               wprintf("<TD BGCOLOR=\"#CCCCCC\"><a href=\"display_editroom&tab=admin\">");
+               wprintf("<TD class=\"roomops_cell_edit\"><a href=\"display_editroom&tab=admin\">");
        }
        wprintf(_("Administration"));
        if (!strcmp(tab, "admin")) {
@@ -907,10 +1070,10 @@ void display_editroom(void)
        wprintf("<TD>&nbsp;</TD>\n");
 
        if (!strcmp(tab, "config")) {
-               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
+               wprintf("<TD class=\"roomops_cell_label\"><SPAN CLASS=\"tablabel\">");
        }
        else {
-               wprintf("<TD BGCOLOR=\"#CCCCCC\"><a href=\"display_editroom&tab=config\">");
+               wprintf("<TD class=\"roomops_cell_edit\"><a href=\"display_editroom&tab=config\">");
        }
        wprintf(_("Configuration"));
        if (!strcmp(tab, "config")) {
@@ -923,10 +1086,10 @@ void display_editroom(void)
        wprintf("<TD>&nbsp;</TD>\n");
 
        if (!strcmp(tab, "expire")) {
-               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
+               wprintf("<TD class=\"roomops_cell_label\"><SPAN CLASS=\"tablabel\">");
        }
        else {
-               wprintf("<TD BGCOLOR=\"#CCCCCC\"><a href=\"display_editroom&tab=expire\">");
+               wprintf("<TD class=\"roomops_cell_edit\"><a href=\"display_editroom&tab=expire\">");
        }
        wprintf(_("Message expire policy"));
        if (!strcmp(tab, "expire")) {
@@ -939,10 +1102,10 @@ void display_editroom(void)
        wprintf("<TD>&nbsp;</TD>\n");
 
        if (!strcmp(tab, "access")) {
-               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
+               wprintf("<TD class=\"roomops_cell_label\"><SPAN CLASS=\"tablabel\">");
        }
        else {
-               wprintf("<TD BGCOLOR=\"#CCCCCC\"><a href=\"display_editroom&tab=access\">");
+               wprintf("<TD class=\"roomops_cell_edit\"><a href=\"display_editroom&tab=access\">");
        }
        wprintf(_("Access controls"));
        if (!strcmp(tab, "access")) {
@@ -955,10 +1118,10 @@ void display_editroom(void)
        wprintf("<TD>&nbsp;</TD>\n");
 
        if (!strcmp(tab, "sharing")) {
-               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
+               wprintf("<TD class=\"roomops_cell_label\"><SPAN CLASS=\"tablabel\">");
        }
        else {
-               wprintf("<TD BGCOLOR=\"#CCCCCC\"><a href=\"display_editroom&tab=sharing\">");
+               wprintf("<TD class=\"roomops_cell_edit\"><a href=\"display_editroom&tab=sharing\">");
        }
        wprintf(_("Sharing"));
        if (!strcmp(tab, "sharing")) {
@@ -971,10 +1134,10 @@ void display_editroom(void)
        wprintf("<TD>&nbsp;</TD>\n");
 
        if (!strcmp(tab, "listserv")) {
-               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
+               wprintf("<TD class=\"roomops_cell_label\"><SPAN CLASS=\"tablabel\">");
        }
        else {
-               wprintf("<TD BGCOLOR=\"#CCCCCC\"><a href=\"display_editroom&tab=listserv\">");
+               wprintf("<TD class=\"roomops_cell_edit\"><a href=\"display_editroom&tab=listserv\">");
        }
        wprintf(_("Mailing list service"));
        if (!strcmp(tab, "listserv")) {
@@ -987,11 +1150,11 @@ void display_editroom(void)
        wprintf("<TD>&nbsp;</TD>\n");
 
        wprintf("</TR></TABLE></div>\n");
-       /* end tabbed dialog */ 
+       /** end tabbed dialog */        
 
-       /* begin content of whatever tab is open now */
+       /** begin content of whatever tab is open now */
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<TABLE border=0 width=100%% bgcolor=\"#FFFFFF\">\n"
+               "<TABLE class=\"roomops_background\">\n"
                "<TR><TD>\n");
 
        if (!strcmp(tab, "admin")) {
@@ -1013,6 +1176,7 @@ void display_editroom(void)
 
        if (!strcmp(tab, "config")) {
                wprintf("<FORM METHOD=\"POST\" action=\"editroom\">\n");
+               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
        
                wprintf("<UL><LI>");
                wprintf(_("Name of room: "));
@@ -1043,7 +1207,7 @@ void display_editroom(void)
                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\" ");
@@ -1051,14 +1215,14 @@ void display_editroom(void)
                    (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\" ");
                if ((er_flags & QR_PRIVATE) &&
                    (er_flags & QR_PASSWORDED))
                        wprintf("CHECKED ");
                wprintf("> ");
-               wprintf(_("Private - require password:"));
+               wprintf(_("Private - require password: "));
                wprintf("\n<INPUT TYPE=\"text\" NAME=\"er_password\" VALUE=\"%s\" MAXLENGTH=\"9\">\n",
                        er_password);
        
@@ -1088,7 +1252,13 @@ void display_editroom(void)
                wprintf("> ");
                wprintf(_("Read-only room"));
        
-       /* directory stuff */
+               wprintf("\n<LI><INPUT TYPE=\"checkbox\" NAME=\"collabdel\" VALUE=\"yes\" ");
+               if (er_flags2 & QR2_COLLABDEL)
+                       wprintf("CHECKED ");
+               wprintf("> ");
+               wprintf(_("All users allowed to post may also delete messages"));
+       
+               /** directory stuff */
                wprintf("\n<LI><INPUT TYPE=\"checkbox\" NAME=\"directory\" VALUE=\"yes\" ");
                if (er_flags & QR_DIRECTORY)
                        wprintf("CHECKED ");
@@ -1119,7 +1289,7 @@ void display_editroom(void)
                wprintf(_("Visible directory"));
                wprintf("</UL>\n");
        
-       /* end of directory stuff */
+               /** end of directory stuff */
        
                wprintf("<LI><INPUT TYPE=\"checkbox\" NAME=\"network\" VALUE=\"yes\" ");
                if (er_flags & QR_NETWORK)
@@ -1133,7 +1303,13 @@ void display_editroom(void)
                wprintf("> ");
                wprintf(_("Permanent (does not auto-purge)"));
 
-       /* start of anon options */
+               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(_("Anonymous messages"));
@@ -1166,7 +1342,7 @@ void display_editroom(void)
                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);
@@ -1184,13 +1360,13 @@ void display_editroom(void)
        }
 
 
-       /* Sharing the room with other Citadel nodes... */
+       /** Sharing the room with other Citadel nodes... */
        if (!strcmp(tab, "sharing")) {
 
                shared_with = strdup("");
                not_shared_with = strdup("");
 
-               /* Learn the current configuration */
+               /** Learn the current configuration */
                serv_puts("CONF getsys|application/x-citadel-ignet-config");
                serv_getln(buf, sizeof buf);
                if (buf[0]=='1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
@@ -1230,7 +1406,7 @@ void display_editroom(void)
                        }
                }
 
-               /* Display the stuff */
+               /** Display the stuff */
                wprintf("<CENTER><br />"
                        "<TABLE border=1 cellpadding=5><TR>"
                        "<TD><B><I>");
@@ -1241,7 +1417,7 @@ void display_editroom(void)
                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=\"roomops_cell\"><TD>");
                wprintf(_("Remote node name"));
                wprintf("</TD><TD>");
                wprintf(_("Remote room name"));
@@ -1254,9 +1430,9 @@ void display_editroom(void)
                        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);
+                               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) {
@@ -1286,7 +1462,7 @@ void display_editroom(void)
 
                wprintf("</TABLE>\n");
                wprintf("</TD><TD VALIGN=TOP>\n");
-               wprintf("<TABLE border=0 cellpadding=5><TR BGCOLOR=\"#CCCCCC\"><TD>");
+               wprintf("<TABLE border=0 cellpadding=5><TR class=\"roomops_cell\"><TD>");
                wprintf(_("Remote node name"));
                wprintf("</TD><TD>");
                wprintf(_("Remote room name"));
@@ -1297,9 +1473,9 @@ void display_editroom(void)
                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>");
+                               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\" "
@@ -1339,7 +1515,7 @@ void display_editroom(void)
 
        }
 
-       /* Mailing list management */
+       /** Mailing list management */
        if (!strcmp(tab, "listserv")) {
 
                wprintf("<br /><center>"
@@ -1359,10 +1535,9 @@ 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 />");
                        }
@@ -1370,7 +1545,8 @@ void display_editroom(void)
                wprintf("<br /><FORM METHOD=\"POST\" action=\"netedit\">\n"
                        "<INPUT TYPE=\"hidden\" NAME=\"tab\" VALUE=\"listserv\">\n"
                        "<INPUT TYPE=\"hidden\" NAME=\"prefix\" VALUE=\"listrecp|\">\n");
-               wprintf("<INPUT TYPE=\"text\" NAME=\"line\">\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");
 
@@ -1389,10 +1565,10 @@ 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 />");
                        }
@@ -1400,12 +1576,28 @@ void display_editroom(void)
                wprintf("<br /><FORM METHOD=\"POST\" action=\"netedit\">\n"
                        "<INPUT TYPE=\"hidden\" NAME=\"tab\" VALUE=\"listserv\">\n"
                        "<INPUT TYPE=\"hidden\" NAME=\"prefix\" VALUE=\"digestrecp|\">\n");
-               wprintf("<INPUT TYPE=\"text\" NAME=\"line\">\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."));
@@ -1431,7 +1623,7 @@ void display_editroom(void)
        }
 
 
-       /* Mailing list management */
+       /** Mailing list management */
        if (!strcmp(tab, "expire")) {
 
                serv_puts("GPEX room");
@@ -1449,6 +1641,7 @@ void display_editroom(void)
                }
                
                wprintf("<br /><FORM METHOD=\"POST\" action=\"set_room_policy\">\n");
+               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
                wprintf("<TABLE border=0 cellspacing=5>\n");
                wprintf("<TR><TD>");
                wprintf(_("Message expire policy for this room"));
@@ -1517,20 +1710,21 @@ void display_editroom(void)
 
        }
 
-       /* Mailing list management */
+       /** Mailing list management */
        if (!strcmp(tab, "access")) {
                display_whok();
        }
 
-       /* end content of whatever tab is open now */
+       /** end content of whatever tab is open now */
        wprintf("</TD></TR></TABLE></div>\n");
 
+       address_book_popup();
        wDumpContent(1);
 }
 
 
-/* 
- * Toggle self-service list subscription
+/** 
+ * \brief Toggle self-service list subscription
  */
 void toggle_self_service(void) {
        int newval = 0;
@@ -1542,8 +1736,8 @@ void toggle_self_service(void) {
 
 
 
-/*
- * save new parameters for a room
+/**
+ * \brief save new parameters for a room
  */
 void editroom(void)
 {
@@ -1554,6 +1748,9 @@ void editroom(void)
        char er_roomaide[26];
        int er_floor;
        unsigned er_flags;
+       int er_listingorder;
+       int er_defaultview;
+       unsigned er_flags2;
        int bump;
 
 
@@ -1575,6 +1772,9 @@ 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) {
@@ -1626,12 +1826,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 {
@@ -1676,8 +1888,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') {
@@ -1704,8 +1917,8 @@ void editroom(void)
 }
 
 
-/*
- * Display form for Invite, Kick, and show Who Knows a room
+/**
+ * \brief Display form for Invite, Kick, and show Who Knows a room
  */
 void do_invt_kick(void) {
         char buf[SIZ], room[SIZ], username[SIZ];
@@ -1754,8 +1967,8 @@ void do_invt_kick(void) {
 
 
 
-/*
- * Display form for Invite, Kick, and show Who Knows a room
+/**
+ * \brief Display form for Invite, Kick, and show Who Knows a room
  */
 void display_whok(void)
 {
@@ -1778,6 +1991,7 @@ void display_whok(void)
        wprintf("<br /><br />");
        
         wprintf("<CENTER><FORM METHOD=\"POST\" action=\"do_invt_kick\">\n");
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"tab\" VALUE=\"access\">\n");
         wprintf("<SELECT NAME=\"username\" SIZE=\"10\" style=\"width:100%%\">\n");
         serv_puts("WHOK");
@@ -1802,6 +2016,7 @@ void display_whok(void)
 
         wprintf("<CENTER><FORM METHOD=\"POST\" action=\"do_invt_kick\">\n");
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"tab\" VALUE=\"access\">\n");
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
         wprintf(_("Invite:"));
        wprintf(" ");
         wprintf("<input type=\"text\" name=\"username\" style=\"width:100%%\"><br />\n"
@@ -1815,8 +2030,8 @@ void display_whok(void)
 
 
 
-/*
- * display the form for entering a new room
+/**
+ * \brief display the form for entering a new room
  */
 void display_entroom(void)
 {
@@ -1834,7 +2049,7 @@ void display_entroom(void)
 
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n"
-               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<TABLE class=\"roomops_banner\"><TR><TD>"
                "<SPAN CLASS=\"titlebar\">");
        wprintf(_("Create a new room"));
        wprintf("</SPAN>"
@@ -1843,9 +2058,10 @@ void display_entroom(void)
        );
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
+               "<table class=\"roomops_background\"><tr><td>\n");
 
        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(_("Name of room: "));
@@ -1864,13 +2080,14 @@ void display_entroom(void)
                 }
         wprintf("</SELECT>\n");
 
-       /* Our clever little snippet of JavaScript automatically selects
-        * a public room if the view is set to Bulletin Board or wiki, and
-        * it selects a mailbox room otherwise.  The user can override this,
-        * of course.  We also disable the floor selector for mailboxes.
-        */
-       wprintf("<LI>");
-       wprintf(_("Default view for room: "));
+               /**
+                * Our clever little snippet of JavaScript automatically selects
+                * a public room if the view is set to Bulletin Board or wiki, and
+                * it selects a mailbox room otherwise.  The user can override this,
+                * of course.  We also disable the floor selector for mailboxes.
+                */
+               wprintf("<LI>");
+               wprintf(_("Default view for room: "));
         wprintf("<SELECT NAME=\"er_view\" SIZE=\"1\" OnChange=\""
                "       if ( (this.form.er_view.value == 0)             "
                "          || (this.form.er_view.value == 6) ) {        "
@@ -1883,10 +2100,12 @@ 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");
 
@@ -1952,8 +2171,8 @@ void display_entroom(void)
 
 
 
-/*
- * support function for entroom() -- sets the default view 
+/**
+ * \brief support function for entroom() -- sets the default view 
  */
 void er_set_default_view(int newview) {
 
@@ -1988,8 +2207,8 @@ void er_set_default_view(int newview) {
 
 
 
-/*
- * enter a new room
+/**
+ * \brief enter a new room
  */
 void entroom(void)
 {
@@ -2037,14 +2256,14 @@ void entroom(void)
 }
 
 
-/*
- * display the screen to enter a private room
+/**
+ * \brief display the screen to enter a private room
  */
 void display_private(char *rname, int req_pass)
 {
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"banner\">\n"
-               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<TABLE class=\"roomops_banner\"><TR><TD>"
                "<SPAN CLASS=\"titlebar\">");
        wprintf(_("Go to a hidden room"));
        wprintf("</SPAN>"
@@ -2053,7 +2272,7 @@ void display_private(char *rname, int req_pass)
        );
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
+               "<table class=\"roomops_background\"><tr><td>\n");
 
        wprintf("<CENTER>\n");
        wprintf("<br />");
@@ -2065,9 +2284,10 @@ void display_private(char *rname, int req_pass)
        wprintf("\n<br /><br />");
 
        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"
+               "cellpadding=\"5\" class=\"roomops_background_alt\">\n"
                "<TR><TD>");
        wprintf(_("Enter room name:"));
        wprintf("</TD><TD>"
@@ -2093,8 +2313,8 @@ void display_private(char *rname, int req_pass)
        wDumpContent(1);
 }
 
-/* 
- * goto a private room
+/**
+ * \brief goto a private room
  */
 void goto_private(void)
 {
@@ -2128,15 +2348,15 @@ void goto_private(void)
 }
 
 
-/*
- * display the screen to zap a room
+/**
+ * \brief display the screen to zap a room
  */
 void display_zap(void)
 {
        output_headers(1, 1, 2, 0, 0, 0);
 
        wprintf("<div id=\"banner\">\n");
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
+       wprintf("<TABLE class=\"roomops_zap\"><TR><TD>");
        wprintf("<SPAN CLASS=\"titlebar\">");
        wprintf(_("Zap (forget/unsubscribe) the current room"));
        wprintf("</SPAN>\n");
@@ -2148,6 +2368,7 @@ void display_zap(void)
                "to do?<br />\n"), WC->wc_roomname);
 
        wprintf("<FORM METHOD=\"POST\" action=\"zap\">\n");
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
        wprintf("<INPUT TYPE=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Zap this room"));
        wprintf("&nbsp;");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
@@ -2156,15 +2377,16 @@ void display_zap(void)
 }
 
 
-/* 
- * zap a room
+/**
+ * \brief zap a room
  */
 void zap(void)
 {
        char buf[SIZ];
        char final_destination[SIZ];
 
-       /* If the forget-room routine fails for any reason, we fall back
+       /**
+        * If the forget-room routine fails for any reason, we fall back
         * to the current room; otherwise, we go to the Lobby
         */
        strcpy(final_destination, WC->wc_roomname);
@@ -2185,8 +2407,8 @@ void zap(void)
 
 
 
-/*
- * Delete the current room
+/**
+ * \brief Delete the current room
  */
 void delete_room(void)
 {
@@ -2205,8 +2427,8 @@ void delete_room(void)
 
 
 
-/*
- * Perform changes to a room's network configuration
+/**
+ * \brief Perform changes to a room's network configuration
  */
 void netedit(void) {
        FILE *fp;
@@ -2216,6 +2438,7 @@ void netedit(void) {
        char cmpa1[SIZ];
        char cmpb0[SIZ];
        char cmpb1[SIZ];
+       int i, num_addrs;
 
        if (strlen(bstr("line"))==0) {
                display_editroom();
@@ -2240,7 +2463,7 @@ void netedit(void) {
                return;
        }
 
-       /* This loop works for add *or* remove.  Spiffy, eh? */
+       /** This loop works for add *or* remove.  Spiffy, eh? */
        while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
                extract_token(cmpa0, buf, 0, '|', sizeof cmpa0);
                extract_token(cmpa1, buf, 1, '|', sizeof cmpa1);
@@ -2267,7 +2490,22 @@ void netedit(void) {
        }
 
        if (strlen(bstr("add_button")) > 0) {
-               serv_puts(line);
+               num_addrs = num_tokens(bstr("line"), ',');
+               if (num_addrs < 2) {
+                       /* just adding one node or address */
+                       serv_puts(line);
+               }
+               else {
+                       /* adding multiple addresses separated by commas */
+                       for (i=0; i<num_addrs; ++i) {
+                               strcpy(line, bstr("prefix"));
+                               extract_token(buf, bstr("line"), i, ',', sizeof buf);
+                               striplt(buf);
+                               strcat(line, buf);
+                               strcat(line, bstr("suffix"));
+                               serv_puts(line);
+                       }
+               }
        }
 
        serv_puts("000");
@@ -2277,28 +2515,32 @@ void netedit(void) {
 
 
 
-/*
- * Convert a room name to a folder-ish-looking name.
+/**
+ * \brief Convert a room name to a folder-ish-looking name.
+ * \param folder the folderish name
+ * \param room the room name
+ * \param floor the floor name
+ * \param is_mailbox is it a mailbox?
  */
 void room_to_folder(char *folder, char *room, int floor, int is_mailbox)
 {
        int i;
 
-       /*
+       /**
         * For mailboxes, just do it straight...
         */
        if (is_mailbox) {
                sprintf(folder, "My folders|%s", room);
        }
 
-       /*
+       /**
         * Otherwise, prefix the floor name as a "public folders" moniker
         */
        else {
                sprintf(folder, "%s|%s", floorlist[floor], room);
        }
 
-       /*
+       /**
         * Replace "\" characters with "|" for pseudo-folder-delimiting
         */
        for (i=0; i<strlen(folder); ++i) {
@@ -2309,8 +2551,9 @@ void room_to_folder(char *folder, char *room, int floor, int is_mailbox)
 
 
 
-/*
- * Back end for change_view()
+/**
+ * \brief Back end for change_view()
+ * \param newview set newview???
  */
 void do_change_view(int newview) {
        char buf[SIZ];
@@ -2323,8 +2566,8 @@ void do_change_view(int newview) {
 
 
 
-/*
- * Change the view for this room
+/**
+ * \brief Change the view for this room
  */
 void change_view(void) {
        int view;
@@ -2334,8 +2577,11 @@ void change_view(void) {
 }
 
 
-/*
- * One big expanded tree list view --- like a folder list
+/**
+ * \brief One big expanded tree list view --- like a folder list
+ * \param fold the folder to view
+ * \param max_folders how many folders???
+ * \param num_floors hom many floors???
  */
 void do_folder_view(struct folder *fold, int max_folders, int num_floors) {
        char buf[SIZ];
@@ -2346,13 +2592,13 @@ void do_folder_view(struct folder *fold, int max_folders, int num_floors) {
 
        parents = malloc(max_folders * sizeof(int));
 
-       /* BEGIN TREE MENU */
+       /** BEGIN TREE MENU */
        wprintf("<div id=\"roomlist_div\">Loading folder list...</div>\n");
 
-       /* include NanoTree */
+       /** include NanoTree */
        wprintf("<script type=\"text/javascript\" src=\"static/nanotree.js\"></script>\n");
 
-       /* initialize NanoTree */
+       /** initialize NanoTree */
        wprintf("<script type=\"text/javascript\">                      \n"
                "       showRootNode = false;                           \n"
                "       sortNodes = false;                              \n"
@@ -2412,6 +2658,9 @@ void do_folder_view(struct folder *fold, int max_folders, int num_floors) {
                else if (fold[i].view == VIEW_CALENDAR) {
                        wprintf("'static/calarea_16x.gif'");
                }
+               else if (fold[i].view == VIEW_CALBRIEF) {
+                       wprintf("'static/calarea_16x.gif'");
+               }
                else if (fold[i].view == VIEW_TASKS) {
                        wprintf("'static/taskmanag_16x.gif'");
                }
@@ -2442,11 +2691,14 @@ void do_folder_view(struct folder *fold, int max_folders, int num_floors) {
        );
 
        free(parents);
-       /* END TREE MENU */
+       /** END TREE MENU */
 }
 
-/*
- * Boxes and rooms and lists ... oh my!
+/**
+ * \brief Boxes and rooms and lists ... oh my!
+ * \param fold the folder to view
+ * \param max_folders how many folders???
+ * \param num_floors hom many floors???
  */
 void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
        char buf[256];
@@ -2469,7 +2721,7 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
        boxes_per_column = (nf / columns);
        if (boxes_per_column < 1) boxes_per_column = 1;
 
-       /* Outer table (for columnization) */
+       /** Outer table (for columnization) */
        wprintf("<TABLE BORDER=0 WIDTH=96%% CELLPADDING=5>"
                "<tr><td valign=top>");
 
@@ -2497,7 +2749,7 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
                strcpy(old_floor_name, floor_name);
 
                if (levels == 1) {
-                       /* Begin inner box */
+                       /** Begin inner box */
                        stresc(boxtitle, floor_name, 1, 0);
                        svprintf("BOXTITLE", WCS_STRING, boxtitle);
                        do_template("beginbox");
@@ -2537,21 +2789,27 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
                        wprintf("<br />\n");
                }
        }
-       /* End the final inner box */
+       /** End the final inner box */
        do_template("endbox");
 
        wprintf("</TD></TR></TABLE>\n");
 }
 
-
+/**
+ * \brief print a floor div???
+ * \param which_floordiv name of the floordiv???
+ */
 void set_floordiv_expanded(char *which_floordiv) {
        begin_ajax_response();
        safestrncpy(WC->floordiv_expanded, which_floordiv, sizeof WC->floordiv_expanded);
        end_ajax_response();
 }
 
-/*
- *
+/**
+ * \brief view the iconbar
+ * \param fold the folder to view
+ * \param max_folders how many folders???
+ * \param num_floors hom many floors???
  */
 void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
        char buf[256];
@@ -2577,14 +2835,14 @@ void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
 
                if ( (strcasecmp(floor_name, old_floor_name))
                   && (strlen(old_floor_name) > 0) ) {
-                       /* End inner box */
+                       /** End inner box */
                        wprintf("<br>\n");
-                       wprintf("</div>\n");    /* floordiv */
+                       wprintf("</div>\n");    /** floordiv */
                }
                strcpy(old_floor_name, floor_name);
 
                if (levels == 1) {
-                       /* Begin floor */
+                       /** Begin floor */
                        stresc(floordivtitle, floor_name, 0, 0);
                        sprintf(floordiv_id, "floordiv%d", i);
                        wprintf("<span class=\"ib_roomlist_floor\" "
@@ -2603,13 +2861,16 @@ void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
                        wprintf("&nbsp;");
                        if (levels>2) for (t=0; t<(levels-2); ++t) wprintf("&nbsp;");
 
-                       /* choose the icon */
+                       /** choose the icon */
                        if (fold[i].view == VIEW_ADDRESSBOOK) {
                                icon = "viewcontacts_16x.gif" ;
                        }
                        else if (fold[i].view == VIEW_CALENDAR) {
                                icon = "calarea_16x.gif" ;
                        }
+                       else if (fold[i].view == VIEW_CALBRIEF) {
+                               icon = "calarea_16x.gif" ;
+                       }
                        else if (fold[i].view == VIEW_TASKS) {
                                icon = "taskmanag_16x.gif" ;
                        }
@@ -2651,13 +2912,13 @@ void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
                                wprintf("</i>");
                        }
                        wprintf("<br />");
-                       wprintf("</div>\n");    /* roomdiv */
+                       wprintf("</div>\n");    /** roomdiv */
                }
        }
-       wprintf("</div>\n");    /* floordiv */
+       wprintf("</div>\n");    /** floordiv */
 
 
-       /* BEGIN: The old invisible pixel trick, to get our JavaScript to initialize */
+       /** BEGIN: The old invisible pixel trick, to get our JavaScript to initialize */
        wprintf("<img src=\"static/blank.gif\" onLoad=\"\n");
 
        num_drop_targets = 0;
@@ -2679,14 +2940,16 @@ void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
        }
 
        wprintf("\">\n");
-       /* END: The old invisible pixel trick, to get our JavaScript to initialize */
+       /** END: The old invisible pixel trick, to get our JavaScript to initialize */
 }
 
 
 
-/*
- * Show the room list.  (only should get called by
+/**
+ * \brief Show the room list.  
+ * (only should get called by
  * knrooms() because that's where output_headers() is called from)
+ * \param viewpref the view preferences???
  */
 
 void list_all_rooms_by_floor(char *viewpref) {
@@ -2699,9 +2962,9 @@ void list_all_rooms_by_floor(char *viewpref) {
        int i, j;
        int ra_flags = 0;
        int flags = 0;
-       int num_floors = 1;     /* add an extra one for private folders */
+       int num_floors = 1;     /** add an extra one for private folders */
 
-       /* If our cached folder list is very old, burn it. */
+       /** If our cached folder list is very old, burn it. */
        if (WC->cache_fold != NULL) {
                if ((time(NULL) - WC->cache_timestamp) > 300) {
                        free(WC->cache_fold);
@@ -2709,16 +2972,16 @@ void list_all_rooms_by_floor(char *viewpref) {
                }
        }
 
-       /* Can we do the iconbar roomlist from cache? */
+       /** Can we do the iconbar roomlist from cache? */
        if ((WC->cache_fold != NULL) && (!strcasecmp(viewpref, "iconbar"))) {
                do_iconbar_view(WC->cache_fold, WC->cache_max_folders, WC->cache_num_floors);
                return;
        }
 
-       /* Grab the floor table so we know how to build the list... */
+       /** Grab the floor table so we know how to build the list... */
        load_floorlist();
 
-       /* Start with the mailboxes */
+       /** Start with the mailboxes */
        max_folders = 1;
        alloc_folders = 1;
        fold = malloc(sizeof(struct folder));
@@ -2726,7 +2989,7 @@ void list_all_rooms_by_floor(char *viewpref) {
        strcpy(fold[0].name, "My folders");
        fold[0].is_mailbox = 1;
 
-       /* Then add floors */
+       /** Then add floors */
        serv_puts("LFLR");
        serv_getln(buf, sizeof buf);
        if (buf[0]=='1') while(serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
@@ -2741,7 +3004,10 @@ void list_all_rooms_by_floor(char *viewpref) {
                ++num_floors;
        }
 
-       /* Now add rooms */
+       /** refresh the messages index for this room */
+//     serv_puts("GOTO ");
+//     while (serv_getln(buf, sizeof buf), strcmp(buf, "000"));
+       /** Now add rooms */
        serv_puts("LKRA");
        serv_getln(buf, sizeof buf);
        if (buf[0]=='1') while(serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
@@ -2769,7 +3035,7 @@ void list_all_rooms_by_floor(char *viewpref) {
                ++max_folders;
        }
 
-       /* Bubble-sort the folder list */
+       /** Bubble-sort the folder list */
        for (i=0; i<max_folders; ++i) {
                for (j=0; j<(max_folders-1)-i; ++j) {
                        if (fold[j].is_mailbox == fold[j+1].is_mailbox) {
@@ -2822,15 +3088,17 @@ void list_all_rooms_by_floor(char *viewpref) {
 }
 
 
-/* Do either a known rooms list or a folders list, depending on the
+/**
+ * \brief Do either a known rooms list or a folders list, depending on the
  * user's preference
  */
-void knrooms() {
+void knrooms(void)
+{
        char listviewpref[SIZ];
 
        output_headers(1, 1, 2, 0, 0, 0);
 
-       /* Determine whether the user is trying to change views */
+       /** Determine whether the user is trying to change views */
        if (bstr("view") != NULL) {
                if (strlen(bstr("view")) > 0) {
                        set_preference("roomlistview", bstr("view"), 1);
@@ -2844,9 +3112,9 @@ void knrooms() {
                strcpy(listviewpref, "rooms");
        }
 
-       /* title bar */
+       /** title bar */
        wprintf("<div id=\"banner\">\n"
-               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<TABLE class=\"roomops_banner\"><TR><TD>"
                "<SPAN CLASS=\"titlebar\">"
        );
        if (!strcasecmp(listviewpref, "rooms")) {
@@ -2860,7 +3128,7 @@ void knrooms() {
        }
        wprintf("</SPAN></TD>\n");
 
-       /* offer the ability to switch views */
+       /** offer the ability to switch views */
        wprintf("<TD ALIGN=RIGHT><FORM NAME=\"roomlistomatic\">\n"
                "<SELECT NAME=\"newview\" SIZE=\"1\" "
                "OnChange=\"location.href=roomlistomatic.newview.options"
@@ -2885,15 +3153,15 @@ void knrooms() {
                "</div>\n"
                "<div id=\"content\">\n");
 
-       /* Display the room list in the user's preferred format */
+       /** Display the room list in the user's preferred format */
        list_all_rooms_by_floor(listviewpref);
        wDumpContent(1);
 }
 
 
 
-/* 
- * Set the message expire policy for this room and/or floor
+/**
+ * \brief Set the message expire policy for this room and/or floor
  */
 void set_room_policy(void) {
        char buf[SIZ];
@@ -2918,3 +3186,5 @@ void set_room_policy(void) {
 
        display_editroom();
 }
+
+/*@}*/