]> code.citadel.org Git - citadel.git/blobdiff - webcit/roomops.c
* Better alignment of system messages
[citadel.git] / webcit / roomops.c
index 06c921049c49487c2486a2870fa20578032b36e0..8f580df660c3fbe37214289de3fa88dbe52f78b3 100644 (file)
 #include <signal.h>
 #include "webcit.h"
 
+struct folder {
+       int floor;
+       char room[SIZ];
+       char name[SIZ];
+       int hasnewmsgs;
+       int is_mailbox;
+       int selectable;
+};
 
 char *viewdefs[] = {
        "Messages",
        "Summary",
-       "Address Book"
+       "Address Book",
+       "Calendar",
+       "Tasks"
 };
 
 char floorlist[128][SIZ];
@@ -91,12 +101,12 @@ void room_tree_list(struct roomlisting *rp)
        char rmname[64];
        int f;
 
-       if (rp == NULL)
+       if (rp == NULL) {
                return;
-
-       if (rp->lnext != NULL) {
-               room_tree_list(rp->lnext);
        }
+
+       room_tree_list(rp->lnext);
+
        strcpy(rmname, rp->rlname);
        f = rp->rlflags;
 
@@ -115,9 +125,7 @@ void room_tree_list(struct roomlisting *rp)
                wprintf("&gt;");
        wprintf("</A><TT> </TT>\n");
 
-       if (rp->rnext != NULL) {
-               room_tree_list(rp->rnext);
-       }
+       room_tree_list(rp->rnext);
        free(rp);
 }
 
@@ -207,25 +215,16 @@ void listrms(char *variety)
 }
 
 
-
-
-
-
-
-
-
 /*
- * list all rooms by floor
+ * list all rooms by floor (only should get called from knrooms() because
+ * that's where output_headers() is called from)
  */
-void list_all_rooms_by_floor(void)
+void tabular_room_list(void)
 {
        int a;
        char buf[SIZ];
 
-       load_floorlist();
-
-       output_headers(1);
-
+       do_template("beginbox_nt");
        wprintf("<TABLE width=100%% border><TR><TH>Floor</TH>");
        wprintf("<TH>Rooms with new messages</TH>");
        wprintf("<TH>Rooms with no new messages</TH></TR>\n");
@@ -261,23 +260,33 @@ void list_all_rooms_by_floor(void)
                        wprintf("</TD></TR>\n");
                }
        wprintf("</TABLE>\n");
+       do_template("endbox");
        wDumpContent(1);
 }
 
 
+
+
+
+
+
+
+
 /*
  * list all forgotten rooms
  */
 void zapped_list(void)
 {
-       output_headers(1);
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770000><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Zapped (forgotten) rooms</B>\n");
-       wprintf("</TD></TR></TABLE><BR>\n");
+       output_headers(3);
+
+       svprintf("BOXTITLE", WCS_STRING, "Zapped (forgotten) rooms");
+       do_template("beginbox");
+
        listrms("LZRM -1");
+
        wprintf("<BR><BR>\n");
        wprintf("Click on any room to un-zap it and goto that room.\n");
+       do_template("endbox");
        wDumpContent(1);
 }
 
@@ -292,7 +301,7 @@ void readinfo(void)
        serv_puts("RINF");
        serv_gets(buf);
        if (buf[0] == '1') {
-               fmout(NULL);
+               fmout(NULL, "CENTER");
        }
 }
 
@@ -310,8 +319,8 @@ void embed_room_graphic(void) {
        serv_puts("OIMG _roompic_");
        serv_gets(buf);
        if (buf[0] == '2') {
-               wprintf("<TD BGCOLOR=444455>");
-               wprintf("<IMG SRC=\"/image&name=_roompic_&room=");
+               wprintf("<TD BGCOLOR=\"#444455\">");
+               wprintf("<IMG HEIGHT=64 SRC=\"/image&name=_roompic_&room=");
                urlescputs(WC->wc_roomname);
                wprintf("\"></TD>");
                serv_puts("CLOS");
@@ -329,8 +338,8 @@ void embed_newmail_button(void) {
                        "<A HREF=\"/dotgoto?room=_MAIL_\">"
                        "<IMG SRC=\"/static/mail.gif\" border=0 "
                        "ALT=\"You have new mail\">"
-                       "<BR><FONT SIZE=2 COLOR=FFFFFF>"
-                       "%d new mail</FONT></A>", WC->new_mail);
+                       "<BR><SPAN CLASS=\"youhavemail\">"
+                       "%d new mail</SPAN></A>", WC->new_mail);
                WC->remember_new_mail = WC->new_mail;
        }
 }
@@ -349,11 +358,24 @@ void embed_view_o_matic(void) {
                "[selectedIndex].value\">\n");
 
        for (i=0; i<(sizeof viewdefs / sizeof (char *)); ++i) {
-               wprintf("<OPTION %s VALUE=\"/changeview?view=%d\">",
-                       ((i == WC->wc_view) ? "SELECTED" : ""),
-                       i );
-               escputs(viewdefs[i]);
-               wprintf("</OPTION>\n");
+               /*
+                * 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) )
+               ) {
+
+                       wprintf("<OPTION %s VALUE=\"/changeview?view=%d\">",
+                               ((i == WC->wc_view) ? "SELECTED" : ""),
+                               i );
+                       escputs(viewdefs[i]);
+                       wprintf("</OPTION>\n");
+               }
        }
        wprintf("</SELECT></FORM>\n");
 }
@@ -372,6 +394,13 @@ void embed_room_banner(char *got) {
                got = fakegot;
        }
 
+       /* 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. */
        WC->new_mail = extract_int(&got[4], 9);
        WC->wc_view = extract_int(&got[4], 11);
@@ -383,6 +412,7 @@ void embed_room_banner(char *got) {
        svcallback("ROOMINFO", readinfo);
        svcallback("YOUHAVEMAIL", embed_newmail_button);
        svcallback("VIEWOMATIC", embed_view_o_matic);
+       svcallback("START", offer_start_page);
 
        do_template("roombanner");
        clear_local_substs();
@@ -460,6 +490,7 @@ void gotoroom(char *gname, int display_name)
        }
        strcpy(WC->wc_roomname, WC->wc_roomname);
        WC->wc_view = extract_int(&buf[4], 11);
+       WC->wc_default_view = extract_int(&buf[4], 12);
 }
 
 
@@ -469,7 +500,7 @@ void gotoroom(char *gname, int display_name)
  */
 char *pop_march(int desired_floor)
 {
-       static char TheRoom[64];
+       static char TheRoom[128];
        int TheFloor = 0;
        int TheOrder = 32767;
        int TheWeight = 0;
@@ -513,7 +544,7 @@ void gotonext(void)
 {
        char buf[SIZ];
        struct march *mptr, *mptr2;
-       char next_room[32];
+       char next_room[128];
 
        /* 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.
@@ -619,6 +650,72 @@ void ungoto(void)
        smart_goto(buf);
 }
 
+
+
+
+
+/*
+ * 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.
+ */
+
+int self_service(int newval) {
+       int current_value = 0;
+       char buf[SIZ];
+       
+       char name[SIZ];
+       char password[SIZ];
+       char dirname[SIZ];
+       int flags, floor, order, view, flags2;
+
+       serv_puts("GETR");
+       serv_gets(buf);
+       if (buf[0] != '2') return(0);
+
+       extract(name, &buf[4], 0);
+       extract(password, &buf[4], 1);
+       extract(dirname, &buf[4], 2);
+       flags = extract_int(&buf[4], 3);
+       floor = extract_int(&buf[4], 4);
+       order = extract_int(&buf[4], 5);
+       view = extract_int(&buf[4], 6);
+       flags2 = extract_int(&buf[4], 7);
+
+       if (flags2 & QR2_SELFLIST) {
+               current_value = 1;
+       }
+       else {
+               current_value = 0;
+       }
+
+       if (newval == 1) {
+               flags2 = flags2 | QR2_SELFLIST;
+       }
+       else if (newval == 0) {
+               flags2 = flags2 & ~QR2_SELFLIST;
+       }
+       else {
+               return(current_value);
+       }
+
+       if (newval != current_value) {
+               serv_printf("SETR %s|%s|%s|%d|0|%d|%d|%d|%d",
+                       name, password, dirname, flags,
+                       floor, order, view, flags2);
+               serv_gets(buf);
+       }
+
+       return(newval);
+
+}
+
+
+
+
+
+
 /*
  * display the form for editing a room
  */
@@ -646,7 +743,8 @@ void display_editroom(void)
        serv_gets(buf);
 
        if (buf[0] != '2') {
-               display_error(&buf[4]);
+               strcpy(WC->ImportantMessage, &buf[4]);
+               display_main_menu();
                return;
        }
        extract(er_name, &buf[4], 0);
@@ -658,74 +756,78 @@ void display_editroom(void)
        output_headers(1);
 
        /* print the tabbed dialog */
-       wprintf("<TABLE border=0 width=100%%><TR BGCOLOR=FFFFFF><TD> </TD>");
+       wprintf("<TABLE border=0 cellspacing=0 cellpadding=0 width=100%%>"
+               "<TR ALIGN=CENTER>"
+               "<TD>&nbsp;</TD>\n");
 
        if (!strcmp(tab, "admin")) {
-               wprintf("<TD BGCOLOR=000077><FONT SIZE=+1 COLOR=\"FFFFFF\"><B>");
+               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
        }
        else {
-               wprintf("<TD><A HREF=\"/display_editroom&tab=admin\">");
+               wprintf("<TD BGCOLOR=\"#AAAAAA\"><A HREF=\"/display_editroom&tab=admin\">");
        }
        wprintf("Room administration");
        if (!strcmp(tab, "admin")) {
-               wprintf("</B></FONT></TD>\n");
+               wprintf("</SPAN></TD>\n");
        }
        else {
                wprintf("</A></TD>\n");
        }
 
-       wprintf("<TD> </TD>\n");
+       wprintf("<TD>&nbsp;</TD>\n");
 
        if (!strcmp(tab, "config")) {
-               wprintf("<TD BGCOLOR=000077><FONT SIZE=+1 COLOR=\"FFFFFF\"><B>");
+               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
        }
        else {
-               wprintf("<TD><A HREF=\"/display_editroom&tab=config\">");
+               wprintf("<TD BGCOLOR=\"#AAAAAA\"><A HREF=\"/display_editroom&tab=config\">");
        }
        wprintf("Room configuration");
        if (!strcmp(tab, "config")) {
-               wprintf("</B></FONT></TD>\n");
+               wprintf("</SPAN></TD>\n");
        }
        else {
                wprintf("</A></TD>\n");
        }
 
-       wprintf("<TD> </TD>\n");
+       wprintf("<TD>&nbsp;</TD>\n");
 
        if (!strcmp(tab, "sharing")) {
-               wprintf("<TD BGCOLOR=000077><FONT SIZE=+1 COLOR=\"FFFFFF\"><B>");
+               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
        }
        else {
-               wprintf("<TD><A HREF=\"/display_editroom&tab=sharing\">");
+               wprintf("<TD BGCOLOR=\"#AAAAAA\"><A HREF=\"/display_editroom&tab=sharing\">");
        }
        wprintf("Sharing");
        if (!strcmp(tab, "sharing")) {
-               wprintf("</B></FONT></TD>\n");
+               wprintf("</SPAN></TD>\n");
        }
        else {
                wprintf("</A></TD>\n");
        }
 
-       wprintf("<TD> </TD>\n");
+       wprintf("<TD>&nbsp;</TD>\n");
 
        if (!strcmp(tab, "listserv")) {
-               wprintf("<TD BGCOLOR=000077><FONT SIZE=+1 COLOR=\"FFFFFF\"><B>");
+               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
        }
        else {
-               wprintf("<TD><A HREF=\"/display_editroom&tab=listserv\">");
+               wprintf("<TD BGCOLOR=\"#AAAAAA\"><A HREF=\"/display_editroom&tab=listserv\">");
        }
        wprintf("Mailing list service");
        if (!strcmp(tab, "listserv")) {
-               wprintf("</B></FONT></TD>\n");
+               wprintf("</SPAN></TD>\n");
        }
        else {
                wprintf("</A></TD>\n");
        }
 
-       wprintf("<TD> </TD></TR></TABLE>\n");
-
+       wprintf("</TR></TABLE>\n");
        /* end tabbed dialog */ 
 
+       /* begin content of whatever tab is open now */
+       wprintf("<TABLE border=0 width=100%% bgcolor=\"#FFFFFF\">\n"
+               "<TR><TD>\n");
 
        if (!strcmp(tab, "admin")) {
                wprintf("<UL>"
@@ -941,7 +1043,8 @@ void display_editroom(void)
                        }
                }
 
-               wprintf("</TD></TR></TABLE><BR>\n"
+               wprintf("</TD></TR>"
+                       "</TABLE><BR>\n"
                        "<I><B>Reminder:</B> When sharing a room, "
                        "it must be shared from both ends.  Adding a node to "
                        "the 'shared' list sends messages out, but in order to"
@@ -954,8 +1057,13 @@ void display_editroom(void)
        /* Mailing list management */
        if (!strcmp(tab, "listserv")) {
 
-               wprintf("<BR><center><i>The contents of this room are being "
-                       "mailed to the following list recipients:"
+               wprintf("<BR><center>"
+                       "<TABLE BORDER=0 WIDTH=100%% CELLPADDING=5>"
+                       "<TR><TD VALIGN=TOP>");
+
+               wprintf("<i>The contents of this room are being "
+                       "mailed <b>as individual messages</b> "
+                       "to the following list recipients:"
                        "</i><br><br>\n");
 
                serv_puts("GNET");
@@ -978,13 +1086,83 @@ void display_editroom(void)
                        "<INPUT TYPE=\"hidden\" NAME=\"prefix\" VALUE=\"listrecp|\">\n");
                wprintf("<INPUT TYPE=\"text\" NAME=\"line\">\n");
                wprintf("<INPUT TYPE=\"submit\" NAME=\"cmd\" VALUE=\"Add\">");
-               wprintf("</FORM><BR></CENTER>\n");
+               wprintf("</FORM>\n");
+
+               wprintf("</TD><TD VALIGN=TOP>\n");
+               
+               wprintf("<i>The contents of this room are being "
+                       "mailed <b>in digest form</b> "
+                       "to the following list recipients:"
+                       "</i><br><br>\n");
+
+               serv_puts("GNET");
+               serv_gets(buf);
+               if (buf[0]=='1') while (serv_gets(buf), strcmp(buf, "000")) {
+                       extract(cmd, buf, 0);
+                       if (!strcasecmp(cmd, "digestrecp")) {
+                               extract(recp, buf, 1);
+                       
+                               escputs(recp);
+                               wprintf(" <A HREF=\"/netedit&cmd=remove&line="
+                                       "digestrecp|");
+                               urlescputs(recp);
+                               wprintf("&tab=listserv\">(remove)</A><BR>");
+
+                       }
+               }
+               wprintf("<BR><FORM METHOD=\"POST\" ACTION=\"/netedit\">\n"
+                       "<INPUT TYPE=\"hidden\" NAME=\"tab\" VALUE=\"listserv\">\n"
+                       "<INPUT TYPE=\"hidden\" NAME=\"prefix\" VALUE=\"digestrecp|\">\n");
+               wprintf("<INPUT TYPE=\"text\" NAME=\"line\">\n");
+               wprintf("<INPUT TYPE=\"submit\" NAME=\"cmd\" VALUE=\"Add\">");
+               wprintf("</FORM>\n");
+               
+               wprintf("</TD></TR></TABLE><HR>\n");
+
+               if (self_service(999) == 1) {
+                       wprintf("This room is configured to allow "
+                               "self-service subscribe/unsubscribe requests."
+                               " <A HREF=\"/toggle_self_service?newval=0&"
+                               "tab=listserv\">"
+                               "Click to disable.</A><BR>\n"
+                               "The URL for subscribe/unsubscribe is: "
+                               "<TT>http://%s/listsub</TT><BR>\n",
+                               WC->http_host
+                       );
+               }
+               else {
+                       wprintf("This room is <i>not</i> configured to allow "
+                               "self-service subscribe/unsubscribe requests."
+                               " <A HREF=\"/toggle_self_service?newval=1&"
+                               "tab=listserv\">"
+                               "Click to enable.</A><BR>\n"
+                       );
+               }
+
+
+               wprintf("</CENTER>\n");
        }
 
+       /* end content of whatever tab is open now */
+       wprintf("</TD></TR></TABLE>\n");
+
        wDumpContent(1);
 }
 
 
+/* 
+ * Toggle self-service list subscription
+ */
+void toggle_self_service(void) {
+       int newval = 0;
+
+       newval = atoi(bstr("newval"));
+       self_service(newval);
+       display_editroom();
+}
+
+
+
 /*
  * save new parameters for a room
  */
@@ -1001,14 +1179,17 @@ void editroom(void)
 
 
        if (strcmp(bstr("sc"), "OK")) {
-               display_error("Cancelled.  Changes were not saved.");
+               strcpy(WC->ImportantMessage,
+                       "Cancelled.  Changes were not saved.");
+               display_main_menu();
                return;
        }
        serv_puts("GETR");
        serv_gets(buf);
 
        if (buf[0] != '2') {
-               display_error(&buf[4]);
+               strcpy(WC->ImportantMessage, &buf[4]);
+               display_main_menu();
                return;
        }
        extract(er_name, &buf[4], 0);
@@ -1114,7 +1295,8 @@ void editroom(void)
        serv_puts(buf);
        serv_gets(buf);
        if (buf[0] != '2') {
-               display_error(&buf[4]);
+               strcpy(WC->ImportantMessage, &buf[4]);
+               display_main_menu();
                return;
        }
        gotoroom(er_name, 0);
@@ -1124,7 +1306,8 @@ void editroom(void)
                serv_puts(buf);
                serv_gets(buf);
                if (buf[0] != '2') {
-                       display_error(&buf[4]);
+                       strcpy(WC->ImportantMessage, &buf[4]);
+                       display_main_menu();
                        return;
                }
        }
@@ -1142,30 +1325,24 @@ void display_whok(void)
         serv_gets(buf);
 
         if (buf[0] != '2') {
-                display_error(&buf[4]);
-                return;
+               strcpy(WC->ImportantMessage, &buf[4]);
+               display_main_menu();
+               return;
         }
         extract(room, &buf[4], 0);
 
         strcpy(username, bstr("username"));
 
-        output_headers(1);
-
-        wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=007700><TR><TD>");
-        wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"<B>Access control list for ");
-       escputs(WC->wc_roomname);
-        wprintf("</B></FONT></TD></TR></TABLE>\n");
-
         if(!strcmp(bstr("sc"), "Kick")) {
                 sprintf(buf, "KICK %s", username);
                 serv_puts(buf);
                 serv_gets(buf);
 
                 if (buf[0] != '2') {
-                        display_error(&buf[4]);
-                        return;
+                        strcpy(WC->ImportantMessage, &buf[4]);
                 } else {
-                        wprintf("<B><I>User %s kicked out of room %s.</I></B>\n", 
+                        sprintf(WC->ImportantMessage,
+                               "<B><I>User %s kicked out of room %s.</I></B>\n", 
                                 username, room);
                 }
         } else if(!strcmp(bstr("sc"), "Invite")) {
@@ -1174,15 +1351,18 @@ void display_whok(void)
                 serv_gets(buf);
 
                 if (buf[0] != '2') {
-                        display_error(&buf[4]);
-                        return;
+                        strcpy(WC->ImportantMessage, &buf[4]);
                 } else {
-                        wprintf("<B><I>User %s invited to room %s.</I></B>\n", 
+                        sprintf(WC->ImportantMessage,
+                               "<B><I>User %s invited to room %s.</I></B>\n", 
                                 username, room);
                 }
         }
         
-
+        output_headers(1);
+       stresc(buf, WC->wc_roomname, 1);
+       svprintf("BOXTITLE", WCS_STRING, "Access control list for %s", buf);
+       do_template("beginbox");
 
        wprintf("<TABLE border=0 CELLSPACING=10><TR VALIGN=TOP>"
                "<TD>The users listed below have access to this room.  "
@@ -1218,6 +1398,7 @@ void display_whok(void)
                "</FORM></CENTER>\n");
 
        wprintf("</TD></TR></TABLE>\n");
+       do_template("endbox");
         wDumpContent(1);
 }
 
@@ -1235,15 +1416,13 @@ void display_entroom(void)
        serv_gets(buf);
 
        if (buf[0] != '2') {
-               display_error(&buf[4]);
+               strcpy(WC->ImportantMessage, &buf[4]);
+               display_main_menu();
                return;
        }
-       output_headers(1);
-
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=000077><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Enter (create) a new room</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
+       output_headers(3);
+       svprintf("BOXTITLE", WCS_STRING, "Create a new room");
+       do_template("beginbox");
 
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/entroom\">\n");
 
@@ -1264,6 +1443,9 @@ void display_entroom(void)
 
        wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"invonly\" ");
        wprintf("> Private - invitation only\n");
+
+       wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"personal\" ");
+       wprintf("> Personal (mailbox for you only)\n");
        wprintf("</UL>\n");
 
         wprintf("<LI>Resides on floor: ");
@@ -1288,8 +1470,9 @@ void display_entroom(void)
        serv_printf("MESG roomaccess");
        serv_gets(buf);
        if (buf[0] == '1') {
-               fmout(NULL);
+               fmout(NULL, "CENTER");
        }
+       do_template("endbox");
        wDumpContent(1);
 }
 
@@ -1308,7 +1491,9 @@ void entroom(void)
        int er_num_type;
 
        if (strcmp(bstr("sc"), "OK")) {
-               display_error("Cancelled.  No new room was created.");
+               strcpy(WC->ImportantMessage,
+                       "Cancelled.  No new room was created.");
+               display_main_menu();
                return;
        }
        strcpy(er_name, bstr("er_name"));
@@ -1323,13 +1508,16 @@ void entroom(void)
                er_num_type = 2;
        if (!strcmp(er_type, "invonly"))
                er_num_type = 3;
+       if (!strcmp(er_type, "personal"))
+               er_num_type = 4;
 
        sprintf(buf, "CRE8 1|%s|%d|%s|%d", 
                er_name, er_num_type, er_password, er_floor);
        serv_puts(buf);
        serv_gets(buf);
        if (buf[0] != '2') {
-               display_error(&buf[4]);
+               strcpy(WC->ImportantMessage, &buf[4]);
+               display_main_menu();
                return;
        }
        smart_goto(er_name);
@@ -1342,37 +1530,40 @@ void entroom(void)
 void display_private(char *rname, int req_pass)
 {
 
-       output_headers(1);
+       output_headers(3);
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770000><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Goto a private room</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
+       svprintf("BOXTITLE", WCS_STRING, "Go to a hidden room");
+       do_template("beginbox");
 
        wprintf("<CENTER>\n");
-       wprintf("If you know the name of a hidden (guess-name) or\n");
+       wprintf("<BR>If you know the name of a hidden (guess-name) or\n");
        wprintf("passworded room, you can enter that room by typing\n");
        wprintf("its name below.  Once you gain access to a private\n");
        wprintf("room, it will appear in your regular room listings\n");
        wprintf("so you don't have to keep returning here.\n");
        wprintf("<BR><BR>");
 
-       wprintf("<FORM METHOD=\"POST\" ACTION=\"/goto_private\">\n");
+       wprintf("<FORM METHOD=\"GET\" ACTION=\"/goto_private\">\n");
 
-       wprintf("<TABLE border><TR><TD>");
-       wprintf("Enter room name:</TD><TD>");
-       wprintf("<INPUT TYPE=\"text\" NAME=\"gr_name\" VALUE=\"%s\" MAXLENGTH=\"19\">\n", rname);
+       wprintf("<table border=\"0\" cellspacing=\"5\" "
+               "cellpadding=\"5\" BGCOLOR=\"#EEEEEE\">\n"
+               "<TR><TD>"
+               "Enter room name:</TD><TD>"
+               "<INPUT TYPE=\"text\" NAME=\"gr_name\" "
+               "VALUE=\"%s\" MAXLENGTH=\"19\">\n", rname);
 
        if (req_pass) {
                wprintf("</TD></TR><TR><TD>");
                wprintf("Enter room password:</TD><TD>");
                wprintf("<INPUT TYPE=\"password\" NAME=\"gr_pass\" MAXLENGTH=\"9\">\n");
        }
-       wprintf("</TD></TR></TABLE>\n");
+       wprintf("</TD></TR></TABLE><BR>\n");
 
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
+       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">"
+               "&nbsp;"
+               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
        wprintf("</FORM>\n");
+       do_template("endbox");
        wDumpContent(1);
 }
 
@@ -1381,7 +1572,7 @@ void display_private(char *rname, int req_pass)
  */
 void goto_private(void)
 {
-       char hold_rm[32];
+       char hold_rm[SIZ];
        char buf[SIZ];
 
        if (strcasecmp(bstr("sc"), "OK")) {
@@ -1418,16 +1609,15 @@ void display_zap(void)
 {
        output_headers(1);
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770000><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Zap (forget) the current room</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">Zap (forget) the current room</SPAN>\n");
+       wprintf("</TD></TR></TABLE>\n");
 
        wprintf("If you select this option, <em>%s</em> will ", WC->wc_roomname);
        wprintf("disappear from your room list.  Is this what you wish ");
        wprintf("to do?<BR>\n");
 
-       wprintf("<FORM METHOD=\"POST\" ACTION=\"/zap\">\n");
+       wprintf("<FORM METHOD=\"GET\" ACTION=\"/zap\">\n");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
        wprintf("</FORM>\n");
@@ -1479,17 +1669,17 @@ void confirm_delete_room(void)
        serv_puts("KILL 0");
        serv_gets(buf);
        if (buf[0] != '2') {
-               display_error(&buf[4]);
+               strcpy(WC->ImportantMessage, &buf[4]);
+               display_main_menu();
                return;
        }
        output_headers(1);
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770000><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Confirm deletion of room</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
+       wprintf("<SPAN CLASS=\"titlebar\">Confirm deletion of room</SPAN>\n");
+       wprintf("</TD></TR></TABLE>\n");
 
        wprintf("<CENTER>");
-       wprintf("<FORM METHOD=\"POST\" ACTION=\"/delete_room\">\n");
+       wprintf("<FORM METHOD=\"GET\" ACTION=\"/delete_room\">\n");
 
        wprintf("Are you sure you want to delete <FONT SIZE=+1>");
        escputs(WC->wc_roomname);
@@ -1514,13 +1704,17 @@ void delete_room(void)
        strcpy(sc, bstr("sc"));
 
        if (strcasecmp(sc, "Delete")) {
-               display_error("Cancelled.  This room was not deleted.");
+               strcpy(WC->ImportantMessage,
+                       "Cancelled.  This room was not deleted.");
+               display_main_menu();
                return;
        }
        serv_puts("KILL 1");
        serv_gets(buf);
        if (buf[0] != '2') {
-               display_error(&buf[4]);
+               strcpy(WC->ImportantMessage, &buf[4]);
+               display_main_menu();
+               return;
        } else {
                smart_goto("_BASEROOM_");
        }
@@ -1613,10 +1807,10 @@ void room_to_folder(char *folder, char *room, int floor, int is_mailbox)
        }
 
        /*
-        * Replace "/" characters with "|" for pseudo-folder-delimiting
+        * Replace "\" characters with "|" for pseudo-folder-delimiting
         */
        for (i=0; i<strlen(folder); ++i) {
-               if (folder[i] == '/') folder[i] = '|';
+               if (folder[i] == '\\') folder[i] = '|';
        }
 }
 
@@ -1642,39 +1836,163 @@ void change_view(void) {
 
 
 /*
- * Show the room list in "folders" format
+ * One big expanded tree list view --- like a folder list
  */
-void folders(void) {
+void do_folder_view(struct folder *fold, int max_folders, int num_floors) {
        char buf[SIZ];
+       int levels, oldlevels;
+       int i, t;
 
+       do_template("beginbox_nt");
+       levels = 0;
+       oldlevels = 0;
+       for (i=0; i<max_folders; ++i) {
+
+               levels = num_tokens(fold[i].name, '|');
+               oldlevels = levels;
+
+               for (t=0; t<levels; ++t) wprintf("&nbsp;&nbsp;&nbsp;");
+               if (fold[i].selectable) {
+                       wprintf("<A HREF=\"/dotgoto?room=");
+                       urlescputs(fold[i].room);
+                       wprintf("\">");
+               }
+               else {
+                       wprintf("<i>");
+               }
+               if (fold[i].hasnewmsgs) {
+                       wprintf("<SPAN CLASS=\"roomlist_new\">");
+               }
+               else {
+                       wprintf("<SPAN CLASS=\"roomlist_old\">");
+               }
+               extract(buf, fold[i].name, levels-1);
+               escputs(buf);
+               wprintf("</SPAN>");
+               if (fold[i].selectable) {
+                       wprintf("</A>");
+               }
+               else {
+                       wprintf("</i>");
+               }
+               if (!strcasecmp(fold[i].name, "My Folders|Mail")) {
+                       wprintf(" (INBOX)");
+               }
+               wprintf("<BR>\n");
+       }
+       do_template("endbox");
+}
+
+/*
+ * Boxes and rooms and lists ... oh my!
+ */
+void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
+       char buf[SIZ];
+       char boxtitle[SIZ];
        int levels, oldlevels;
+       int i, t;
+       int num_boxes = 0;
+       static int columns = 3;
+       int boxes_per_column = 0;
+       int current_column = 0;
+       int nf;
+
+       nf = num_floors;
+       while (nf % columns != 0) ++nf;
+       boxes_per_column = (nf / columns);
+       if (boxes_per_column < 1) boxes_per_column = 1;
+
+       /* Outer table (for columnization) */
+       wprintf("<TABLE BORDER=0 WIDTH=100%% CELLPADDING=5>"
+               "<TR><TD VALIGN=TOP>");
 
-       struct folder {
-               char room[SIZ];
-               char name[SIZ];
-               int hasnewmsgs;
-               int is_mailbox;
-               int selectable;
-       };
+       levels = 0;
+       oldlevels = 0;
+       for (i=0; i<max_folders; ++i) {
+
+               levels = num_tokens(fold[i].name, '|');
 
+               if ((levels == 1) && (oldlevels == 2)) {
+
+                       /* End inner box */
+                       do_template("endbox");
+
+                       ++num_boxes;
+                       if ((num_boxes % boxes_per_column) == 0) {
+                               ++current_column;
+                               if (current_column < columns) {
+                                       wprintf("</TD><TD VALIGN=TOP>\n");
+                               }
+                       }
+               }
+
+               if (levels == 1) {
+
+                       /* Begin inner box */
+                       extract(buf, fold[i].name, levels-1);
+                       stresc(boxtitle, buf, 1);
+                       svprintf("BOXTITLE", WCS_STRING, boxtitle);
+                       do_template("beginbox");
+
+               }
+
+               oldlevels = levels;
+
+               if (levels > 1) {
+                       wprintf("&nbsp;");
+                       if (levels>2) for (t=0; t<(levels-2); ++t) wprintf("&nbsp;&nbsp;&nbsp;");
+                       if (fold[i].selectable) {
+                               wprintf("<A HREF=\"/dotgoto?room=");
+                               urlescputs(fold[i].room);
+                               wprintf("\">");
+                       }
+                       else {
+                               wprintf("<i>");
+                       }
+                       if (fold[i].hasnewmsgs) {
+                               wprintf("<SPAN CLASS=\"roomlist_new\">");
+                       }
+                       else {
+                               wprintf("<SPAN CLASS=\"roomlist_old\">");
+                       }
+                       extract(buf, fold[i].name, levels-1);
+                       escputs(buf);
+                       wprintf("</SPAN>");
+                       if (fold[i].selectable) {
+                               wprintf("</A>");
+                       }
+                       else {
+                               wprintf("</i>");
+                       }
+                       if (!strcasecmp(fold[i].name, "My Folders|Mail")) {
+                               wprintf(" (INBOX)");
+                       }
+                       wprintf("<BR>\n");
+               }
+       }
+       /* End the final inner box */
+       do_template("endbox");
+
+       wprintf("</TD></TR></TABLE>\n");
+}
+
+
+/*
+ * Show the room list.  (only should get called by
+ * knrooms() because that's where output_headers() is called from)
+ */
+
+void list_all_rooms_by_floor(char *viewpref) {
+       char buf[SIZ];
+       int swap = 0;
        struct folder *fold = NULL;
        struct folder ftmp;
        int max_folders = 0;
        int alloc_folders = 0;
-       int i, j, k;
-       int p;
-       int flags;
-       int floor;
-       int nests = 0;
-
-       load_floorlist();
-
-       output_headers(1);
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=000077><TR><TD>"
-               "<FONT SIZE=+1 COLOR=\"FFFFFF\""
-               "<B>Folder list</B>\n"
-               "</TD></TR></TABLE><BR>\n"
-       );
+       int i, j;
+       int ra_flags = 0;
+       int flags = 0;
+       int num_floors = 1;     /* add an extra one for private folders */
 
        /* Start with the mailboxes */
        max_folders = 1;
@@ -1682,6 +2000,7 @@ void folders(void) {
        fold = malloc(sizeof(struct folder));
        memset(fold, 0, sizeof(struct folder));
        strcpy(fold[0].name, "My folders");
+       fold[0].is_mailbox = 1;
 
        /* Then add floors */
        serv_puts("LFLR");
@@ -1695,40 +2014,52 @@ void folders(void) {
                memset(&fold[max_folders], 0, sizeof(struct folder));
                extract(fold[max_folders].name, buf, 1);
                ++max_folders;
+               ++num_floors;
        }
 
        /* Now add rooms */
-       for (p = 0; p < 2; ++p) {
-               if (p == 0) serv_puts("LKRN");
-               else if (p == 1) serv_puts("LKRO");
-               serv_gets(buf);
-               if (buf[0]=='1') while(serv_gets(buf), strcmp(buf, "000")) {
-                       if (max_folders >= alloc_folders) {
-                               alloc_folders = max_folders + 100;
-                               fold = realloc(fold,
-                                       alloc_folders * sizeof(struct folder));
-                       }
-                       memset(&fold[max_folders], 0, sizeof(struct folder));
-                       extract(fold[max_folders].room, buf, 0);
-                       if (p == 0) fold[max_folders].hasnewmsgs = 1;
-                       flags = extract_int(buf, 1);
-                       floor = extract_int(buf, 2);
-                       if (flags & QR_MAILBOX) {
-                               fold[max_folders].is_mailbox = 1;
-                       }
-                       room_to_folder(fold[max_folders].name,
-                                       fold[max_folders].room,
-                                       floor,
-                                       fold[max_folders].is_mailbox);
-                       fold[max_folders].selectable = 1;
-                       ++max_folders;
+       serv_puts("LKRA");
+       serv_gets(buf);
+       if (buf[0]=='1') while(serv_gets(buf), strcmp(buf, "000")) {
+               if (max_folders >= alloc_folders) {
+                       alloc_folders = max_folders + 100;
+                       fold = realloc(fold,
+                               alloc_folders * sizeof(struct folder));
                }
+               memset(&fold[max_folders], 0, sizeof(struct folder));
+               extract(fold[max_folders].room, buf, 0);
+               ra_flags = extract_int(buf, 5);
+               flags = extract_int(buf, 1);
+               fold[max_folders].floor = extract_int(buf, 2);
+               fold[max_folders].hasnewmsgs =
+                       ((ra_flags & UA_HASNEWMSGS) ? 1 : 0 );
+               if (flags & QR_MAILBOX) {
+                       fold[max_folders].is_mailbox = 1;
+               }
+               room_to_folder(fold[max_folders].name,
+                               fold[max_folders].room,
+                               fold[max_folders].floor,
+                               fold[max_folders].is_mailbox);
+               fold[max_folders].selectable = 1;
+               ++max_folders;
        }
 
        /* Bubble-sort the folder list */
        for (i=0; i<max_folders; ++i) {
                for (j=0; j<(max_folders-1)-i; ++j) {
-                       if (strcasecmp(fold[j].name, fold[j+1].name) > 0) {
+                       if (fold[j].is_mailbox == fold[j+1].is_mailbox) {
+                               swap = strcasecmp(fold[j].name, fold[j+1].name);
+                       }
+                       else {
+                               if ( (fold[j+1].is_mailbox)
+                                  && (!fold[j].is_mailbox)) {
+                                       swap = 1;
+                               }
+                               else {
+                                       swap = 0;
+                               }
+                       }
+                       if (swap > 0) {
                                memcpy(&ftmp, &fold[j], sizeof(struct folder));
                                memcpy(&fold[j], &fold[j+1],
                                                        sizeof(struct folder));
@@ -1738,41 +2069,90 @@ void folders(void) {
                }
        }
 
-       /* Output */
-       nests = 0;
-       levels = 0;
-       oldlevels = 0;
-       for (i=0; i<max_folders; ++i) {
+       if (!strcasecmp(viewpref, "folders")) {
+               do_folder_view(fold, max_folders, num_floors);
+       }
+       else {
+               do_rooms_view(fold, max_folders, num_floors);
+       }
 
-               levels = num_tokens(fold[i].name, '|');
-               if (levels > oldlevels) {
-                       for (k=0; k<(levels-oldlevels); ++k) {
-                               wprintf("<UL>");
-                               ++nests;
-                       }
-               }
-               if (levels < oldlevels) {
-                       for (k=0; k<(oldlevels-levels); ++k) {
-                               wprintf("</UL>");
-                               --nests;
-                       }
-               }
-               oldlevels = levels;
+       free(fold);
+       wDumpContent(1);
+}
 
-               wprintf("<LI>");
-               if (fold[i].selectable) {
-                       wprintf("<A HREF=\"/dotgoto?room=");
-                       urlescputs(fold[i].room);
-                       wprintf("\">");
+
+/* Do either a known rooms list or a folders list, depending on the
+ * user's preference
+ */
+void knrooms() {
+       char listviewpref[SIZ];
+
+       output_headers(3);
+       load_floorlist();
+
+       /* Determine whether the user is trying to change views */
+       if (bstr("view") != NULL) {
+               if (strlen(bstr("view")) > 0) {
+                       set_preference("roomlistview", bstr("view"));
                }
-               if (fold[i].hasnewmsgs) wprintf("<B>");
-               extract(buf, fold[i].name, levels-1);
-               escputs(buf);
-               if (fold[i].hasnewmsgs) wprintf("</B>");
-               if (fold[i].selectable) wprintf("</A>\n");
        }
-       while (nests-- > 0) wprintf("</UL>\n");
 
-       free(fold);
-       wDumpContent(1);
+       get_preference("roomlistview", listviewpref);
+
+       if ( (strcasecmp(listviewpref, "folders"))
+          && (strcasecmp(listviewpref, "table")) ) {
+               strcpy(listviewpref, "rooms");
+       }
+
+       /* title bar */
+       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#000077\"><TR><TD>"
+               "<SPAN CLASS=\"titlebar\">"
+       );
+       if (!strcasecmp(listviewpref, "rooms")) {
+               wprintf("Room list");
+       }
+       if (!strcasecmp(listviewpref, "folders")) {
+               wprintf("Folder list");
+       }
+       if (!strcasecmp(listviewpref, "table")) {
+               wprintf("Room list");
+       }
+       wprintf("</SPAN></TD>\n");
+
+
+       /* offer the ability to switch views */
+       wprintf("<TD><FORM NAME=\"roomlistomatic\">\n"
+               "<SELECT NAME=\"newview\" SIZE=\"1\" "
+               "OnChange=\"location.href=roomlistomatic.newview.options"
+               "[selectedIndex].value\">\n");
+
+       wprintf("<OPTION %s VALUE=\"/knrooms&view=rooms\">"
+               "View as room list"
+               "</OPTION>\n",
+               ( !strcasecmp(listviewpref, "rooms") ? "SELECTED" : "" )
+       );
+
+       wprintf("<OPTION %s VALUE=\"/knrooms&view=folders\">"
+               "View as folder list"
+               "</OPTION>\n",
+               ( !strcasecmp(listviewpref, "folders") ? "SELECTED" : "" )
+       );
+
+       wprintf("<OPTION %s VALUE=\"/knrooms&view=table\">"
+               "Classic table view"
+               "</OPTION>\n",
+               ( !strcasecmp(listviewpref, "table") ? "SELECTED" : "" )
+       );
+
+       wprintf("</SELECT></FORM></TD><TD>\n");
+       offer_start_page();
+       wprintf("</TD></TR></TABLE>\n");
+
+       /* Display the room list in the user's preferred format */
+       if (!strcasecmp(listviewpref, "table")) {
+               tabular_room_list();
+       }
+       else {
+               list_all_rooms_by_floor(listviewpref);
+       }
 }