* Replaced all the "centered 99% tables" with 100% width tables wrapped
[citadel.git] / webcit / roomops.c
index 042144d6352431a72e05cfa113ea476a15081aca..62b0fbb124c843c4732116c914dd111189621fa0 100644 (file)
@@ -1,5 +1,8 @@
-/* $Id$ */
-
+/*
+ * $Id$
+ *
+ * Lots of different room-related operations.
+ */
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -36,7 +39,8 @@ char *viewdefs[] = {
        "Summary",
        "Address Book",
        "Calendar",
-       "Tasks"
+       "Tasks",
+       "Notes"
 };
 
 char floorlist[128][SIZ];
@@ -114,7 +118,7 @@ void room_tree_list(struct roomlisting *rp)
        urlescputs(rmname);
        wprintf("\"");
        wprintf(">");
-       escputs1(rmname, 1);
+       escputs1(rmname, 1, 1);
        if ((f & QR_DIRECTORY) && (f & QR_NETWORK))
                wprintf("}");
        else if (f & QR_DIRECTORY)
@@ -215,76 +219,19 @@ void listrms(char *variety)
 }
 
 
-/*
- * list all rooms by floor (only should get called from knrooms() because
- * that's where output_headers() is called from)
- */
-void tabular_room_list(void)
-{
-       int a;
-       char buf[SIZ];
-
-       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");
-
-       for (a = 0; a < 128; ++a)
-               if (floorlist[a][0] != 0) {
-
-                       /* Floor name column */
-                       wprintf("<TR><TD>");
-
-                       serv_printf("OIMG _floorpic_|%d", a);
-                       serv_gets(buf);
-                       if (buf[0] == '2') {
-                               serv_puts("CLOS");
-                               serv_gets(buf);
-                               wprintf("<IMG SRC=\"/image&name=_floorpic_&parm=%d\" ALT=\"%s\">",
-                                       a, &floorlist[a][0]);
-                       } else {
-                               escputs(&floorlist[a][0]);
-                       }
-
-                       wprintf("</TD>");
-
-                       /* Rooms with new messages column */
-                       wprintf("<TD>");
-                       sprintf(buf, "LKRN %d", a);
-                       listrms(buf);
-                       wprintf("</TD>\n<TD>");
-
-                       /* Rooms with old messages column */
-                       sprintf(buf, "LKRO %d", a);
-                       listrms(buf);
-                       wprintf("</TD></TR>\n");
-               }
-       wprintf("</TABLE>\n");
-       do_template("endbox");
-       wDumpContent(1);
-}
-
-
-
-
-
-
-
-
-
 /*
  * list all forgotten rooms
  */
 void zapped_list(void)
 {
-       output_headers(3);
+       output_headers(1, 1, 0, 0, 0, 0, 0);
 
        svprintf("BOXTITLE", WCS_STRING, "Zapped (forgotten) rooms");
        do_template("beginbox");
 
        listrms("LZRM -1");
 
-       wprintf("<BR><BR>\n");
+       wprintf("<br /><br />\n");
        wprintf("Click on any room to un-zap it and goto that room.\n");
        do_template("endbox");
        wDumpContent(1);
@@ -338,7 +285,7 @@ void embed_newmail_button(void) {
                        "<A HREF=\"/dotgoto?room=_MAIL_\">"
                        "<IMG SRC=\"/static/mail.gif\" border=0 "
                        "ALT=\"You have new mail\">"
-                       "<BR><SPAN CLASS=\"youhavemail\">"
+                       "<br /><SPAN CLASS=\"youhavemail\">"
                        "%d new mail</SPAN></A>", WC->new_mail);
                WC->remember_new_mail = WC->new_mail;
        }
@@ -382,7 +329,7 @@ void embed_view_o_matic(void) {
 
 
 
-void embed_room_banner(char *got) {
+void embed_room_banner(char *got, int navbar_style) {
        char fakegot[SIZ];
 
        /* We need to have the information returned by a GOTO server command.
@@ -415,7 +362,152 @@ void embed_room_banner(char *got) {
        svcallback("START", offer_start_page);
 
        do_template("roombanner");
-       clear_local_substs();
+       if (navbar_style != navbar_none) {
+
+               wprintf("<div style=\"position:absolute; bottom:0px; left:0px\">\n"
+                       "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" width=\"100%%\"><tr>\n");
+
+
+               if (navbar_style == navbar_default) wprintf(
+                       "<td>"
+                       "<a href=\"/ungoto\">"
+                       "<img align=\"middle\" src=\"/static/back.gif\" border=\"0\">"
+                       "<span class=\"navbar_link\">Ungoto</span></A>"
+                       "</td>\n"
+               );
+
+               if ( (navbar_style == navbar_default)
+                  && (WC->wc_view != VIEW_CALENDAR) 
+                  && (WC->wc_view != VIEW_ADDRESSBOOK) 
+                  && (WC->wc_view != VIEW_NOTES) 
+                  && (WC->wc_view != VIEW_TASKS) 
+                  ) {
+                       wprintf(
+                               "<td>"
+                               "<A HREF=\"/readnew\">"
+                               "<img align=\"middle\" src=\"/static/readmsgs.gif\" border=\"0\">"
+                               "<span class=\"navbar_link\">Read new messages</span></A>"
+                               "</td>\n"
+                       );
+               }
+
+               if (navbar_style == navbar_default) {
+                       switch(WC->wc_view) {
+                               case VIEW_ADDRESSBOOK:
+                                       wprintf(
+                                               "<td>"
+                                               "<A HREF=\"/readfwd\">"
+                                               "<img align=\"middle\" src=\"/static/readmsgs.gif\" "
+                                               "border=\"0\">"
+                                               "<span class=\"navbar_link\">"
+                                               "View contacts"
+                                               "</span></a></td>\n"
+                                       );
+                                       break;
+                               case VIEW_CALENDAR:
+                                       wprintf(
+                                               "<td>"
+                                               "<A HREF=\"/readfwd?calview=day\">"
+                                               "<img align=\"middle\" src=\"/static/day_view.gif\" "
+                                               "border=\"0\">"
+                                               "<span class=\"navbar_link\">"
+                                               "Day view"
+                                               "</span></a></td>\n"
+                                       );
+                                       wprintf(
+                                               "<td>"
+                                               "<A HREF=\"/readfwd?calview=month\">"
+                                               "<img align=\"middle\" src=\"/static/month_view.gif\" "
+                                               "border=\"0\">"
+                                               "<span class=\"navbar_link\">"
+                                               "Month view"
+                                               "</span></a></td>\n"
+                                       );
+                                       break;
+                               case VIEW_TASKS:
+                                       wprintf(
+                                               "<td>"
+                                               "<A HREF=\"/readfwd\">"
+                                               "<img align=\"middle\" src=\"/static/readmsgs.gif\" "
+                                               "border=\"0\">"
+                                               "<span class=\"navbar_link\">"
+                                               "View tasks"
+                                               "</span></a></td>\n"
+                                       );
+                                       break;
+                               case VIEW_NOTES:
+                                       wprintf(
+                                               "<td>"
+                                               "<A HREF=\"/readfwd\">"
+                                               "<img align=\"middle\" src=\"/static/readmsgs.gif\" "
+                                               "border=\"0\">"
+                                               "<span class=\"navbar_link\">"
+                                               "View notes"
+                                               "</span></a></td>\n"
+                                       );
+                                       break;
+                               default:
+                                       wprintf(
+                                               "<td>"
+                                               "<A HREF=\"/readfwd\">"
+                                               "<img align=\"middle\" src=\"/static/readmsgs.gif\" "
+                                               "border=\"0\">"
+                                               "<span class=\"navbar_link\">"
+                                               "Read all messages"
+                                               "</span></a></td>\n"
+                                       );
+                                       break;
+                       }
+               }
+
+               if (navbar_style == navbar_default) {
+                       wprintf(
+                               "<td>"
+                               "<A HREF=\"/display_enter\">"
+                               "<img align=\"middle\" src=\"/static/enter.gif\" border=\"0\">"
+                               "<span class=\"navbar_link\">"
+                       );
+                       switch(WC->wc_view) {
+                               case VIEW_ADDRESSBOOK:
+                                       wprintf("Add new contact");
+                                       break;
+                               case VIEW_CALENDAR:
+                                       wprintf("Add new event");
+                                       break;
+                               case VIEW_TASKS:
+                                       wprintf("Add new task");
+                                       break;
+                               case VIEW_NOTES:
+                                       wprintf("Add new note");
+                                       break;
+                               default:
+                                       wprintf("Enter a message");
+                                       break;
+                       }
+                       wprintf("</span></a></td>\n");
+               }
+
+               if (navbar_style == navbar_default) wprintf(
+                       "<td>"
+                       "<A HREF=\"/skip\" "
+                       "TITLE=\"Leave all messages marked as unread, go to next room with unread messages\">"
+                       "<span class=\"navbar_link\">Skip this room</span>"
+                       "<img align=\"middle\" src=\"/static/forward.gif\" border=\"0\"></A>"
+                       "</td>\n"
+               );
+
+               if (navbar_style == navbar_default) wprintf(
+                       "<td>"
+                       "<A HREF=\"/gotonext\" "
+                       "TITLE=\"Mark all messages as read, go to next room with unread messages\">"
+                       "<span class=\"navbar_link\">Goto next room</span>"
+                       "<img align=\"middle\" src=\"/static/forward.gif\" border=\"0\"></A>"
+                       "</td>\n"
+               );
+
+               wprintf("</tr></table></div>\n");
+       }
+
 }
 
 
@@ -423,36 +515,18 @@ void embed_room_banner(char *got) {
 
 
 /*
- * generic routine to take the session to a new room
+ * back end routine to take the session to a new room
  *
- * display_name values:  0 = goto only
- *                       1 = goto and display
- *                       2 = display only
  */
-void gotoroom(char *gname, int display_name)
+void gotoroom(char *gname)
 {
        char buf[SIZ];
        static long ls = (-1L);
 
+       /* store ungoto information */
+       strcpy(WC->ugname, WC->wc_roomname);
+       WC->uglsn = ls;
 
-       if (display_name) {
-               output_headers(0);
-                wprintf("Pragma: no-cache\n");
-                wprintf("Cache-Control: no-store\n");
-
-               wprintf("<HTML><HEAD>\n"
-                       "<META HTTP-EQUIV=\"refresh\" CONTENT=\"500363689;\">\n"
-                       "<META HTTP-EQUIV=\"Pragma\" CONTENT=\"no-cache\">\n"
-                       "<META HTTP-EQUIV=\"expired\" CONTENT=\"28-May-1971 18:10:00 GMT\">\n"
-                       "<meta name=\"MSSmartTagsPreventParsing\" content=\"TRUE\">\n"
-                       "</HEAD>\n");
-               do_template("background");
-       }
-       if (display_name != 2) {
-               /* store ungoto information */
-               strcpy(WC->ugname, WC->wc_roomname);
-               WC->uglsn = ls;
-       }
        /* move to the new room */
        serv_printf("GOTO %s", gname);
        serv_gets(buf);
@@ -461,10 +535,6 @@ void gotoroom(char *gname, int display_name)
                serv_gets(buf);
        }
        if (buf[0] != '2') {
-               if (display_name) {
-                       wprintf("<EM>%s</EM><BR>\n", &buf[4]);
-                       wDumpContent(1);
-               }
                return;
        }
        extract(WC->wc_roomname, &buf[4], 0);
@@ -473,6 +543,9 @@ void gotoroom(char *gname, int display_name)
           maxmsgnum = extract_int(&buf[4],5);
           is_mail = (char) extract_int(&buf[4],7); */
        ls = extract_long(&buf[4], 6);
+       WC->wc_floor = extract_int(&buf[4], 10);
+       WC->wc_view = extract_int(&buf[4], 11);
+       WC->wc_default_view = extract_int(&buf[4], 12);
 
        if (WC->is_aide)
                WC->is_room_aide = WC->is_aide;
@@ -482,15 +555,6 @@ void gotoroom(char *gname, int display_name)
        remove_march(WC->wc_roomname);
        if (!strcasecmp(gname, "_BASEROOM_"))
                remove_march(gname);
-
-       /* Display the room banner */
-       if (display_name) {
-               embed_room_banner(buf);
-               wDumpContent(1);
-       }
-       strcpy(WC->wc_roomname, WC->wc_roomname);
-       WC->wc_view = extract_int(&buf[4], 11);
-       WC->wc_default_view = extract_int(&buf[4], 12);
 }
 
 
@@ -601,7 +665,7 @@ void gotonext(void)
 
 
 void smart_goto(char *next_room) {
-       gotoroom(next_room, 0);
+       gotoroom(next_room);
        readloop("readnew");
 }
 
@@ -618,7 +682,7 @@ void slrp_highest(void)
        serv_puts("SLRP HIGHEST");
        serv_gets(buf);
        if (buf[0] != '2') {
-               wprintf("<EM>%s</EM><BR>\n", &buf[4]);
+               wprintf("<EM>%s</EM><br />\n", &buf[4]);
                return;
        }
 }
@@ -724,6 +788,7 @@ void display_editroom(void)
        char buf[SIZ];
        char cmd[SIZ];
        char node[SIZ];
+       char remote_room[SIZ];
        char recp[SIZ];
        char er_name[20];
        char er_password[10];
@@ -735,10 +800,15 @@ void display_editroom(void)
        char *tab;
        char *shared_with;
        char *not_shared_with;
+       int roompolicy = 0;
+       int roomvalue = 0;
+       int floorpolicy = 0;
+       int floorvalue = 0;
 
        tab = bstr("tab");
        if (strlen(tab) == 0) tab = "admin";
 
+       load_floorlist();
        serv_puts("GETR");
        serv_gets(buf);
 
@@ -753,10 +823,12 @@ void display_editroom(void)
        er_flags = extract_int(&buf[4], 3);
        er_floor = extract_int(&buf[4], 4);
 
-       output_headers(1);
+       output_headers(1, 1, 1, 0, 0, 0, 0);
 
        /* print the tabbed dialog */
-       wprintf("<TABLE border=0 cellspacing=0 cellpadding=0 width=100%%>"
+       wprintf("<br />"
+               "<div style=\"margin-right:1px\">"
+               "<TABLE border=0 cellspacing=0 cellpadding=0 width=100%%>"
                "<TR ALIGN=CENTER>"
                "<TD>&nbsp;</TD>\n");
 
@@ -764,9 +836,9 @@ void display_editroom(void)
                wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
        }
        else {
-               wprintf("<TD BGCOLOR=\"#AAAAAA\"><A HREF=\"/display_editroom&tab=admin\">");
+               wprintf("<TD BGCOLOR=\"#CCCCCC\"><A HREF=\"/display_editroom&tab=admin\">");
        }
-       wprintf("Room administration");
+       wprintf("Administration");
        if (!strcmp(tab, "admin")) {
                wprintf("</SPAN></TD>\n");
        }
@@ -780,9 +852,9 @@ void display_editroom(void)
                wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
        }
        else {
-               wprintf("<TD BGCOLOR=\"#AAAAAA\"><A HREF=\"/display_editroom&tab=config\">");
+               wprintf("<TD BGCOLOR=\"#CCCCCC\"><A HREF=\"/display_editroom&tab=config\">");
        }
-       wprintf("Room configuration");
+       wprintf("Configuration");
        if (!strcmp(tab, "config")) {
                wprintf("</SPAN></TD>\n");
        }
@@ -792,11 +864,43 @@ void display_editroom(void)
 
        wprintf("<TD>&nbsp;</TD>\n");
 
+       if (!strcmp(tab, "expire")) {
+               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
+       }
+       else {
+               wprintf("<TD BGCOLOR=\"#CCCCCC\"><A HREF=\"/display_editroom&tab=expire\">");
+       }
+       wprintf("Message expire policy");
+       if (!strcmp(tab, "expire")) {
+               wprintf("</SPAN></TD>\n");
+       }
+       else {
+               wprintf("</A></TD>\n");
+       }
+
+       wprintf("<TD>&nbsp;</TD>\n");
+
+       if (!strcmp(tab, "access")) {
+               wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
+       }
+       else {
+               wprintf("<TD BGCOLOR=\"#CCCCCC\"><A HREF=\"/display_editroom&tab=access\">");
+       }
+       wprintf("Access controls");
+       if (!strcmp(tab, "access")) {
+               wprintf("</SPAN></TD>\n");
+       }
+       else {
+               wprintf("</A></TD>\n");
+       }
+
+       wprintf("<TD>&nbsp;</TD>\n");
+
        if (!strcmp(tab, "sharing")) {
                wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
        }
        else {
-               wprintf("<TD BGCOLOR=\"#AAAAAA\"><A HREF=\"/display_editroom&tab=sharing\">");
+               wprintf("<TD BGCOLOR=\"#CCCCCC\"><A HREF=\"/display_editroom&tab=sharing\">");
        }
        wprintf("Sharing");
        if (!strcmp(tab, "sharing")) {
@@ -812,7 +916,7 @@ void display_editroom(void)
                wprintf("<TD BGCOLOR=\"#FFFFFF\"><SPAN CLASS=\"tablabel\">");
        }
        else {
-               wprintf("<TD BGCOLOR=\"#AAAAAA\"><A HREF=\"/display_editroom&tab=listserv\">");
+               wprintf("<TD BGCOLOR=\"#CCCCCC\"><A HREF=\"/display_editroom&tab=listserv\">");
        }
        wprintf("Mailing list service");
        if (!strcmp(tab, "listserv")) {
@@ -822,11 +926,14 @@ void display_editroom(void)
                wprintf("</A></TD>\n");
        }
 
-       wprintf("</TR></TABLE>\n");
+       wprintf("<TD>&nbsp;</TD>\n");
+
+       wprintf("</TR></TABLE></div>\n");
        /* end tabbed dialog */ 
 
        /* begin content of whatever tab is open now */
-       wprintf("<TABLE border=0 width=100%% bgcolor=\"#FFFFFF\">\n"
+       wprintf("<div style=\"margin-right:1px\">"
+               "<TABLE border=0 width=100%% bgcolor=\"#FFFFFF\">\n"
                "<TR><TD>\n");
 
        if (!strcmp(tab, "admin")) {
@@ -847,7 +954,6 @@ void display_editroom(void)
                wprintf("<INPUT TYPE=\"text\" NAME=\"er_name\" VALUE=\"%s\" MAXLENGTH=\"19\">\n", er_name);
        
                wprintf("<LI>Resides on floor: ");
-               load_floorlist();
                wprintf("<SELECT NAME=\"er_floor\" SIZE=\"1\">\n");
                for (i = 0; i < 128; ++i)
                        if (strlen(floorlist[i]) > 0) {
@@ -933,6 +1039,11 @@ void display_editroom(void)
                        wprintf("CHECKED ");
                wprintf("> Network shared room\n");
 
+               wprintf("<LI><INPUT TYPE=\"checkbox\" NAME=\"permanent\" VALUE=\"yes\" ");
+               if (er_flags & QR_PERMANENT)
+                       wprintf("CHECKED ");
+               wprintf("> Permanent (does not auto-purge)\n");
+
        /* start of anon options */
        
                wprintf("<LI>Anonymous messages<UL>\n");
@@ -966,9 +1077,12 @@ void display_editroom(void)
                }
        
                wprintf("</UL><CENTER>\n");
-               wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
-               wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
-               wprintf("</CENTER>\n");
+               wprintf("<INPUT TYPE=\"hidden\" NAME=\"tab\" VALUE=\"config\">\n"
+                       "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">"
+                       "&nbsp;"
+                       "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">"
+                       "</CENTER>\n"
+               );
        }
 
 
@@ -986,7 +1100,7 @@ void display_editroom(void)
                        not_shared_with = realloc(not_shared_with,
                                        strlen(not_shared_with) + 32);
                        strcat(not_shared_with, node);
-                       strcat(not_shared_with, "|");
+                       strcat(not_shared_with, "\n");
                }
 
                serv_puts("GNET");
@@ -994,77 +1108,143 @@ void display_editroom(void)
                if (buf[0]=='1') while (serv_gets(buf), strcmp(buf, "000")) {
                        extract(cmd, buf, 0);
                        extract(node, buf, 1);
+                       extract(remote_room, buf, 2);
                        if (!strcasecmp(cmd, "ignet_push_share")) {
                                shared_with = realloc(shared_with,
                                                strlen(shared_with) + 32);
                                strcat(shared_with, node);
-                               strcat(shared_with, "|");
+                               if (strlen(remote_room) > 0) {
+                                       strcat(shared_with, "|");
+                                       strcat(shared_with, remote_room);
+                               }
+                               strcat(shared_with, "\n");
                        }
                }
 
-               for (i=0; i<num_tokens(shared_with, '|'); ++i) {
-                       extract(node, shared_with, i);
-                       for (j=0; j<num_tokens(not_shared_with, '|'); ++j) {
-                               extract(cmd, not_shared_with, j);
+               for (i=0; i<num_tokens(shared_with, '\n'); ++i) {
+                       extract_token(buf, shared_with, i, '\n');
+                       extract_token(node, buf, 0, '|');
+                       for (j=0; j<num_tokens(not_shared_with, '\n'); ++j) {
+                               extract_token(cmd, not_shared_with, j, '\n');
                                if (!strcasecmp(node, cmd)) {
-                                       remove_token(not_shared_with, j, '|');
+                                       remove_token(not_shared_with, j, '\n');
                                }
                        }
                }
 
                /* Display the stuff */
-               wprintf("<CENTER><BR>"
+               wprintf("<CENTER><br />"
                        "<TABLE border=1 cellpadding=5><TR>"
                        "<TD><B><I>Shared with</I></B></TD>"
                        "<TD><B><I>Not shared with</I></B></TD></TR>\n"
-                       "<TR><TD>\n");
-
-               for (i=0; i<num_tokens(shared_with, '|'); ++i) {
-                       extract(node, shared_with, i);
+                       "<TR><TD VALIGN=TOP>\n");
+
+               wprintf("<TABLE border=0 cellpadding=5><TR BGCOLOR=\"#CCCCCC\">"
+                       "<TD>Remote node name</TD>"
+                       "<TD>Remote room name</TD>"
+                       "<TD>Actions</TD>"
+                       "</TR>\n"
+               );
+
+               for (i=0; i<num_tokens(shared_with, '\n'); ++i) {
+                       extract_token(buf, shared_with, i, '\n');
+                       extract_token(node, buf, 0, '|');
+                       extract_token(remote_room, buf, 1, '|');
                        if (strlen(node) > 0) {
-                               wprintf("%s ", node);
-                               wprintf("<A HREF=\"/netedit&cmd=remove&line="
-                                       "ignet_push_share|");
+                               wprintf("<FORM METHOD=\"POST\" "
+                                       "ACTION=\"/netedit\">"
+                                       "<TR><TD>%s</TD>\n", node);
+
+                               wprintf("<TD>");
+                               if (strlen(remote_room) > 0) {
+                                       escputs(remote_room);
+                               }
+                               wprintf("</TD>");
+
+                               wprintf("<TD>");
+               
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"line\" "
+                                       "VALUE=\"ignet_push_share|");
                                urlescputs(node);
-                               wprintf("&tab=sharing\">(unshare)</A><BR>");
+                               if (strlen(remote_room) > 0) {
+                                       wprintf("|");
+                                       urlescputs(remote_room);
+                               }
+                               wprintf("\">");
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"tab\" "
+                                       "VALUE=\"sharing\">\n");
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"cmd\" "
+                                       "VALUE=\"remove\">\n");
+                               wprintf("<INPUT TYPE=\"submit\" "
+                                       "NAME=\"sc\" VALUE=\"Unshare\">");
+                               wprintf("</TD></TR></FORM>\n");
                        }
                }
 
-               wprintf("</TD><TD>\n");
-
-               for (i=0; i<num_tokens(not_shared_with, '|'); ++i) {
-                       extract(node, not_shared_with, i);
+               wprintf("</TABLE>\n");
+               wprintf("</TD><TD VALIGN=TOP>\n");
+               wprintf("<TABLE border=0 cellpadding=5><TR BGCOLOR=\"#CCCCCC\">"
+                       "<TD>Remote node name</TD>"
+                       "<TD>Remote room name</TD>"
+                       "<TD>Actions</TD>"
+                       "</TR>\n"
+               );
+
+               for (i=0; i<num_tokens(not_shared_with, '\n'); ++i) {
+                       extract_token(node, not_shared_with, i, '\n');
                        if (strlen(node) > 0) {
-                               wprintf("%s ", node);
-                               wprintf("<A HREF=\"/netedit&cmd=add&line="
-                                       "ignet_push_share|");
+                               wprintf("<FORM METHOD=\"POST\" "
+                                       "ACTION=\"/netedit\">"
+                                       "<TR><TD>");
+                               escputs(node);
+                               wprintf("</TD><TD>"
+                                       "<INPUT TYPE=\"INPUT\" "
+                                       "NAME=\"suffix\" "
+                                       "MAXLENGTH=128>"
+                                       "</TD><TD>");
+                               wprintf("<INPUT TYPE=\"hidden\" "
+                                       "NAME=\"line\" "
+                                       "VALUE=\"ignet_push_share|");
                                urlescputs(node);
-                               wprintf("&tab=sharing\">(share)</A><BR>");
+                               wprintf("|\">");
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"tab\" "
+                                       "VALUE=\"sharing\">\n");
+                               wprintf("<INPUT TYPE=\"hidden\" NAME=\"cmd\" "
+                                       "VALUE=\"add\">\n");
+                               wprintf("<INPUT TYPE=\"submit\" "
+                                       "NAME=\"sc\" VALUE=\"Share\">");
+                               wprintf("</TD></TR></FORM>\n");
                        }
                }
 
+               wprintf("</TABLE>\n");
                wprintf("</TD></TR>"
-                       "</TABLE><BR>\n"
-                       "<I><B>Reminder:</B> When sharing a room, "
+                       "</TABLE></CENTER><br />\n"
+                       "<I><B>Notes:</B><UL><LI>When sharing a room, "
                        "it must be shared from both ends.  Adding a node to "
                        "the 'shared' list sends messages out, but in order to"
                        " receive messages, the other nodes must be configured"
-                       " to send messages out to your system as well.</I><BR>"
-                       "</CENTER>\n");
+                       " to send messages out to your system as well.\n"
+                       "<LI>If the remote room name is blank, it is assumed "
+                       "that the room name is identical on the remote node."
+                       "<LI>If the remote room name is different, the remote "
+                       "node must also configure the name of the room here."
+                       "</UL></I><br />\n"
+               );
 
        }
 
        /* Mailing list management */
        if (!strcmp(tab, "listserv")) {
 
-               wprintf("<BR><center>"
+               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");
+                       "</i><br /><br />\n");
 
                serv_puts("GNET");
                serv_gets(buf);
@@ -1077,11 +1257,11 @@ void display_editroom(void)
                                wprintf(" <A HREF=\"/netedit&cmd=remove&line="
                                        "listrecp|");
                                urlescputs(recp);
-                               wprintf("&tab=listserv\">(remove)</A><BR>");
+                               wprintf("&tab=listserv\">(remove)</A><br />");
 
                        }
                }
-               wprintf("<BR><FORM METHOD=\"POST\" ACTION=\"/netedit\">\n"
+               wprintf("<br /><FORM METHOD=\"POST\" ACTION=\"/netedit\">\n"
                        "<INPUT TYPE=\"hidden\" NAME=\"tab\" VALUE=\"listserv\">\n"
                        "<INPUT TYPE=\"hidden\" NAME=\"prefix\" VALUE=\"listrecp|\">\n");
                wprintf("<INPUT TYPE=\"text\" NAME=\"line\">\n");
@@ -1093,7 +1273,7 @@ void display_editroom(void)
                wprintf("<i>The contents of this room are being "
                        "mailed <b>in digest form</b> "
                        "to the following list recipients:"
-                       "</i><br><br>\n");
+                       "</i><br /><br />\n");
 
                serv_puts("GNET");
                serv_gets(buf);
@@ -1106,27 +1286,27 @@ void display_editroom(void)
                                wprintf(" <A HREF=\"/netedit&cmd=remove&line="
                                        "digestrecp|");
                                urlescputs(recp);
-                               wprintf("&tab=listserv\">(remove)</A><BR>");
+                               wprintf("&tab=listserv\">(remove)</A><br />");
 
                        }
                }
-               wprintf("<BR><FORM METHOD=\"POST\" ACTION=\"/netedit\">\n"
+               wprintf("<br /><FORM METHOD=\"POST\" ACTION=\"/netedit\">\n"
                        "<INPUT TYPE=\"hidden\" NAME=\"tab\" VALUE=\"listserv\">\n"
                        "<INPUT TYPE=\"hidden\" NAME=\"prefix\" VALUE=\"digestrecp|\">\n");
                wprintf("<INPUT TYPE=\"text\" NAME=\"line\">\n");
                wprintf("<INPUT TYPE=\"submit\" NAME=\"cmd\" VALUE=\"Add\">");
                wprintf("</FORM>\n");
                
-               wprintf("</TD></TR></TABLE><HR>\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"
+                               "Click to disable.</A><br />\n"
                                "The URL for subscribe/unsubscribe is: "
-                               "<TT>http://%s/listsub</TT><BR>\n",
+                               "<TT>http://%s/listsub</TT><br />\n",
                                WC->http_host
                        );
                }
@@ -1135,7 +1315,7 @@ void display_editroom(void)
                                "self-service subscribe/unsubscribe requests."
                                " <A HREF=\"/toggle_self_service?newval=1&"
                                "tab=listserv\">"
-                               "Click to enable.</A><BR>\n"
+                               "Click to enable.</A><br />\n"
                        );
                }
 
@@ -1143,8 +1323,88 @@ void display_editroom(void)
                wprintf("</CENTER>\n");
        }
 
+
+       /* Mailing list management */
+       if (!strcmp(tab, "expire")) {
+
+               serv_puts("GPEX room");
+               serv_gets(buf);
+               if (buf[0] == '2') {
+                       roompolicy = extract_int(&buf[4], 0);
+                       roomvalue = extract_int(&buf[4], 1);
+               }
+               
+               serv_puts("GPEX floor");
+               serv_gets(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("<TABLE border=0 cellspacing=5>\n");
+               wprintf("<TR><TD>Message expire policy for this room<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<br />\n");
+               wprintf("<INPUT TYPE=\"radio\" NAME=\"roompolicy\" VALUE=\"1\" %s>",
+                       ((roompolicy == 1) ? "CHECKED" : "") );
+               wprintf("Never automatically expire messages<br />\n");
+               wprintf("<INPUT TYPE=\"radio\" NAME=\"roompolicy\" VALUE=\"2\" %s>",
+                       ((roompolicy == 2) ? "CHECKED" : "") );
+               wprintf("Expire by message count<br />\n");
+               wprintf("<INPUT TYPE=\"radio\" NAME=\"roompolicy\" VALUE=\"3\" %s>",
+                       ((roompolicy == 3) ? "CHECKED" : "") );
+               wprintf("Expire by message age<br />");
+               wprintf("Number of messages or days: ");
+               wprintf("<INPUT TYPE=\"text\" NAME=\"roomvalue\" MAXLENGTH=\"5\" VALUE=\"%d\">", roomvalue);
+               wprintf("</TD></TR>\n");
+
+               if (WC->axlevel >= 6) {
+                       wprintf("<TR><TD COLSPAN=2><hr /></TD></TR>\n");
+                       wprintf("<TR><TD>Message expire policy for this floor<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<br />\n");
+                       wprintf("<INPUT TYPE=\"radio\" NAME=\"floorpolicy\" VALUE=\"1\" %s>",
+                               ((floorpolicy == 1) ? "CHECKED" : "") );
+                       wprintf("Never automatically expire messages<br />\n");
+                       wprintf("<INPUT TYPE=\"radio\" NAME=\"floorpolicy\" VALUE=\"2\" %s>",
+                               ((floorpolicy == 2) ? "CHECKED" : "") );
+                       wprintf("Expire by message count<br />\n");
+                       wprintf("<INPUT TYPE=\"radio\" NAME=\"floorpolicy\" VALUE=\"3\" %s>",
+                               ((floorpolicy == 3) ? "CHECKED" : "") );
+                       wprintf("Expire by message age<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=\"sc\" VALUE=\"OK\">");
+               wprintf("&nbsp;");
+               wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
+               wprintf("</CENTER></TD><TR>\n");
+
+               wprintf("</TABLE>\n"
+                       "<INPUT TYPE=\"hidden\" NAME=\"tab\" VALUE=\"expire\">\n"
+                       "</FORM>\n"
+               );
+
+       }
+
+       /* Mailing list management */
+       if (!strcmp(tab, "access")) {
+               display_whok();
+       }
+
        /* end content of whatever tab is open now */
-       wprintf("</TD></TR></TABLE>\n");
+       wprintf("</TD></TR></TABLE></div>\n");
 
        wDumpContent(1);
 }
@@ -1181,7 +1441,7 @@ void editroom(void)
        if (strcmp(bstr("sc"), "OK")) {
                strcpy(WC->ImportantMessage,
                        "Cancelled.  Changes were not saved.");
-               display_main_menu();
+               display_editroom();
                return;
        }
        serv_puts("GETR");
@@ -1189,7 +1449,7 @@ void editroom(void)
 
        if (buf[0] != '2') {
                strcpy(WC->ImportantMessage, &buf[4]);
-               display_main_menu();
+               display_editroom();
                return;
        }
        extract(er_name, &buf[4], 0);
@@ -1246,6 +1506,12 @@ void editroom(void)
                er_flags &= ~QR_READONLY;
        }
 
+       if (!strcmp(bstr("permanent"), "yes")) {
+               er_flags |= QR_PERMANENT;
+       } else {
+               er_flags &= ~QR_PERMANENT;
+       }
+
        if (!strcmp(bstr("network"), "yes")) {
                er_flags |= QR_NETWORK;
        } else {
@@ -1296,10 +1562,10 @@ void editroom(void)
        serv_gets(buf);
        if (buf[0] != '2') {
                strcpy(WC->ImportantMessage, &buf[4]);
-               display_main_menu();
+               display_editroom();
                return;
        }
-       gotoroom(er_name, 0);
+       gotoroom(er_name);
 
        if (strlen(er_roomaide) > 0) {
                sprintf(buf, "SETA %s", er_roomaide);
@@ -1311,29 +1577,31 @@ void editroom(void)
                        return;
                }
        }
-       smart_goto(er_name);
+       gotoroom(er_name);
+       strcpy(WC->ImportantMessage, "Your changes have been saved.");
+       display_editroom();
+       return;
 }
 
+
 /*
- * Invite, Kick, and show Who Knows a room
+ * Display form for Invite, Kick, and show Who Knows a room
  */
-void display_whok(void)
-{
+void do_invt_kick(void) {
         char buf[SIZ], room[SIZ], username[SIZ];
 
         serv_puts("GETR");
         serv_gets(buf);
 
         if (buf[0] != '2') {
-               strcpy(WC->ImportantMessage, &buf[4]);
-               display_main_menu();
+               escputs(&buf[4]);
                return;
         }
         extract(room, &buf[4], 0);
 
         strcpy(username, bstr("username"));
 
-        if(!strcmp(bstr("sc"), "Kick")) {
+        if (!strcmp(bstr("sc"), "Kick")) {
                 sprintf(buf, "KICK %s", username);
                 serv_puts(buf);
                 serv_gets(buf);
@@ -1345,7 +1613,9 @@ void display_whok(void)
                                "<B><I>User %s kicked out of room %s.</I></B>\n", 
                                 username, room);
                 }
-        } else if(!strcmp(bstr("sc"), "Invite")) {
+        }
+
+       if (!strcmp(bstr("sc"), "Invite")) {
                 sprintf(buf, "INVT %s", username);
                 serv_puts(buf);
                 serv_gets(buf);
@@ -1358,19 +1628,37 @@ void display_whok(void)
                                 username, room);
                 }
         }
-        
-        output_headers(1);
-       stresc(buf, WC->wc_roomname, 1);
-       svprintf("BOXTITLE", WCS_STRING, "Access control list for %s", buf);
-       do_template("beginbox");
 
+       display_editroom();
+}
+
+
+
+/*
+ * Display form for Invite, Kick, and show Who Knows a room
+ */
+void display_whok(void)
+{
+        char buf[SIZ], room[SIZ], username[SIZ];
+
+        serv_puts("GETR");
+        serv_gets(buf);
+
+        if (buf[0] != '2') {
+               escputs(&buf[4]);
+               return;
+        }
+        extract(room, &buf[4], 0);
+
+        
        wprintf("<TABLE border=0 CELLSPACING=10><TR VALIGN=TOP>"
                "<TD>The users listed below have access to this room.  "
                "To remove a user from the access list, select the user "
-               "name from the list and click 'Kick'.<BR><BR>");
+               "name from the list and click 'Kick'.<br /><br />");
        
-        wprintf("<CENTER><FORM METHOD=\"POST\" ACTION=\"/display_whok\">\n");
-        wprintf("<SELECT NAME=\"username\" SIZE=10>\n");
+        wprintf("<CENTER><FORM METHOD=\"POST\" ACTION=\"/do_invt_kick\">\n");
+       wprintf("<INPUT TYPE=\"hidden\" NAME=\"tab\" VALUE=\"access\">\n");
+        wprintf("<SELECT NAME=\"username\" SIZE=\"10\" style=\"width:100%%\">\n");
         serv_puts("WHOK");
         serv_gets(buf);
         if (buf[0] == '1') {
@@ -1381,24 +1669,24 @@ void display_whok(void)
                         wprintf("\n");
                 }
         }
-        wprintf("</SELECT><BR>\n");
+        wprintf("</SELECT><br />\n");
 
         wprintf("<input type=submit name=sc value=\"Kick\">");
         wprintf("</FORM></CENTER>\n");
 
        wprintf("</TD><TD>"
                "To grant another user access to this room, enter the "
-               "user name in the box below and click 'Invite'.<BR><BR>");
+               "user name in the box below and click 'Invite'.<br /><br />");
 
-        wprintf("<CENTER><FORM METHOD=\"POST\" ACTION=\"/display_whok\">\n");
+        wprintf("<CENTER><FORM METHOD=\"POST\" ACTION=\"/do_invt_kick\">\n");
+       wprintf("<INPUT TYPE=\"hidden\" NAME=\"tab\" VALUE=\"access\">\n");
         wprintf("Invite: ");
-        wprintf("<input type=text name=username><BR>\n"
-               "<input type=hidden name=sc value=\"Invite\">"
-               "<input type=submit value=\"Invite\">"
+        wprintf("<input type=\"text\" name=\"username\" style=\"width:100%%\"><br />\n"
+               "<input type=\"hidden\" name=\"sc\" value=\"Invite\">"
+               "<input type=\"submit\" value=\"Invite\">"
                "</FORM></CENTER>\n");
 
        wprintf("</TD></TR></TABLE>\n");
-       do_template("endbox");
         wDumpContent(1);
 }
 
@@ -1420,14 +1708,22 @@ void display_entroom(void)
                display_main_menu();
                return;
        }
-       output_headers(3);
-       svprintf("BOXTITLE", WCS_STRING, "Create a new room");
-       do_template("beginbox");
+
+       output_headers(1, 1, 2, 0, 0, 0, 0);
+       wprintf("<div id=\"banner\">\n"
+               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<SPAN CLASS=\"titlebar\">Create a new room</SPAN>"
+               "</TD></TR></TABLE>\n"
+               "</div>\n<div id=\"content\">\n"
+       );
+
+       wprintf("<div style=\"margin-right:1px\">"
+               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/entroom\">\n");
 
        wprintf("<UL><LI>Name of room: ");
-       wprintf("<INPUT TYPE=\"text\" NAME=\"er_name\" MAXLENGTH=\"19\">\n");
+       wprintf("<INPUT TYPE=\"text\" NAME=\"er_name\" MAXLENGTH=\"127\">\n");
 
         wprintf("<LI>Resides on floor: ");
         load_floorlist(); 
@@ -1441,6 +1737,16 @@ void display_entroom(void)
                 }
         wprintf("</SELECT>\n");
 
+       wprintf("<LI>Default view for room: ");
+        wprintf("<SELECT NAME=\"er_view\" SIZE=\"1\">\n");
+       for (i=0; i<(sizeof viewdefs / sizeof (char *)); ++i) {
+               wprintf("<OPTION %s VALUE=\"%d\">",
+                       ((i == 0) ? "SELECTED" : ""), i );
+               escputs(viewdefs[i]);
+               wprintf("</OPTION>\n");
+       }
+       wprintf("</SELECT>\n");
+
        wprintf("<LI>Type of room:<UL>\n");
 
        wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"public\" ");
@@ -1460,27 +1766,18 @@ void display_entroom(void)
        wprintf("> Personal (mailbox for you only)\n");
        wprintf("</UL>\n");
 
-       wprintf("<LI>Default view for room: "); /* FOO */
-        wprintf("<SELECT NAME=\"er_view\" SIZE=\"1\">\n");
-       for (i=0; i<(sizeof viewdefs / sizeof (char *)); ++i) {
-               wprintf("<OPTION %s VALUE=\"%d\">",
-                       ((i == 0) ? "SELECTED" : ""), i );
-               escputs(viewdefs[i]);
-               wprintf("</OPTION>\n");
-       }
-       wprintf("</SELECT>\n");
-
        wprintf("<CENTER>\n");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
+       wprintf("&nbsp;");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
        wprintf("</CENTER>\n");
-       wprintf("</FORM>\n<HR>");
+       wprintf("</FORM>\n<hr />");
        serv_printf("MESG roomaccess");
        serv_gets(buf);
        if (buf[0] == '1') {
                fmout(NULL, "CENTER");
        }
-       do_template("endbox");
+       wprintf("</td></tr></table></div>\n");
        wDumpContent(1);
 }
 
@@ -1529,11 +1826,12 @@ void er_set_default_view(int newview) {
 void entroom(void)
 {
        char buf[SIZ];
-       char er_name[20];
-       char er_type[20];
-       char er_password[10];
+       char er_name[SIZ];
+       char er_type[SIZ];
+       char er_password[SIZ];
        int er_floor;
        int er_num_type;
+       int er_view;
 
        if (strcmp(bstr("sc"), "OK")) {
                strcpy(WC->ImportantMessage,
@@ -1545,6 +1843,7 @@ void entroom(void)
        strcpy(er_type, bstr("type"));
        strcpy(er_password, bstr("er_password"));
        er_floor = atoi(bstr("er_floor"));
+       er_view = atoi(bstr("er_view"));
 
        er_num_type = 0;
        if (!strcmp(er_type, "guessname"))
@@ -1556,8 +1855,8 @@ void entroom(void)
        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);
+       sprintf(buf, "CRE8 1|%s|%d|%s|%d|%d|%d", 
+               er_name, er_num_type, er_password, er_floor, 0, er_view);
        serv_puts(buf);
        serv_gets(buf);
        if (buf[0] != '2') {
@@ -1565,9 +1864,8 @@ void entroom(void)
                display_main_menu();
                return;
        }
-       gotoroom(er_name, 0);
-       er_set_default_view(atoi(bstr("er_view")));     /* Set default view */
-       do_change_view(atoi(bstr("er_view")));          /* Now go there */
+       gotoroom(er_name);
+       do_change_view(er_view);                /* Now go there */
 }
 
 
@@ -1577,18 +1875,18 @@ void entroom(void)
 void display_private(char *rname, int req_pass)
 {
 
-       output_headers(3);
+       output_headers(1, 1, 0, 0, 0, 0, 0);
 
        svprintf("BOXTITLE", WCS_STRING, "Go to a hidden room");
        do_template("beginbox");
 
        wprintf("<CENTER>\n");
-       wprintf("<BR>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("<br /><br />");
 
        wprintf("<FORM METHOD=\"GET\" ACTION=\"/goto_private\">\n");
 
@@ -1604,7 +1902,7 @@ void display_private(char *rname, int req_pass)
                wprintf("Enter room password:</TD><TD>");
                wprintf("<INPUT TYPE=\"password\" NAME=\"gr_pass\" MAXLENGTH=\"9\">\n");
        }
-       wprintf("</TD></TR></TABLE><BR>\n");
+       wprintf("</TD></TR></TABLE><br />\n");
 
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">"
                "&nbsp;"
@@ -1642,7 +1940,7 @@ void goto_private(void)
                display_private(bstr("gr_name"), 1);
                return;
        }
-       output_headers(1);
+       output_headers(1, 1, 1, 0, 0, 0, 0);
        wprintf("%s\n", &buf[4]);
        wDumpContent(1);
        return;
@@ -1654,18 +1952,21 @@ void goto_private(void)
  */
 void display_zap(void)
 {
-       output_headers(1);
+       output_headers(1, 1, 2, 0, 0, 0, 0);
 
+       wprintf("<div id=\"banner\">\n");
        wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
-       wprintf("<SPAN CLASS=\"titlebar\">Zap (forget) the current room</SPAN>\n");
+       wprintf("<SPAN CLASS=\"titlebar\">Zap (forget/unsubscribe) the current room</SPAN>\n");
        wprintf("</TD></TR></TABLE>\n");
+       wprintf("</div>\n<div id=\"content\">\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("to do?<br />\n");
 
        wprintf("<FORM METHOD=\"GET\" ACTION=\"/zap\">\n");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
+       wprintf("&nbsp;");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
        wprintf("</FORM>\n");
        wDumpContent(1);
@@ -1688,14 +1989,10 @@ void zap(void)
        if (!strcasecmp(bstr("sc"), "OK")) {
                serv_printf("GOTO %s", WC->wc_roomname);
                serv_gets(buf);
-               if (buf[0] != '2') {
-                       /* ExpressMessageCat(&buf[4]); */
-               } else {
+               if (buf[0] == '2') {
                        serv_puts("FORG");
                        serv_gets(buf);
-                       if (buf[0] != '2') {
-                               /* ExpressMessageCat(&buf[4]); */
-                       } else {
+                       if (buf[0] == '2') {
                                strcpy(final_destination, "_BASEROOM_");
                        }
                }
@@ -1720,17 +2017,19 @@ void confirm_delete_room(void)
                display_main_menu();
                return;
        }
-       output_headers(1);
+       output_headers(1, 1, 2, 0, 0, 0, 0);
+       wprintf("<div id=\"banner\">\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("</div>\n<div id=\"content\">\n");
 
        wprintf("<CENTER>");
        wprintf("<FORM METHOD=\"GET\" ACTION=\"/delete_room\">\n");
 
        wprintf("Are you sure you want to delete <FONT SIZE=+1>");
        escputs(WC->wc_roomname);
-       wprintf("</FONT>?<BR>\n");
+       wprintf("</FONT>?<br />\n");
 
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Delete\">");
        wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
@@ -1776,6 +2075,10 @@ void netedit(void) {
        FILE *fp;
        char buf[SIZ];
        char line[SIZ];
+       char cmpa0[SIZ];
+       char cmpa1[SIZ];
+       char cmpb0[SIZ];
+       char cmpb1[SIZ];
 
        if (strlen(bstr("line"))==0) {
                display_editroom();
@@ -1802,7 +2105,12 @@ void netedit(void) {
 
        /* This loop works for add *or* remove.  Spiffy, eh? */
        while (serv_gets(buf), strcmp(buf, "000")) {
-               if (strcasecmp(buf, line)) {
+               extract(cmpa0, buf, 0);
+               extract(cmpa1, buf, 1);
+               extract(cmpb0, line, 0);
+               extract(cmpb1, line, 1);
+               if ( (strcasecmp(cmpa0, cmpb0)) 
+                  || (strcasecmp(cmpa1, cmpb1)) ) {
                        fprintf(fp, "%s\n", buf);
                }
        }
@@ -1872,6 +2180,7 @@ void do_change_view(int newview) {
 
        serv_printf("VIEW %d", newview);
        serv_gets(buf);
+       WC->wc_view = newview;
        smart_goto(WC->wc_roomname);
 }
 
@@ -1895,24 +2204,53 @@ void do_folder_view(struct folder *fold, int max_folders, int num_floors) {
        char buf[SIZ];
        int levels, oldlevels;
        int i, t;
+       int actnum = 0;
+       int has_subfolders = 0;
+
+       /* Include the menu expanding/collapsing code */
+       wprintf("<script type=\"text/javascript\" src=\"/static/menuExpandable3.js\"></script>\n");
 
-       do_template("beginbox_nt");
+       /* BEGIN TREE MENU */
+       wprintf("<div style=\"background: white\">\n");
+       wprintf("<div id=\"mainMenu\">\n");
+       wprintf("<UL id=\"menuList\">\n");
        levels = 0;
        oldlevels = 0;
+
        for (i=0; i<max_folders; ++i) {
 
+               has_subfolders = 0;
+               if ((i+1) < max_folders) {
+                       if ( (!strncasecmp(fold[i].name, fold[i+1].name, strlen(fold[i].name)))
+                          && (fold[i+1].name[strlen(fold[i].name)] == '|') ) {
+                               has_subfolders = 1;
+                       }
+               }
+
                levels = num_tokens(fold[i].name, '|');
-               oldlevels = levels;
 
-               for (t=0; t<levels; ++t) wprintf("&nbsp;&nbsp;&nbsp;");
+               if ( (levels < oldlevels) || ((levels==1)&&(i!=0)) ) {
+                       for (t=0; t<(oldlevels-levels); ++t) {
+                               wprintf("</UL>\n");
+                       }
+               }
+
+               if (has_subfolders) {
+                       wprintf("<LI");
+                       if (levels == 1) wprintf(" class=\"menubar\"");
+                       wprintf(">");
+                       wprintf("<A href=\"#\" id=\"actuator%d\" class=\"actuator\"></a>\n", actnum);
+               }
+               else {
+                       wprintf("<LI>");
+               }
+
                if (fold[i].selectable) {
                        wprintf("<A HREF=\"/dotgoto?room=");
                        urlescputs(fold[i].room);
                        wprintf("\">");
                }
-               else {
-                       wprintf("<i>");
-               }
+
                if (levels == 1) {
                        wprintf("<SPAN CLASS=\"roomlist_floor\">");
                }
@@ -1925,18 +2263,33 @@ void do_folder_view(struct folder *fold, int max_folders, int num_floors) {
                extract(buf, fold[i].name, levels-1);
                escputs(buf);
                wprintf("</SPAN>");
+
+               if (!strcasecmp(fold[i].name, "My Folders|Mail")) {
+                       wprintf(" (INBOX)");
+               }
+
                if (fold[i].selectable) {
                        wprintf("</A>");
                }
-               else {
-                       wprintf("</i>");
-               }
-               if (!strcasecmp(fold[i].name, "My Folders|Mail")) {
-                       wprintf(" (INBOX)");
+               wprintf("\n");
+
+               if (has_subfolders) {
+                       wprintf("<UL id=\"menu%d\" class=\"%s\">\n",
+                               actnum++,
+                               ( (levels == 1) ? "menu" : "submenu")
+                       );
                }
-               wprintf("<BR>\n");
+
+               oldlevels = levels;
        }
-       do_template("endbox");
+       wprintf("</UL></UL>\n");
+       wprintf("<img src=\"/static/blank.gif\" onLoad = ' \n");
+       for (i=0; i<actnum; ++i) {
+               wprintf(" initializeMenu(\"menu%d\", \"actuator%d\");\n", i, i);
+       }
+       wprintf(" ' > \n");
+       wprintf("</DIV>\n");
+       /* END TREE MENU */
 }
 
 /*
@@ -1959,8 +2312,8 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
        if (boxes_per_column < 1) boxes_per_column = 1;
 
        /* Outer table (for columnization) */
-       wprintf("<TABLE BORDER=0 WIDTH=100%% CELLPADDING=5>"
-               "<TR><TD VALIGN=TOP>");
+       wprintf("<TABLE BORDER=0 WIDTH=96%% CELLPADDING=5>"
+               "<tr><td valign=top>");
 
        levels = 0;
        oldlevels = 0;
@@ -1968,7 +2321,7 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
 
                levels = num_tokens(fold[i].name, '|');
 
-               if ((levels == 1) && (oldlevels == 2)) {
+               if ((levels == 1) && (oldlevels > 1)) {
 
                        /* End inner box */
                        do_template("endbox");
@@ -1977,7 +2330,7 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
                        if ((num_boxes % boxes_per_column) == 0) {
                                ++current_column;
                                if (current_column < columns) {
-                                       wprintf("</TD><TD VALIGN=TOP>\n");
+                                       wprintf("</td><td valign=top>\n");
                                }
                        }
                }
@@ -1986,7 +2339,7 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
 
                        /* Begin inner box */
                        extract(buf, fold[i].name, levels-1);
-                       stresc(boxtitle, buf, 1);
+                       stresc(boxtitle, buf, 1, 0);
                        svprintf("BOXTITLE", WCS_STRING, boxtitle);
                        do_template("beginbox");
 
@@ -2023,7 +2376,7 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
                        if (!strcasecmp(fold[i].name, "My Folders|Mail")) {
                                wprintf(" (INBOX)");
                        }
-                       wprintf("<BR>\n");
+                       wprintf("<br />\n");
                }
        }
        /* End the final inner box */
@@ -2125,6 +2478,14 @@ void list_all_rooms_by_floor(char *viewpref) {
                }
        }
 
+/* test only hackish view 
+       wprintf("<table><TR><TD>A Table</TD></TR></table>\n");
+       for (i=0; i<max_folders; ++i) {
+               escputs(fold[i].name);
+               wprintf("<br />\n");
+       }
+ */
+
        if (!strcasecmp(viewpref, "folders")) {
                do_folder_view(fold, max_folders, num_floors);
        }
@@ -2143,7 +2504,7 @@ void list_all_rooms_by_floor(char *viewpref) {
 void knrooms() {
        char listviewpref[SIZ];
 
-       output_headers(3);
+       output_headers(1, 1, 2, 0, 0, 0, 0);
        load_floorlist();
 
        /* Determine whether the user is trying to change views */
@@ -2161,7 +2522,8 @@ void knrooms() {
        }
 
        /* title bar */
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#000077\"><TR><TD>"
+       wprintf("<div id=\"banner\">\n"
+               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
                "<SPAN CLASS=\"titlebar\">"
        );
        if (!strcasecmp(listviewpref, "rooms")) {
@@ -2175,9 +2537,8 @@ void knrooms() {
        }
        wprintf("</SPAN></TD>\n");
 
-
        /* offer the ability to switch views */
-       wprintf("<TD><FORM NAME=\"roomlistomatic\">\n"
+       wprintf("<TD ALIGN=RIGHT><FORM NAME=\"roomlistomatic\">\n"
                "<SELECT NAME=\"newview\" SIZE=\"1\" "
                "OnChange=\"location.href=roomlistomatic.newview.options"
                "[selectedIndex].value\">\n");
@@ -2194,21 +2555,42 @@ void knrooms() {
                ( !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");
+       wprintf("</SELECT><br />");
        offer_start_page();
-       wprintf("</TD></TR></TABLE>\n");
+       wprintf("</FORM></TD></TR></TABLE>\n");
+       wprintf("</div>\n"
+               "</div>\n"
+               "<div id=\"content\">\n");
 
        /* Display the room list in the user's preferred format */
-       if (!strcasecmp(listviewpref, "table")) {
-               tabular_room_list();
+       list_all_rooms_by_floor(listviewpref);
+}
+
+
+
+/* 
+ * Set the message expire policy for this room and/or floor
+ */
+void set_room_policy(void) {
+       char buf[SIZ];
+
+       if (strcmp(bstr("sc"), "OK")) {
+               strcpy(WC->ImportantMessage,
+                       "Cancelled.  Changes were not saved.");
+               display_editroom();
+               return;
        }
-       else {
-               list_all_rooms_by_floor(listviewpref);
+
+       serv_printf("SPEX room|%d|%d", atoi(bstr("roompolicy")), atoi(bstr("roomvalue")));
+       serv_gets(buf);
+       strcpy(WC->ImportantMessage, &buf[4]);
+
+       if (WC->axlevel >= 6) {
+               strcat(WC->ImportantMessage, "<br />\n");
+               serv_printf("SPEX floor|%d|%d", atoi(bstr("floorpolicy")), atoi(bstr("floorvalue")));
+               serv_gets(buf);
+               strcat(WC->ImportantMessage, &buf[4]);
        }
+
+       display_editroom();
 }