]> code.citadel.org Git - citadel.git/blobdiff - webcit/roomops.c
* Unfinished code is now disabled.
[citadel.git] / webcit / roomops.c
index c175208539060652b614bc2a1765b4cabe7e7197..a128ba8bf4311ecf2ad7f4ae9d464b46f5be871c 100644 (file)
@@ -1,19 +1,17 @@
 /*
  * $Id$
+ * Lots of different room-related operations.
  */
-/**
- * \defgroup RoomOps Lots of different room-related operations.
- * \ingroup CitadelCommunitacion
- */
-/*@{*/
-#include "webcit.h"
 
-char floorlist[128][SIZ]; /**< list of our floor names */
+#include "webcit.h"
+#include "webserver.h"
+#define MAX_FLOORS 128
+char floorlist[MAX_FLOORS][SIZ]; /**< list of our floor names */
 
 char *viewdefs[9]; /**< the different kinds of available views */
 
-/**
- * \brief initialize the viewdefs with localized strings
+/*
+ * Initialize the viewdefs with localized strings
  */
 void initialize_viewdefs(void) {
        viewdefs[0] = _("Bulletin Board");
@@ -27,10 +25,8 @@ void initialize_viewdefs(void) {
        viewdefs[8] = _("Journal");
 }
 
-/**
- * \brief      Determine which views are allowed as the default for creating a new room.
- *
- * \param      which_view      The view ID being queried.
+/*
+ * Determine which views are allowed as the default for creating a new room.
  */
 int is_view_allowed_as_default(int which_view)
 {
@@ -41,23 +37,29 @@ int is_view_allowed_as_default(int which_view)
                case VIEW_CALENDAR:     return(1);
                case VIEW_TASKS:        return(1);
                case VIEW_NOTES:        return(1);
-               case VIEW_WIKI:         return(0);      /**< because it isn't finished yet */
+
+#ifdef TECH_PREVIEW
+               case VIEW_WIKI:         return(1);
+#else /* TECH_PREVIEW */
+               case VIEW_WIKI:         return(0);      /* because it isn't finished yet */
+#endif /* TECH_PREVIEW */
+
                case VIEW_CALBRIEF:     return(0);
                case VIEW_JOURNAL:      return(0);
-               default:                return(0);      /**< should never get here */
+               default:                return(0);      /* should never get here */
        }
 }
 
 
-/**
- * \brief load the list of floors
+/*
+ * load the list of floors
  */
 void load_floorlist(void)
 {
        int a;
        char buf[SIZ];
 
-       for (a = 0; a < 128; ++a)
+       for (a = 0; a < MAX_FLOORS; ++a)
                floorlist[a][0] = 0;
 
        serv_puts("LFLR");
@@ -72,10 +74,8 @@ void load_floorlist(void)
 }
 
 
-/**
- * \brief      Free a session's march list
- *
- * \param      wcf             Pointer to session being cleared
+/*
+ * Free a session's march list
  */
 void free_march_list(struct wcsession *wcf)
 {
@@ -91,8 +91,8 @@ void free_march_list(struct wcsession *wcf)
 
 
 
-/**
- * \brief remove a room from the march list
+/*
+ * remove a room from the march list
  */
 void remove_march(char *aaa)
 {
@@ -122,9 +122,8 @@ void remove_march(char *aaa)
 
 
 
-/**
- * \brief display rooms in tree structure???
- * \param rp the roomlist to build a tree from
+/*
+ * display rooms in tree structure
  */
 void room_tree_list(struct roomlisting *rp)
 {
@@ -427,7 +426,7 @@ void embed_search_o_matic(void) {
                "type=\"text\" name=\"query\" size=\"15\" maxlength=\"128\" "
                "id=\"search_name\" class=\"inputbox\">\n"
        );
-       wprintf("</select></form>\n");
+       wprintf("</form>\n");
 }
 
 
@@ -441,8 +440,11 @@ void embed_search_o_matic(void) {
 
 void embed_room_banner(char *got, int navbar_style) {
        char buf[256];
+       char buf2[1024];
        char sanitized_roomname[256];
-
+       char with_files[256];
+       int file_count=0;
+       
        /**
         * We need to have the information returned by a GOTO server command.
         * If it isn't supplied, we fake it by issuing our own GOTO.
@@ -472,12 +474,28 @@ void embed_room_banner(char *got, int navbar_style) {
        WC->new_mail = extract_int(&got[4], 9);
        WC->wc_view = extract_int(&got[4], 11);
 
-       stresc(sanitized_roomname, WC->wc_roomname, 1, 1);
+       /* Is this a directory room and does it contain files and how many? */
+       if ((WC->room_flags & QR_DIRECTORY) && (WC->room_flags & QR_VISDIR))
+       {
+               serv_puts("RDIR");
+               serv_getln(buf2, sizeof buf2);
+               if (buf2[0] == '1') while (serv_getln(buf2, sizeof buf2), strcmp(buf2, "000"))
+                       file_count++;
+               snprintf (with_files, sizeof with_files, 
+                         "; <a href=\"display_room_directory\"> %d %s </a>", 
+                         file_count, 
+                         ((file_count>1) || (file_count == 0)  ? _("files") : _("file")));
+       }
+       else
+               strcpy (with_files, "");
+               
+       stresc(sanitized_roomname, 256, WC->wc_roomname, 1, 1);
        svprintf("ROOMNAME", WCS_STRING, "%s", sanitized_roomname);
        svprintf("NUMMSGS", WCS_STRING,
-               _("%d new of %d messages"),
+               _("%d new of %d messages%s"),
                extract_int(&got[4], 1),
-               extract_int(&got[4], 2)
+               extract_int(&got[4], 2),
+               with_files
        );
        svcallback("ROOMPIC", embed_room_graphic);
        svcallback("ROOMINFO", readinfo);
@@ -815,8 +833,9 @@ char *pop_march(int desired_floor)
 
 
 
-/**
- *\brief Goto next room having unread messages.
+/*
+ * Goto next room having unread messages.
+ *
  * We want to skip over rooms that the user has already been to, and take the
  * user back to the lobby when done.  The room we end up in is placed in
  * newroom - which is set to 0 (the lobby) initially.
@@ -826,11 +845,13 @@ char *pop_march(int desired_floor)
 void gotonext(void)
 {
        char buf[256];
-       struct march *mptr, *mptr2;
+       struct march *mptr = NULL;
+       struct march *mptr2 = NULL;
        char room_name[128];
        char next_room[128];
+       int ELoop = 0;
 
-       /**
+       /*
         * First check to see if the march-mode list is already allocated.
         * If it is, pop the first room off the list and go there.
         */
@@ -840,6 +861,14 @@ void gotonext(void)
                serv_getln(buf, sizeof buf);
                if (buf[0] == '1')
                        while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+                               if (IsEmptyStr(buf)) {
+                                       if (ELoop > 10000)
+                                               return;
+                                       if (ELoop % 100 == 0)
+                                               sleeeeeeeeeep(1);
+                                       ELoop ++;
+                                       continue;                                       
+                               }
                                extract_token(room_name, buf, 0, '|', sizeof room_name);
                                if (strcasecmp(room_name, WC->wc_roomname)) {
                                        mptr = (struct march *) malloc(sizeof(struct march));
@@ -847,17 +876,15 @@ void gotonext(void)
                                        safestrncpy(mptr->march_name, room_name, sizeof mptr->march_name);
                                        mptr->march_floor = extract_int(buf, 2);
                                        mptr->march_order = extract_int(buf, 3);
-                                       if (WC->march == NULL) {
+                                       if (WC->march == NULL) 
                                                WC->march = mptr;
-                                       } else {
-                                               mptr2 = WC->march;
-                                               while (mptr2->next != NULL)
-                                                       mptr2 = mptr2->next;
+                                       else 
                                                mptr2->next = mptr;
-                                       }
+                                       mptr2 = mptr;
                                }
+                               buf[0] = '\0';
                        }
-               /**
+               /*
                 * add _BASEROOM_ to the end of the march list, so the user will end up
                 * in the system base room (usually the Lobby>) at the end of the loop
                 */
@@ -874,7 +901,7 @@ void gotonext(void)
                                mptr2 = mptr2->next;
                        mptr2->next = mptr;
                }
-               /**
+               /*
                 * ...and remove the room we're currently in, so a <G>oto doesn't make us
                 * walk around in circles
                 */
@@ -891,9 +918,8 @@ void gotonext(void)
 }
 
 
-/**
- * \brief goto next room
- * \param next_room next room to go to
+/*
+ * goto next room
  */
 void smart_goto(char *next_room) {
        gotoroom(next_room);
@@ -902,8 +928,8 @@ void smart_goto(char *next_room) {
 
 
 
-/**
- * \brief mark all messages in current room as having been read
+/*
+ * mark all messages in current room as having been read
  */
 void slrp_highest(void)
 {
@@ -914,8 +940,8 @@ void slrp_highest(void)
 }
 
 
-/**
- * \brief un-goto the previous room
+/*
+ * un-goto the previous room
  */
 void ungoto(void)
 {
@@ -940,15 +966,25 @@ void ungoto(void)
        smart_goto(buf);
 }
 
+typedef struct __room_states {
+       char password[SIZ];
+       char dirname[SIZ];
+       char name[SIZ];
+       int flags;
+       int floor;
+       int order;
+       int view;
+       int flags2;
+} room_states;
 
 
 
 
-/**
- * \brief Set/clear/read the "self-service list subscribe" flag for a room
+/*
+ * Set/clear/read the "self-service list subscribe" flag for a room
  * 
- * \param newval set to 0 to clear, 1 to set, any other value to leave unchanged.
- * \return return the new value.
+ * set newval to 0 to clear, 1 to set, any other value to leave unchanged.
+ * returns the new value.
  */
 
 int self_service(int newval) {
@@ -958,7 +994,7 @@ int self_service(int newval) {
        char name[SIZ];
        char password[SIZ];
        char dirname[SIZ];
-       int flags, floor, order, view, flags2;
+        int flags, floor, order, view, flags2;
 
        serv_puts("GETR");
        serv_getln(buf, sizeof buf);
@@ -1001,13 +1037,71 @@ int self_service(int newval) {
 
 }
 
+int is_selflist(room_states *RoomFlags)
+{
+       return ((RoomFlags->flags2 & QR2_SELFLIST) != 0);
+}
+
+int is_publiclist(room_states *RoomFlags)
+{
+       return ((RoomFlags->flags2 & QR2_SMTP_PUBLIC) != 0);
+}
+
+int is_moderatedlist(room_states *RoomFlags)
+{
+       return ((RoomFlags->flags2 & QR2_MODERATED) != 0);
+}
 
+/*
+ * Set/clear/read the "self-service list subscribe" flag for a room
+ * 
+ * set newval to 0 to clear, 1 to set, any other value to leave unchanged.
+ * returns the new value.
+ */
 
+int get_roomflags(room_states *RoomOps) 
+{
+       char buf[SIZ];
+       
+       serv_puts("GETR");
+       serv_getln(buf, sizeof buf);
+       if (buf[0] != '2') return(0);
 
+       extract_token(RoomOps->name, &buf[4], 0, '|', sizeof RoomOps->name);
+       extract_token(RoomOps->password, &buf[4], 1, '|', sizeof RoomOps->password);
+       extract_token(RoomOps->dirname, &buf[4], 2, '|', sizeof RoomOps->dirname);
+       RoomOps->flags = extract_int(&buf[4], 3);
+       RoomOps->floor = extract_int(&buf[4], 4);
+       RoomOps->order = extract_int(&buf[4], 5);
+       RoomOps->view = extract_int(&buf[4], 6);
+       RoomOps->flags2 = extract_int(&buf[4], 7);
+       return (1);
+}
 
+int set_roomflags(room_states *RoomOps)
+{
+       char buf[SIZ];
 
-/**
- * \brief display the form for editing a room
+       serv_printf("SETR %s|%s|%s|%d|0|%d|%d|%d|%d",
+                   RoomOps->name, 
+                   RoomOps->password, 
+                   RoomOps->dirname, 
+                   RoomOps->flags,
+                   RoomOps->floor, 
+                   RoomOps->order, 
+                   RoomOps->view, 
+                   RoomOps->flags2);
+       serv_getln(buf, sizeof buf);
+       return (1);
+}
+
+
+
+
+
+
+/*
+ * display the form for editing a room
  */
 void display_editroom(void)
 {
@@ -1031,26 +1125,14 @@ void display_editroom(void)
        int roomvalue = 0;
        int floorpolicy = 0;
        int floorvalue = 0;
+       char pop3_host[128];
+       char pop3_user[32];
+       int bg = 0;
 
        tab = bstr("tab");
        if (IsEmptyStr(tab)) tab = "admin";
 
        load_floorlist();
-       serv_puts("GETR");
-       serv_getln(buf, sizeof buf);
-
-       if (buf[0] != '2') {
-               strcpy(WC->ImportantMessage, &buf[4]);
-               display_main_menu();
-               return;
-       }
-       extract_token(er_name, &buf[4], 0, '|', sizeof er_name);
-       extract_token(er_password, &buf[4], 1, '|', sizeof er_password);
-       extract_token(er_dirname, &buf[4], 2, '|', sizeof er_dirname);
-       er_flags = extract_int(&buf[4], 3);
-       er_floor = extract_int(&buf[4], 4);
-       er_flags2 = extract_int(&buf[4], 7);
-
        output_headers(1, 1, 1, 0, 0, 0);
 
        wprintf("<div class=\"fix_scrollbar_bug\">");
@@ -1070,70 +1152,86 @@ void display_editroom(void)
        }
        wprintf("</li>\n");
 
-       wprintf("<li class=\"tablabel ");
-       if (!strcmp(tab, "config")) {
-               wprintf(" tab_cell_label\">");
-               wprintf(_("Configuration"));
-       }
-       else {
-               wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=config\">");
-               wprintf(_("Configuration"));
-               wprintf("</a>");
-       }
-       wprintf("</li>\n");
+       if ( (WC->axlevel >= 6) || (WC->is_room_aide) ) {
+
+               wprintf("<li class=\"tablabel ");
+               if (!strcmp(tab, "config")) {
+                       wprintf(" tab_cell_label\">");
+                       wprintf(_("Configuration"));
+               }
+               else {
+                       wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=config\">");
+                       wprintf(_("Configuration"));
+                       wprintf("</a>");
+               }
+               wprintf("</li>\n");
+
+               wprintf("<li class=\"tablabel ");
+               if (!strcmp(tab, "expire")) {
+                       wprintf(" tab_cell_label\">");
+                       wprintf(_("Message expire policy"));
+               }
+               else {
+                       wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=expire\">");
+                       wprintf(_("Message expire policy"));
+                       wprintf("</a>");
+               }
+               wprintf("</li>\n");
        
-       wprintf("<li class=\"tablabel ");
-       if (!strcmp(tab, "expire")) {
-               wprintf(" tab_cell_label\">");
-               wprintf(_("Message expire policy"));
-       }
-       else {
-               wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=expire\">");
-               wprintf(_("Message expire policy"));
-               wprintf("</a>");
-       }
-       wprintf("</li>\n");
+               wprintf("<li class=\"tablabel ");
+               if (!strcmp(tab, "access")) {
+                       wprintf(" tab_cell_label\">");
+                       wprintf(_("Access controls"));
+               }
+               else {
+                       wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=access\">");
+                       wprintf(_("Access controls"));
+                       wprintf("</a>");
+               }
+               wprintf("</li>\n");
 
-       wprintf("<li class=\"tablabel ");
-       if (!strcmp(tab, "access")) {
-               wprintf(" tab_cell_label\">");
-               wprintf(_("Access controls"));
-       }
-       else {
-               wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=access\">");
-               wprintf(_("Access controls"));
-               wprintf("</a>");
-       }
-       wprintf("</li>\n");
+               wprintf("<li class=\"tablabel ");
+               if (!strcmp(tab, "sharing")) {
+                       wprintf(" tab_cell_label\">");
+                       wprintf(_("Sharing"));
+               }
+               else {
+                       wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=sharing\">");
+                       wprintf(_("Sharing"));
+                       wprintf("</a>");
+               }
+               wprintf("</li>\n");
+
+               wprintf("<li class=\"tablabel ");
+               if (!strcmp(tab, "listserv")) {
+                       wprintf(" tab_cell_label\">");
+                       wprintf(_("Mailing list service"));
+               }
+               else {
+                       wprintf("< tab_cell_edit\"><a href=\"display_editroom&tab=listserv\">");
+                       wprintf(_("Mailing list service"));
+                       wprintf("</a>");
+               }
+               wprintf("</li>\n");
 
-       wprintf("<li class=\"tablabel ");
-       if (!strcmp(tab, "sharing")) {
-               wprintf(" tab_cell_label\">");
-               wprintf(_("Sharing"));
-       }
-       else {
-               wprintf(" tab_cell_edit\"><a href=\"display_editroom&tab=sharing\">");
-               wprintf(_("Sharing"));
-               wprintf("</a>");
        }
-       wprintf("</li>\n");
 
        wprintf("<li class=\"tablabel ");
-       if (!strcmp(tab, "listserv")) {
+       if (!strcmp(tab, "feeds")) {
                wprintf(" tab_cell_label\">");
-               wprintf(_("Mailing list service"));
+               wprintf(_("Remote retrieval"));
        }
        else {
-               wprintf("< tab_cell_edit\"><a href=\"display_editroom&tab=listserv\">");
-               wprintf(_("Mailing list service"));
+               wprintf("< tab_cell_edit\"><a href=\"display_editroom&tab=feeds\">");
+               wprintf(_("Remote retrieval"));
                wprintf("</a>");
        }
        wprintf("</li>\n");
 
        wprintf("</ul>\n");
-       /** end tabbed dialog */        
+       /* end tabbed dialog */ 
 
-       /** begin content of whatever tab is open now */
+       /* begin content of whatever tab is open now */
 
        if (!strcmp(tab, "admin")) {
                wprintf("<div class=\"tabcontent\">");
@@ -1156,193 +1254,241 @@ void display_editroom(void)
 
        if (!strcmp(tab, "config")) {
                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(_("Name of room: "));
-               wprintf("<input type=\"text\" NAME=\"er_name\" VALUE=\"%s\" MAXLENGTH=\"%d\">\n",
-                       er_name,
-                       (sizeof(er_name)-1)
-               );
-       
-               wprintf("<li>");
-               wprintf(_("Resides on floor: "));
-               wprintf("<select NAME=\"er_floor\" SIZE=\"1\">\n");
-               for (i = 0; i < 128; ++i)
-                       if (!IsEmptyStr(floorlist[i])) {
-                               wprintf("<OPTION ");
-                               if (i == er_floor)
-                                       wprintf("SELECTED ");
-                               wprintf("VALUE=\"%d\">", i);
-                               escputs(floorlist[i]);
-                               wprintf("</OPTION>\n");
-                       }
-               wprintf("</select>\n");
-       
-               wprintf("<li>");
-               wprintf(_("Type of room:"));
-               wprintf("<ul>\n");
-
-               wprintf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"public\" ");
-               if ((er_flags & QR_PRIVATE) == 0)
-               wprintf("CHECKED ");
-               wprintf("> ");
-               wprintf(_("Public (automatically appears to everyone)"));
-               wprintf("\n");
-
-               wprintf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"hidden\" ");
-               if ((er_flags & QR_PRIVATE) &&
-                   (er_flags & QR_GUESSNAME))
-                       wprintf("CHECKED ");
-               wprintf("> ");
-               wprintf(_("Private - 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("\n<input type=\"text\" NAME=\"er_password\" VALUE=\"%s\" MAXLENGTH=\"9\">\n",
-                       er_password);
-       
-               wprintf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"invonly\" ");
-               if ((er_flags & QR_PRIVATE)
-                   && ((er_flags & QR_GUESSNAME) == 0)
-                   && ((er_flags & QR_PASSWORDED) == 0))
-                       wprintf("CHECKED ");
-               wprintf("> ");
-               wprintf(_("Private - invitation only"));
-       
-               wprintf("\n<li><input type=\"checkbox\" NAME=\"bump\" VALUE=\"yes\" ");
-               wprintf("> ");
-               wprintf(_("If private, cause current users to forget room"));
-       
-               wprintf("\n</ul>\n");
-       
-               wprintf("<li><input type=\"checkbox\" NAME=\"prefonly\" VALUE=\"yes\" ");
-               if (er_flags & QR_PREFONLY)
-                       wprintf("CHECKED ");
-               wprintf("> ");
-               wprintf(_("Preferred users only"));
-       
-               wprintf("\n<li><input type=\"checkbox\" NAME=\"readonly\" VALUE=\"yes\" ");
-               if (er_flags & QR_READONLY)
-                       wprintf("CHECKED ");
-               wprintf("> ");
-               wprintf(_("Read-only room"));
-       
-               wprintf("\n<li><input type=\"checkbox\" NAME=\"collabdel\" VALUE=\"yes\" ");
-               if (er_flags2 & QR2_COLLABDEL)
-                       wprintf("CHECKED ");
-               wprintf("> ");
-               wprintf(_("All users allowed to post may also delete messages"));
-       
-               /** directory stuff */
-               wprintf("\n<li><input type=\"checkbox\" NAME=\"directory\" VALUE=\"yes\" ");
-               if (er_flags & QR_DIRECTORY)
-                       wprintf("CHECKED ");
-               wprintf("> ");
-               wprintf(_("File directory room"));
+               serv_puts("GETR");
+               serv_getln(buf, sizeof buf);
 
-               wprintf("\n<ul><li>");
-               wprintf(_("Directory name: "));
-               wprintf("<input type=\"text\" NAME=\"er_dirname\" VALUE=\"%s\" MAXLENGTH=\"14\">\n",
-                       er_dirname);
+               if (!strncmp(buf, "550", 3)) {
+                       wprintf("<br><br><div align=center>%s</div><br><br>\n",
+                               _("Higher access is required to access this function.")
+                       );
+               }
+               else if (buf[0] != '2') {
+                       wprintf("<br><br><div align=center>%s</div><br><br>\n", &buf[4]);
+               }
+               else {
+                       extract_token(er_name, &buf[4], 0, '|', sizeof er_name);
+                       extract_token(er_password, &buf[4], 1, '|', sizeof er_password);
+                       extract_token(er_dirname, &buf[4], 2, '|', sizeof er_dirname);
+                       er_flags = extract_int(&buf[4], 3);
+                       er_floor = extract_int(&buf[4], 4);
+                       er_flags2 = extract_int(&buf[4], 7);
+       
+                       wprintf("<form method=\"POST\" action=\"editroom\">\n");
+                       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+               
+                       wprintf("<ul><li>");
+                       wprintf(_("Name of room: "));
+                       wprintf("<input type=\"text\" NAME=\"er_name\" VALUE=\"%s\" MAXLENGTH=\"%d\">\n",
+                               er_name,
+                               (sizeof(er_name)-1)
+                       );
+               
+                       wprintf("<li>");
+                       wprintf(_("Resides on floor: "));
+                       wprintf("<select NAME=\"er_floor\" SIZE=\"1\"");
+                       if (er_flags & QR_MAILBOX)
+                               wprintf("disabled >\n");
+                       for (i = 0; i < 128; ++i)
+                               if (!IsEmptyStr(floorlist[i])) {
+                                       wprintf("<OPTION ");
+                                       if (i == er_floor )
+                                               wprintf("SELECTED ");
+                                       wprintf("VALUE=\"%d\">", i);
+                                       escputs(floorlist[i]);
+                                       wprintf("</OPTION>\n");
+                               }
+                       wprintf("</select>\n");
 
-               wprintf("<li><input type=\"checkbox\" NAME=\"ulallowed\" VALUE=\"yes\" ");
-               if (er_flags & QR_UPLOAD)
-                       wprintf("CHECKED ");
-               wprintf("> ");
-               wprintf(_("Uploading allowed"));
+                       wprintf("<li>");
+                       wprintf(_("Type of room:"));
+                       wprintf("<ul>\n");
        
-               wprintf("\n<li><input type=\"checkbox\" NAME=\"dlallowed\" VALUE=\"yes\" ");
-               if (er_flags & QR_DOWNLOAD)
-                       wprintf("CHECKED ");
-               wprintf("> ");
-               wprintf(_("Downloading allowed"));
+                       wprintf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"public\" ");
+                       if ((er_flags & (QR_PRIVATE + QR_MAILBOX)) == 0)
+                               wprintf("CHECKED ");
+                       wprintf("OnChange=\""
+                               "       if (this.form.type[0].checked == true) {        "
+                               "               this.form.er_floor.disabled = false;    "
+                               "       }                                               "
+                               "\"> ");
+                       wprintf(_("Public (automatically appears to everyone)"));
+                       wprintf("\n");
        
-               wprintf("\n<li><input type=\"checkbox\" NAME=\"visdir\" VALUE=\"yes\" ");
-               if (er_flags & QR_VISDIR)
-                       wprintf("CHECKED ");
-               wprintf("> ");
-               wprintf(_("Visible directory"));
-               wprintf("</ul>\n");
+                       wprintf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"hidden\" ");
+                       if ((er_flags & QR_PRIVATE) &&
+                       (er_flags & QR_GUESSNAME))
+                               wprintf("CHECKED ");
+                       wprintf(" OnChange=\""
+                               "       if (this.form.type[1].checked == true) {        "
+                               "               this.form.er_floor.disabled = false;    "
+                               "       }                                               "
+                               "\"> ");
+                       wprintf(_("Private - hidden (accessible to anyone who knows its name)"));
+               
+                       wprintf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"passworded\" ");
+                       if ((er_flags & QR_PRIVATE) &&
+                       (er_flags & QR_PASSWORDED))
+                               wprintf("CHECKED ");
+                       wprintf(" OnChange=\""
+                               "       if (this.form.type[2].checked == true) {        "
+                               "               this.form.er_floor.disabled = false;    "
+                               "       }                                               "
+                               "\"> ");
+                       wprintf(_("Private - require password: "));
+                       wprintf("\n<input type=\"text\" NAME=\"er_password\" VALUE=\"%s\" MAXLENGTH=\"9\">\n",
+                               er_password);
+               
+                       wprintf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"invonly\" ");
+                       if ((er_flags & QR_PRIVATE)
+                       && ((er_flags & QR_GUESSNAME) == 0)
+                       && ((er_flags & QR_PASSWORDED) == 0))
+                               wprintf("CHECKED ");
+                       wprintf(" OnChange=\""
+                               "       if (this.form.type[3].checked == true) {        "
+                               "               this.form.er_floor.disabled = false;    "
+                               "       }                                               "
+                               "\"> ");
+                       wprintf(_("Private - invitation only"));
+               
+                       wprintf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"personal\" ");
+                       if (er_flags & QR_MAILBOX)
+                               wprintf("CHECKED ");
+                       wprintf (" OnChange=\""
+                               "       if (this.form.type[4].checked == true) {        "
+                               "               this.form.er_floor.disabled = true;     "
+                               "       }                                               "
+                               "\"> ");
+                       wprintf(_("Personal (mailbox for you only)"));
+                       
+                       wprintf("\n<li><input type=\"checkbox\" NAME=\"bump\" VALUE=\"yes\" ");
+                       wprintf("> ");
+                       wprintf(_("If private, cause current users to forget room"));
+               
+                       wprintf("\n</ul>\n");
+               
+                       wprintf("<li><input type=\"checkbox\" NAME=\"prefonly\" VALUE=\"yes\" ");
+                       if (er_flags & QR_PREFONLY)
+                               wprintf("CHECKED ");
+                       wprintf("> ");
+                       wprintf(_("Preferred users only"));
+               
+                       wprintf("\n<li><input type=\"checkbox\" NAME=\"readonly\" VALUE=\"yes\" ");
+                       if (er_flags & QR_READONLY)
+                               wprintf("CHECKED ");
+                       wprintf("> ");
+                       wprintf(_("Read-only room"));
+               
+                       wprintf("\n<li><input type=\"checkbox\" NAME=\"collabdel\" VALUE=\"yes\" ");
+                       if (er_flags2 & QR2_COLLABDEL)
+                               wprintf("CHECKED ");
+                       wprintf("> ");
+                       wprintf(_("All users allowed to post may also delete messages"));
+               
+                       /** directory stuff */
+                       wprintf("\n<li><input type=\"checkbox\" NAME=\"directory\" VALUE=\"yes\" ");
+                       if (er_flags & QR_DIRECTORY)
+                               wprintf("CHECKED ");
+                       wprintf("> ");
+                       wprintf(_("File directory room"));
        
-               /** end of directory stuff */
+                       wprintf("\n<ul><li>");
+                       wprintf(_("Directory name: "));
+                       wprintf("<input type=\"text\" NAME=\"er_dirname\" VALUE=\"%s\" MAXLENGTH=\"14\">\n",
+                               er_dirname);
        
-               wprintf("<li><input type=\"checkbox\" NAME=\"network\" VALUE=\"yes\" ");
-               if (er_flags & QR_NETWORK)
-                       wprintf("CHECKED ");
-               wprintf("> ");
-               wprintf(_("Network shared room"));
-
-               wprintf("\n<li><input type=\"checkbox\" NAME=\"permanent\" VALUE=\"yes\" ");
-               if (er_flags & QR_PERMANENT)
+                       wprintf("<li><input type=\"checkbox\" NAME=\"ulallowed\" VALUE=\"yes\" ");
+                       if (er_flags & QR_UPLOAD)
                        wprintf("CHECKED ");
-               wprintf("> ");
-               wprintf(_("Permanent (does not auto-purge)"));
-
-               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"));
-               wprintf("<ul>\n");
+                       wprintf("> ");
+                       wprintf(_("Uploading allowed"));
+               
+                       wprintf("\n<li><input type=\"checkbox\" NAME=\"dlallowed\" VALUE=\"yes\" ");
+                       if (er_flags & QR_DOWNLOAD)
+                               wprintf("CHECKED ");
+                       wprintf("> ");
+                       wprintf(_("Downloading allowed"));
+               
+                       wprintf("\n<li><input type=\"checkbox\" NAME=\"visdir\" VALUE=\"yes\" ");
+                       if (er_flags & QR_VISDIR)
+                               wprintf("CHECKED ");
+                       wprintf("> ");
+                       wprintf(_("Visible directory"));
+                       wprintf("</ul>\n");
+               
+                       /** end of directory stuff */
        
-               wprintf("<li><input type=\"radio\" NAME=\"anon\" VALUE=\"no\" ");
-               if (((er_flags & QR_ANONONLY) == 0)
-                   && ((er_flags & QR_ANONOPT) == 0))
-                       wprintf("CHECKED ");
-               wprintf("> ");
-               wprintf(_("No anonymous messages"));
+                       wprintf("<li><input type=\"checkbox\" NAME=\"network\" VALUE=\"yes\" ");
+                       if (er_flags & QR_NETWORK)
+                               wprintf("CHECKED ");
+                       wprintf("> ");
+                       wprintf(_("Network shared room"));
        
-               wprintf("\n<li><input type=\"radio\" NAME=\"anon\" VALUE=\"anononly\" ");
-               if (er_flags & QR_ANONONLY)
-                       wprintf("CHECKED ");
-               wprintf("> ");
-               wprintf(_("All messages are anonymous"));
+                       wprintf("\n<li><input type=\"checkbox\" NAME=\"permanent\" VALUE=\"yes\" ");
+                       if (er_flags & QR_PERMANENT)
+                               wprintf("CHECKED ");
+                       wprintf("> ");
+                       wprintf(_("Permanent (does not auto-purge)"));
        
-               wprintf("\n<li><input type=\"radio\" NAME=\"anon\" VALUE=\"anon2\" ");
-               if (er_flags & QR_ANONOPT)
-                       wprintf("CHECKED ");
-               wprintf("> ");
-               wprintf(_("Prompt user when entering messages"));
-               wprintf("</ul>\n");
+                       wprintf("\n<li><input type=\"checkbox\" NAME=\"subjectreq\" VALUE=\"yes\" ");
+                       if (er_flags2 & QR2_SUBJECTREQ)
+                               wprintf("CHECKED ");
+                       wprintf("> ");
+                       wprintf(_("Subject Required (Force users to specify a message subject)"));
        
-       /* end of anon options */
+                       /** start of anon options */
+               
+                       wprintf("\n<li>");
+                       wprintf(_("Anonymous messages"));
+                       wprintf("<ul>\n");
+               
+                       wprintf("<li><input type=\"radio\" NAME=\"anon\" VALUE=\"no\" ");
+                       if (((er_flags & QR_ANONONLY) == 0)
+                       && ((er_flags & QR_ANONOPT) == 0))
+                               wprintf("CHECKED ");
+                       wprintf("> ");
+                       wprintf(_("No anonymous messages"));
        
-               wprintf("<li>");
-               wprintf(_("Room aide: "));
-               serv_puts("GETA");
-               serv_getln(buf, sizeof buf);
-               if (buf[0] != '2') {
-                       wprintf("<em>%s</em>\n", &buf[4]);
-               } else {
-                       extract_token(er_roomaide, &buf[4], 0, '|', sizeof er_roomaide);
-                       wprintf("<input type=\"text\" NAME=\"er_roomaide\" VALUE=\"%s\" MAXLENGTH=\"25\">\n", er_roomaide);
+                       wprintf("\n<li><input type=\"radio\" NAME=\"anon\" VALUE=\"anononly\" ");
+                       if (er_flags & QR_ANONONLY)
+                               wprintf("CHECKED ");
+                       wprintf("> ");
+                       wprintf(_("All messages are anonymous"));
+               
+                       wprintf("\n<li><input type=\"radio\" NAME=\"anon\" VALUE=\"anon2\" ");
+                       if (er_flags & QR_ANONOPT)
+                               wprintf("CHECKED ");
+                       wprintf("> ");
+                       wprintf(_("Prompt user when entering messages"));
+                       wprintf("</ul>\n");
+               
+               /* end of anon options */
+               
+                       wprintf("<li>");
+                       wprintf(_("Room aide: "));
+                       serv_puts("GETA");
+                       serv_getln(buf, sizeof buf);
+                       if (buf[0] != '2') {
+                               wprintf("<em>%s</em>\n", &buf[4]);
+                       } else {
+                               extract_token(er_roomaide, &buf[4], 0, '|', sizeof er_roomaide);
+                               wprintf("<input type=\"text\" NAME=\"er_roomaide\" VALUE=\"%s\" MAXLENGTH=\"25\">\n", er_roomaide);
+                       }
+               
+                       wprintf("</ul><CENTER>\n");
+                       wprintf("<input type=\"hidden\" NAME=\"tab\" VALUE=\"config\">\n"
+                               "<input type=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">"
+                               "&nbsp;"
+                               "<input type=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">"
+                               "</CENTER>\n",
+                               _("Save changes"),
+                               _("Cancel")
+                       );
                }
-       
-               wprintf("</ul><CENTER>\n");
-               wprintf("<input type=\"hidden\" NAME=\"tab\" VALUE=\"config\">\n"
-                       "<input type=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">"
-                       "&nbsp;"
-                       "<input type=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">"
-                       "</CENTER>\n",
-                       _("Save changes"),
-                       _("Cancel")
-               );
                wprintf("</div>");
        }
 
 
-       /** Sharing the room with other Citadel nodes... */
+       /* Sharing the room with other Citadel nodes... */
        if (!strcmp(tab, "sharing")) {
                wprintf("<div class=\"tabcontent\">");
 
@@ -1389,7 +1535,7 @@ void display_editroom(void)
                        }
                }
 
-               /** Display the stuff */
+               /* Display the stuff */
                wprintf("<CENTER><br />"
                        "<table border=1 cellpadding=5><tr>"
                        "<td><B><I>");
@@ -1433,10 +1579,8 @@ void display_editroom(void)
                                        urlescputs(remote_room);
                                }
                                wprintf("\">");
-                               wprintf("<input type=\"hidden\" NAME=\"tab\" "
-                                       "VALUE=\"sharing\">\n");
-                               wprintf("<input type=\"hidden\" NAME=\"cmd\" "
-                                       "VALUE=\"remove\">\n");
+                               wprintf("<input type=\"hidden\" NAME=\"tab\" VALUE=\"sharing\">\n");
+                               wprintf("<input type=\"hidden\" NAME=\"cmd\" VALUE=\"remove\">\n");
                                wprintf("<input type=\"submit\" "
                                        "NAME=\"unshare_button\" VALUE=\"%s\">", _("Unshare"));
                                wprintf("</td></tr></form>\n");
@@ -1499,8 +1643,9 @@ void display_editroom(void)
                wprintf("</div>");
        }
 
-       /** Mailing list management */
+       /* Mailing list management */
        if (!strcmp(tab, "listserv")) {
+               room_states RoomFlags;
                wprintf("<div class=\"tabcontent\">");
 
                wprintf("<br /><center>"
@@ -1580,132 +1725,289 @@ void display_editroom(void)
                        _("Add recipients from Contacts or other address books"),
                        _("Add recipients from Contacts or other address books")
                );
-               /** Pop open an address book -- end **/
-
-               wprintf("<hr />");
-               if (self_service(999) == 1) {
-                       wprintf(_("This room is configured to allow "
-                               "self-service subscribe/unsubscribe requests."));
-                       wprintf("<a href=\"toggle_self_service?newval=0&tab=listserv\">");
-                       wprintf(_("Click to disable."));
-                       wprintf("</A><br />\n");
-                       wprintf(_("The URL for subscribe/unsubscribe is: "));
-                       wprintf("<TT>%s://%s/listsub</TT><br />\n",
-                               (is_https ? "https" : "http"),
-                               WC->http_host);
-               }
-               else {
-                       wprintf(_("This room is <i>not</i> configured to allow "
-                               "self-service subscribe/unsubscribe requests."));
-                       wprintf(" <a href=\"toggle_self_service?newval=1&"
-                               "tab=listserv\">");
-                       wprintf(_("Click to enable."));
-                       wprintf("</A><br />\n");
-               }
+               /* Pop open an address book -- end **/
+
+               wprintf("<br />\n<form method=\"GET\" action=\"toggle_self_service\">\n");
+
+               get_roomflags (&RoomFlags);
+               
+               /* Self Service subscription? */
+               wprintf("<table><tr><td>\n");
+               wprintf(_("Allow self-service subscribe/unsubscribe requests."));
+               wprintf("</td><td><input type=\"checkbox\" name=\"QR2_SelfList\" value=\"yes\" %s></td></tr>\n"
+                       " <tr><td colspan=\"2\">\n",
+                       (is_selflist(&RoomFlags))?"checked":"");
+               wprintf(_("The URL for subscribe/unsubscribe is: "));
+               wprintf("<TT>%s://%s/listsub</TT></td></tr>\n",
+                       (is_https ? "https" : "http"),
+                       WC->http_host);
+               /* Public posting? */
+               wprintf("<tr><td>");
+               wprintf(_("Allow non-subscribers to mail to this room."));
+               wprintf("</td><td><input type=\"checkbox\" name=\"QR2_SubsOnly\" value=\"yes\" %s></td></tr>\n",
+                       (is_publiclist(&RoomFlags))?"checked":"");
+               
+               /* Moderated List? */
+               wprintf("<tr><td>");
+               wprintf(_("Room post publication needs Aide permission."));
+               wprintf("</td><td><input type=\"checkbox\" name=\"QR2_Moderated\" value=\"yes\" %s></td></tr>\n",
+                       (is_moderatedlist(&RoomFlags))?"checked":"");
+
 
+               wprintf("<tr><td colspan=\"2\" align=\"center\">"
+                       "<input type=\"submit\" NAME=\"add_button\" VALUE=\"%s\"></td></tr>", _("Save changes"));
+               wprintf("</table></form>");
+                       
 
                wprintf("</CENTER>\n");
                wprintf("</div>");
        }
 
 
-       /** Mailing list management */
+       /* Configuration of The Dreaded Auto-Purger */
        if (!strcmp(tab, "expire")) {
                wprintf("<div class=\"tabcontent\">");
 
                serv_puts("GPEX room");
                serv_getln(buf, sizeof buf);
-               if (buf[0] == '2') {
-                       roompolicy = extract_int(&buf[4], 0);
-                       roomvalue = extract_int(&buf[4], 1);
+               if (!strncmp(buf, "550", 3)) {
+                       wprintf("<br><br><div align=center>%s</div><br><br>\n",
+                               _("Higher access is required to access this function.")
+                       );
                }
-               
-               serv_puts("GPEX floor");
-               serv_getln(buf, sizeof buf);
-               if (buf[0] == '2') {
-                       floorpolicy = extract_int(&buf[4], 0);
-                       floorvalue = extract_int(&buf[4], 1);
+               else if (buf[0] != '2') {
+                       wprintf("<br><br><div align=center>%s</div><br><br>\n", &buf[4]);
                }
+               else {
+                       roompolicy = extract_int(&buf[4], 0);
+                       roomvalue = extract_int(&buf[4], 1);
                
-               wprintf("<br /><form method=\"POST\" action=\"set_room_policy\">\n");
-               wprintf("<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>",
-                       ((roompolicy == 0) ? "CHECKED" : "") );
-               wprintf(_("Use the default policy for this floor"));
-               wprintf("<br />\n");
-               wprintf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"1\" %s>",
-                       ((roompolicy == 1) ? "CHECKED" : "") );
-               wprintf(_("Never automatically expire messages"));
-               wprintf("<br />\n");
-               wprintf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"2\" %s>",
-                       ((roompolicy == 2) ? "CHECKED" : "") );
-               wprintf(_("Expire by message count"));
-               wprintf("<br />\n");
-               wprintf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"3\" %s>",
-                       ((roompolicy == 3) ? "CHECKED" : "") );
-               wprintf(_("Expire by message age"));
-               wprintf("<br />");
-               wprintf(_("Number of messages or days: "));
-               wprintf("<input type=\"text\" NAME=\"roomvalue\" MAXLENGTH=\"5\" VALUE=\"%d\">", roomvalue);
-               wprintf("</td></tr>\n");
-
-               if (WC->axlevel >= 6) {
-                       wprintf("<tr><td COLSPAN=2><hr /></td></tr>\n");
+                       serv_puts("GPEX floor");
+                       serv_getln(buf, sizeof buf);
+                       if (buf[0] == '2') {
+                               floorpolicy = extract_int(&buf[4], 0);
+                               floorvalue = extract_int(&buf[4], 1);
+                       }
+                       
+                       wprintf("<br /><form method=\"POST\" action=\"set_room_policy\">\n");
+                       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+                       wprintf("<table border=0 cellspacing=5>\n");
                        wprintf("<tr><td>");
-                       wprintf(_("Message expire policy for this floor"));
+                       wprintf(_("Message expire policy for this room"));
                        wprintf("<br />(");
-                       escputs(floorlist[WC->wc_floor]);
+                       escputs(WC->wc_roomname);
                        wprintf(")</td><td>");
-                       wprintf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"0\" %s>",
-                               ((floorpolicy == 0) ? "CHECKED" : "") );
-                       wprintf(_("Use the system default"));
+                       wprintf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"0\" %s>",
+                               ((roompolicy == 0) ? "CHECKED" : "") );
+                       wprintf(_("Use the default policy for this floor"));
                        wprintf("<br />\n");
-                       wprintf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"1\" %s>",
-                               ((floorpolicy == 1) ? "CHECKED" : "") );
+                       wprintf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"1\" %s>",
+                               ((roompolicy == 1) ? "CHECKED" : "") );
                        wprintf(_("Never automatically expire messages"));
                        wprintf("<br />\n");
-                       wprintf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"2\" %s>",
-                               ((floorpolicy == 2) ? "CHECKED" : "") );
+                       wprintf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"2\" %s>",
+                               ((roompolicy == 2) ? "CHECKED" : "") );
                        wprintf(_("Expire by message count"));
                        wprintf("<br />\n");
-                       wprintf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"3\" %s>",
-                               ((floorpolicy == 3) ? "CHECKED" : "") );
+                       wprintf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"3\" %s>",
+                               ((roompolicy == 3) ? "CHECKED" : "") );
                        wprintf(_("Expire by message age"));
                        wprintf("<br />");
                        wprintf(_("Number of messages or days: "));
-                       wprintf("<input type=\"text\" NAME=\"floorvalue\" MAXLENGTH=\"5\" VALUE=\"%d\">",
-                               floorvalue);
+                       wprintf("<input type=\"text\" NAME=\"roomvalue\" MAXLENGTH=\"5\" VALUE=\"%d\">", roomvalue);
+                       wprintf("</td></tr>\n");
+       
+                       if (WC->axlevel >= 6) {
+                               wprintf("<tr><td COLSPAN=2><hr /></td></tr>\n");
+                               wprintf("<tr><td>");
+                               wprintf(_("Message expire policy for this floor"));
+                               wprintf("<br />(");
+                               escputs(floorlist[WC->wc_floor]);
+                               wprintf(")</td><td>");
+                               wprintf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"0\" %s>",
+                                       ((floorpolicy == 0) ? "CHECKED" : "") );
+                               wprintf(_("Use the system default"));
+                               wprintf("<br />\n");
+                               wprintf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"1\" %s>",
+                                       ((floorpolicy == 1) ? "CHECKED" : "") );
+                               wprintf(_("Never automatically expire messages"));
+                               wprintf("<br />\n");
+                               wprintf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"2\" %s>",
+                                       ((floorpolicy == 2) ? "CHECKED" : "") );
+                               wprintf(_("Expire by message count"));
+                               wprintf("<br />\n");
+                               wprintf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"3\" %s>",
+                                       ((floorpolicy == 3) ? "CHECKED" : "") );
+                               wprintf(_("Expire by message age"));
+                               wprintf("<br />");
+                               wprintf(_("Number of messages or days: "));
+                               wprintf("<input type=\"text\" NAME=\"floorvalue\" MAXLENGTH=\"5\" VALUE=\"%d\">",
+                                       floorvalue);
+                       }
+       
+                       wprintf("<CENTER>\n");
+                       wprintf("<tr><td COLSPAN=2><hr /><CENTER>\n");
+                       wprintf("<input type=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Save changes"));
+                       wprintf("&nbsp;");
+                       wprintf("<input type=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
+                       wprintf("</CENTER></td><tr>\n");
+       
+                       wprintf("</table>\n"
+                               "<input type=\"hidden\" NAME=\"tab\" VALUE=\"expire\">\n"
+                               "</form>\n"
+                       );
                }
 
-               wprintf("<CENTER>\n");
-               wprintf("<tr><td COLSPAN=2><hr /><CENTER>\n");
-               wprintf("<input type=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Save changes"));
-               wprintf("&nbsp;");
-               wprintf("<input type=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
-               wprintf("</CENTER></td><tr>\n");
-
-               wprintf("</table>\n"
-                       "<input type=\"hidden\" NAME=\"tab\" VALUE=\"expire\">\n"
-                       "</form>\n"
-               );
-
                wprintf("</div>");
        }
 
-       /** Mailing list management */
+       /* Access controls */
        if (!strcmp(tab, "access")) {
                wprintf("<div class=\"tabcontent\">");
                display_whok();
                wprintf("</div>");
        }
 
-       /** end content of whatever tab is open now */
+       /* Fetch messages from remote locations */
+       if (!strcmp(tab, "feeds")) {
+               wprintf("<div class=\"tabcontent\">");
+
+               wprintf("<i>");
+               wprintf(_("Retrieve messages from these remote POP3 accounts and store them in this room:"));
+               wprintf("</i><br />\n");
+
+               wprintf("<table class=\"altern\" border=0 cellpadding=5>"
+                       "<tr class=\"even\"><th>");
+               wprintf(_("Remote host"));
+               wprintf("</th><th>");
+               wprintf(_("User name"));
+               wprintf("</th><th>");
+               wprintf(_("Password"));
+               wprintf("</th><th>");
+               wprintf(_("Keep messages on server?"));
+               wprintf("</th><th> </th></tr>");
+
+               serv_puts("GNET");
+               serv_getln(buf, sizeof buf);
+               bg = 1;
+               if (buf[0]=='1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+                       extract_token(cmd, buf, 0, '|', sizeof cmd);
+                       if (!strcasecmp(cmd, "pop3client")) {
+                               safestrncpy(recp, &buf[11], sizeof recp);
+
+                                bg = 1 - bg;
+                                wprintf("<tr class=\"%s\">",
+                                        (bg ? "even" : "odd")
+                                );
+
+                               wprintf("<td>");
+                               extract_token(pop3_host, buf, 1, '|', sizeof pop3_host);
+                               escputs(pop3_host);
+                               wprintf("</td>");
+
+                               wprintf("<td>");
+                               extract_token(pop3_user, buf, 2, '|', sizeof pop3_user);
+                               escputs(pop3_user);
+                               wprintf("</td>");
+
+                               wprintf("<td>*****</td>");              /* Don't show the password */
+
+                               wprintf("<td>%s</td>", extract_int(buf, 4) ? _("Yes") : _("No"));
+
+                               wprintf("<td class=\"button_link\">");
+                               wprintf(" <a href=\"netedit&cmd=remove&tab=feeds&line=pop3client|");
+                               urlescputs(recp);
+                               wprintf("\">");
+                               wprintf(_("(remove)"));
+                               wprintf("</a></td>");
+                       
+                               wprintf("</tr>");
+                       }
+               }
+
+               wprintf("<form method=\"POST\" action=\"netedit\">\n"
+                       "<tr>"
+                       "<input type=\"hidden\" name=\"tab\" value=\"feeds\">"
+                       "<input type=\"hidden\" name=\"prefix\" value=\"pop3client|\">\n");
+               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+               wprintf("<td>");
+               wprintf("<input type=\"text\" id=\"add_as_pop3host\" NAME=\"line_pop3host\">\n");
+               wprintf("</td>");
+               wprintf("<td>");
+               wprintf("<input type=\"text\" id=\"add_as_pop3user\" NAME=\"line_pop3user\">\n");
+               wprintf("</td>");
+               wprintf("<td>");
+               wprintf("<input type=\"password\" id=\"add_as_pop3pass\" NAME=\"line_pop3pass\">\n");
+               wprintf("</td>");
+               wprintf("<td>");
+               wprintf("<input type=\"checkbox\" id=\"add_as_pop3keep\" NAME=\"line_pop3keep\" VALUE=\"1\">");
+               wprintf("</td>");
+               wprintf("<td>");
+               wprintf("<input type=\"submit\" NAME=\"add_button\" VALUE=\"%s\">", _("Add"));
+               wprintf("</td></tr>");
+               wprintf("</form></table>\n");
+
+               wprintf("<hr>\n");
+
+               wprintf("<i>");
+               wprintf(_("Fetch the following RSS feeds and store them in this room:"));
+               wprintf("</i><br />\n");
+
+               wprintf("<table class=\"altern\" border=0 cellpadding=5>"
+                       "<tr class=\"even\"><th>");
+               wprintf("<img src=\"static/rss_16x.png\" width=\"16\" height=\"16\" alt=\" \"> ");
+               wprintf(_("Feed URL"));
+               wprintf("</th><th>");
+               wprintf("</th></tr>");
+
+               serv_puts("GNET");
+               serv_getln(buf, sizeof buf);
+               bg = 1;
+               if (buf[0]=='1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+                       extract_token(cmd, buf, 0, '|', sizeof cmd);
+                       if (!strcasecmp(cmd, "rssclient")) {
+                               safestrncpy(recp, &buf[10], sizeof recp);
+
+                                bg = 1 - bg;
+                                wprintf("<tr class=\"%s\">",
+                                        (bg ? "even" : "odd")
+                                );
+
+                               wprintf("<td>");
+                               extract_token(pop3_host, buf, 1, '|', sizeof pop3_host);
+                               escputs(pop3_host);
+                               wprintf("</td>");
+
+                               wprintf("<td class=\"button_link\">");
+                               wprintf(" <a href=\"netedit&cmd=remove&tab=feeds&line=rssclient|");
+                               urlescputs(recp);
+                               wprintf("\">");
+                               wprintf(_("(remove)"));
+                               wprintf("</a></td>");
+                       
+                               wprintf("</tr>");
+                       }
+               }
+
+               wprintf("<form method=\"POST\" action=\"netedit\">\n"
+                       "<tr>"
+                       "<input type=\"hidden\" name=\"tab\" value=\"feeds\">"
+                       "<input type=\"hidden\" name=\"prefix\" value=\"rssclient|\">\n");
+               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+               wprintf("<td>");
+               wprintf("<input type=\"text\" id=\"add_as_pop3host\" size=\"72\" "
+                       "maxlength=\"256\" name=\"line_pop3host\">\n");
+               wprintf("</td>");
+               wprintf("<td>");
+               wprintf("<input type=\"submit\" name=\"add_button\" value=\"%s\">", _("Add"));
+               wprintf("</td></tr>");
+               wprintf("</form></table>\n");
+
+               wprintf("</div>");
+       }
+
+
+       /* end content of whatever tab is open now */
        wprintf("</div>\n");
 
        address_book_popup();
@@ -1713,21 +2015,34 @@ void display_editroom(void)
 }
 
 
-/** 
- * \brief Toggle self-service list subscription
+/* 
+ * Toggle self-service list subscription
  */
 void toggle_self_service(void) {
-       int newval = 0;
+       room_states RoomFlags;
+
+       get_roomflags (&RoomFlags);
+
+       /* Yank out the bits we want to change */
+       RoomFlags.flags2 = RoomFlags.flags2 &
+               !(QR2_SELFLIST|QR2_SMTP_PUBLIC|QR2_MODERATED);
+
+       if (!strcasecmp(bstr("QR2_SelfList"), "yes")) 
+               RoomFlags.flags2 = RoomFlags.flags2 | QR2_SELFLIST;
+       if (!strcasecmp(bstr("QR2_SMTP_PUBLIC"), "yes")) 
+               RoomFlags.flags2 = RoomFlags.flags2 | QR2_SMTP_PUBLIC;
+       if (!strcasecmp(bstr("QR2_Moderated"), "yes")) 
+               RoomFlags.flags2 = RoomFlags.flags2 | QR2_MODERATED;
 
-       newval = atoi(bstr("newval"));
-       self_service(newval);
+       set_roomflags (&RoomFlags);
+       
        display_editroom();
 }
 
 
 
-/**
- * \brief save new parameters for a room
+/*
+ * save new parameters for a room
  */
 void editroom(void)
 {
@@ -1804,6 +2119,12 @@ void editroom(void)
        if (!strcmp(buf, "passworded")) {
                er_flags |= (QR_PRIVATE | QR_PASSWORDED);
        }
+       if (!strcmp(buf, "personal")) {
+               er_flags |= QR_MAILBOX;
+       } else {
+               er_flags &= ~QR_MAILBOX;
+       }
+       
        if (!strcmp(bstr("prefonly"), "yes")) {
                er_flags |= QR_PREFONLY;
        } else {
@@ -1816,6 +2137,7 @@ void editroom(void)
                er_flags &= ~QR_READONLY;
        }
 
+       
        if (!strcmp(bstr("collabdel"), "yes")) {
                er_flags2 |= QR2_COLLABDEL;
        } else {
@@ -1907,8 +2229,8 @@ void editroom(void)
 }
 
 
-/**
- * \brief Display form for Invite, Kick, and show Who Knows a room
+/*
+ * Display form for Invite, Kick, and show Who Knows a room
  */
 void do_invt_kick(void) {
         char buf[SIZ], room[SIZ], username[SIZ];
@@ -1957,8 +2279,8 @@ void do_invt_kick(void) {
 
 
 
-/**
- * \brief Display form for Invite, Kick, and show Who Knows a room
+/*
+ * Display form for Invite, Kick, and show Who Knows a room
  */
 void display_whok(void)
 {
@@ -2009,19 +2331,30 @@ void display_whok(void)
        wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
         wprintf(_("Invite:"));
        wprintf(" ");
-        wprintf("<input type=\"text\" name=\"username\" style=\"width:100%%\"><br />\n"
+        wprintf("<input type=\"text\" name=\"username\" id=\"username_id\" style=\"width:100%%\"><br />\n"
                "<input type=\"hidden\" name=\"invite_button\" value=\"Invite\">"
                "<input type=\"submit\" value=\"%s\">"
                "</form></CENTER>\n", _("Invite"));
+               /* Pop open an address book -- begin **/
+               wprintf(
+                       "<a href=\"javascript:PopOpenAddressBook('username_id|%s');\" "
+                       "title=\"%s\">"
+                       "<img align=middle border=0 width=24 height=24 src=\"static/viewcontacts_24x.gif\">"
+                       "&nbsp;%s</a>",
+                       _("User"), 
+                       _("Users"), _("Users")
+               );
+               /* Pop open an address book -- end **/
 
        wprintf("</td></tr></table>\n");
+       address_book_popup();
         wDumpContent(1);
 }
 
 
 
-/**
- * \brief display the form for entering a new room
+/*
+ * display the form for entering a new room
  */
 void display_entroom(void)
 {
@@ -2068,7 +2401,7 @@ void display_entroom(void)
         wprintf("</select>\n");
         wprintf("</td></tr>");
 
-               /**
+               /*
                 * Our clever little snippet of JavaScript automatically selects
                 * a public room if the view is set to Bulletin Board or wiki, and
                 * it selects a mailbox room otherwise.  The user can override this,
@@ -2170,8 +2503,8 @@ void display_entroom(void)
 
 
 
-/**
- * \brief support function for entroom() -- sets the default view 
+/*
+ * support function for entroom() -- sets the default view 
  */
 void er_set_default_view(int newview) {
 
@@ -2206,8 +2539,8 @@ void er_set_default_view(int newview) {
 
 
 
-/**
- * \brief enter a new room
+/*
+ * Create a new room
  */
 void entroom(void)
 {
@@ -2250,6 +2583,10 @@ void entroom(void)
                display_main_menu();
                return;
        }
+       /** TODO: Room created, now udate the left hand icon bar for this user */
+       burn_folder_cache(0);   /* burn the old folder cache */
+       
+       
        gotoroom(er_name);
        do_change_view(er_view);                /* Now go there */
 }
@@ -2406,8 +2743,10 @@ void delete_room(void)
 {
        char buf[SIZ];
 
+       
        serv_puts("KILL 1");
        serv_getln(buf, sizeof buf);
+       burn_folder_cache(0);   /* Burn the cahce of known rooms to update the icon bar */
        if (buf[0] != '2') {
                strcpy(WC->ImportantMessage, &buf[4]);
                display_main_menu();
@@ -2432,14 +2771,27 @@ void netedit(void) {
        char cmpb1[SIZ];
        int i, num_addrs;
 
-       if (IsEmptyStr(bstr("line"))) {
+       if (!IsEmptyStr(bstr("line_pop3host"))) {
+               strcpy(line, bstr("prefix"));
+               strcat(line, bstr("line_pop3host"));
+               strcat(line, "|");
+               strcat(line, bstr("line_pop3user"));
+               strcat(line, "|");
+               strcat(line, bstr("line_pop3pass"));
+               strcat(line, "|");
+               strcat(line, atoi(bstr("line_pop3keep")) ? "1" : "0" );
+               strcat(line, bstr("suffix"));
+       }
+       else if (!IsEmptyStr(bstr("line"))) {
+               strcpy(line, bstr("prefix"));
+               strcat(line, bstr("line"));
+               strcat(line, bstr("suffix"));
+       }
+       else {
                display_editroom();
                return;
        }
 
-       strcpy(line, bstr("prefix"));
-       strcat(line, bstr("line"));
-       strcat(line, bstr("suffix"));
 
        fp = tmpfile();
        if (fp == NULL) {
@@ -2529,7 +2881,13 @@ void room_to_folder(char *folder, char *room, int floor, int is_mailbox)
         * Otherwise, prefix the floor name as a "public folders" moniker
         */
        else {
-               sprintf(folder, "%s|%s", floorlist[floor], room);
+               if (floor > MAX_FLOORS) {
+                       wc_backtrace ();
+                       sprintf(folder, "%%%%%%|%s", room);
+               }
+               else {
+                       sprintf(folder, "%s|%s", floorlist[floor], room);
+               }
        }
 
        /**
@@ -2732,6 +3090,7 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
                   && (!IsEmptyStr(old_floor_name)) ) {
                        /* End inner box */
                        do_template("endbox");
+                       wprintf("<br>");
 
                        ++num_boxes;
                        if ((num_boxes % boxes_per_column) == 0) {
@@ -2745,7 +3104,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");
                }
@@ -2838,7 +3197,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')\">"
@@ -2941,6 +3300,25 @@ void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
 
 
 
+/**
+ * \brief Burn the cached folder list.  
+ * \param age How old the cahce needs to be before we burn it.
+ */
+
+void burn_folder_cache(time_t age)
+{
+       /** If our cached folder list is very old, burn it. */
+       if (WC->cache_fold != NULL) {
+               if ((time(NULL) - WC->cache_timestamp) > age) {
+                       free(WC->cache_fold);
+                       WC->cache_fold = NULL;
+               }
+       }
+}
+
+
+
+
 /**
  * \brief Show the room list.  
  * (only should get called by
@@ -2955,19 +3333,18 @@ void list_all_rooms_by_floor(char *viewpref) {
        struct folder ftmp;
        int max_folders = 0;
        int alloc_folders = 0;
+       int *floor_mapping;
+       int IDMax;
        int i, j;
        int ra_flags = 0;
        int flags = 0;
        int num_floors = 1;     /** add an extra one for private folders */
-
+       char buf2[SIZ];
+       char buf3[SIZ];
+       
        /** If our cached folder list is very old, burn it. */
-       if (WC->cache_fold != NULL) {
-               if ((time(NULL) - WC->cache_timestamp) > 300) {
-                       free(WC->cache_fold);
-                       WC->cache_fold = NULL;
-               }
-       }
-
+       burn_folder_cache(300);
+       
        /** Can we do the iconbar roomlist from cache? */
        if ((WC->cache_fold != NULL) && (!strcasecmp(viewpref, "iconbar"))) {
                do_iconbar_view(WC->cache_fold, WC->cache_max_folders, WC->cache_num_floors);
@@ -2996,10 +3373,20 @@ void list_all_rooms_by_floor(char *viewpref) {
                }
                memset(&fold[max_folders], 0, sizeof(struct folder));
                extract_token(fold[max_folders].name, buf, 1, '|', sizeof fold[max_folders].name);
+               extract_token(buf3, buf, 0, '|', SIZ);
+               fold[max_folders].floor = atol (buf3);
                ++max_folders;
                ++num_floors;
        }
-
+       IDMax = 0;
+       for (i=0; i<num_floors; i++)
+               if (IDMax < fold[i].floor)
+                       IDMax = fold[i].floor;
+       floor_mapping = malloc (sizeof (int) * (IDMax + 1));
+       memset (floor_mapping, 0, sizeof (int) * (IDMax + 1));
+       for (i=0; i<num_floors; i++)
+               floor_mapping[fold[i].floor]=i;
+       
        /** refresh the messages index for this room */
 //     serv_puts("GOTO ");
 //     while (serv_getln(buf, sizeof buf), strcmp(buf, "000"));
@@ -3028,9 +3415,36 @@ void list_all_rooms_by_floor(char *viewpref) {
                                fold[max_folders].floor,
                                fold[max_folders].is_mailbox);
                fold[max_folders].selectable = 1;
+               /* Increase the room count for the associtaed floor */
+               if (fold[max_folders].is_mailbox) {
+                       fold[0].num_rooms++;
+               }
+               else {
+                       i = floor_mapping[fold[max_folders].floor];
+                       fold[i].num_rooms++;
+               }
                ++max_folders;
        }
-
+       
+       /*
+        * Remove any floors that don't have rooms
+        */
+       get_preference("emptyfloors", buf2, sizeof buf2);
+       if (buf2[0]==0 || (strcasecmp(buf2, "no") == 0))
+       {
+               for (i=0; i<num_floors; i++)
+               {
+                       if (fold[i].num_rooms == 0) {
+                               for (j=i; j<max_folders; j++) {
+                                       memcpy(&fold[j], &fold[j+1], sizeof(struct folder));
+                               }
+                               max_folders--;
+                               num_floors--;
+                               i--;
+                       }
+               }
+       }
+       
        /** Bubble-sort the folder list */
        for (i=0; i<max_folders; ++i) {
                for (j=0; j<(max_folders-1)-i; ++j) {
@@ -3081,6 +3495,7 @@ void list_all_rooms_by_floor(char *viewpref) {
        WC->cache_max_folders = max_folders;
        WC->cache_num_floors = num_floors;
        WC->cache_timestamp = time(NULL);
+       free(floor_mapping);
 }