* summary.c: summary screen is now updated using ajax instead of refreshing
[citadel.git] / webcit / roomops.c
index dde608aa776316aa6cdb5bec64ccfe5fb6d547bc..ccc29e5a306b1916b9ed7d349fd54296137952e7 100644 (file)
@@ -1,25 +1,9 @@
-/* $Id$ */
-
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <pthread.h>
-#include <signal.h>
+/*
+ * $Id$
+ *
+ * Lots of different room-related operations.
+ */
+
 #include "webcit.h"
 
 struct folder {
@@ -29,15 +13,16 @@ struct folder {
        int hasnewmsgs;
        int is_mailbox;
        int selectable;
+       int view;
 };
 
 char *viewdefs[] = {
-       "Messages",
-       "Summary",
+       "Bulletin Board",
+       "Mail Folder",
        "Address Book",
        "Calendar",
-       "Tasks",
-       "Notes"
+       "Task List",
+       "Notes List"
 };
 
 char floorlist[128][SIZ];
@@ -54,13 +39,13 @@ void load_floorlist(void)
                floorlist[a][0] = 0;
 
        serv_puts("LFLR");
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
        if (buf[0] != '1') {
                strcpy(floorlist[0], "Main Floor");
                return;
        }
-       while (serv_gets(buf), strcmp(buf, "000")) {
-               extract(floorlist[extract_int(buf, 0)], buf, 1);
+       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+               extract_token(floorlist[extract_int(buf, 0)], buf, 1, '|', sizeof floorlist[0]);
        }
 }
 
@@ -169,15 +154,15 @@ void listrms(char *variety)
 
        /* Ask the server for a room list */
        serv_puts(variety);
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
        if (buf[0] != '1') {
                wprintf("&nbsp;");
                return;
        }
-       while (serv_gets(buf), strcmp(buf, "000")) {
+       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
                ++num_rooms;
                rp = malloc(sizeof(struct roomlisting));
-               extract(rp->rlname, buf, 0);
+               extract_token(rp->rlname, buf, 0, '|', sizeof rp->rlname);
                rp->rlflags = extract_int(buf, 1);
                rp->rlfloor = extract_int(buf, 2);
                rp->rlorder = extract_int(buf, 3);
@@ -221,15 +206,15 @@ void listrms(char *variety)
  */
 void zapped_list(void)
 {
-       output_headers(1, 1, 0, 0, 0, 0, 0);
+       output_headers(1, 1, 0, 0, 0, 0);
 
-       svprintf("BOXTITLE", WCS_STRING, "Zapped (forgotten) rooms");
+       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");
+       wprintf(_("Click on any room to un-zap it and goto that room.\n"));
        do_template("endbox");
        wDumpContent(1);
 }
@@ -243,32 +228,67 @@ void readinfo(void)
        char buf[SIZ];
 
        serv_puts("RINF");
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
        if (buf[0] == '1') {
-               fmout(NULL, "CENTER");
+               fmout("CENTER");
        }
 }
 
 
 
 
-/* Display room graphic.  The server doesn't actually
+/* Display room banner icon.  The server doesn't actually
  * need the room name, but we supply it in order to
- * keep the browser from using a cached graphic from 
+ * keep the browser from using a cached icon from 
  * another room.
  */
 void embed_room_graphic(void) {
        char buf[SIZ];
 
        serv_puts("OIMG _roompic_");
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
        if (buf[0] == '2') {
-               wprintf("<TD BGCOLOR=\"#444455\">");
                wprintf("<IMG HEIGHT=64 SRC=\"/image&name=_roompic_&room=");
                urlescputs(WC->wc_roomname);
-               wprintf("\"></TD>");
+               wprintf("\">");
                serv_puts("CLOS");
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
+       }
+       else if (WC->wc_view == VIEW_ADDRESSBOOK) {
+               wprintf("<img height=48 width=48 src=\""
+                       "static/viewcontacts_48x.gif"
+                       "\">"
+               );
+       }
+       else if (WC->wc_view == VIEW_CALENDAR) {
+               wprintf("<img height=48 width=48 src=\""
+                       "static/calarea_48x.gif"
+                       "\">"
+               );
+       }
+       else if (WC->wc_view == VIEW_TASKS) {
+               wprintf("<img height=48 width=48 src=\""
+                       "static/taskmanag_48x.gif"
+                       "\">"
+               );
+       }
+       else if (WC->wc_view == VIEW_NOTES) {
+               wprintf("<img height=48 width=48 src=\""
+                       "static/storenotes_48x.gif"
+                       "\">"
+               );
+       }
+       else if (WC->wc_view == VIEW_MAILBOX) {
+               wprintf("<img height=48 width=48 src=\""
+                       "static/privatemess_48x.gif"
+                       "\">"
+               );
+       }
+       else {
+               wprintf("<img height=48 width=48 src=\""
+                       "static/chatrooms_48x.gif"
+                       "\">"
+               );
        }
 
 }
@@ -280,10 +300,13 @@ void embed_newmail_button(void) {
        if ( (WC->new_mail > WC->remember_new_mail) && (WC->new_mail>0) ) {
                wprintf(
                        "<A HREF=\"/dotgoto?room=_MAIL_\">"
-                       "<IMG SRC=\"/static/mail.gif\" border=0 "
-                       "ALT=\"You have new mail\">"
-                       "<br /><SPAN CLASS=\"youhavemail\">"
-                       "%d new mail</SPAN></A>", WC->new_mail);
+                       "<IMG SRC=\"/static/privatemess_32x.gif\" border=0 "
+                       "ALT=\"");
+               wprintf(_("You have new mail"));
+                       wprintf("\">"
+                       "<br /><SPAN CLASS=\"youhavemail\">");
+               wprintf(_("%d new mail"), WC->new_mail);
+               wprintf("</SPAN></A>");
                WC->remember_new_mail = WC->new_mail;
        }
 }
@@ -296,8 +319,11 @@ void embed_newmail_button(void) {
 void embed_view_o_matic(void) {
        int i;
 
-       wprintf("<FORM NAME=\"viewomatic\">\n"
+       wprintf("<form name=\"viewomatic\" action=\"/changeview\">\n"
+               "<span class=\"room_banner_new_messages\">View as: "
                "<SELECT NAME=\"newview\" SIZE=\"1\" "
+               "STYLE=\"font-family: Bitstream Vera Sans,Arial,Helvetica,sans-serif;"
+               " font-size: 7pt; background: #444455; color: #ddddcc;\" "
                "OnChange=\"location.href=viewomatic.newview.options"
                "[selectedIndex].value\">\n");
 
@@ -321,12 +347,12 @@ void embed_view_o_matic(void) {
                        wprintf("</OPTION>\n");
                }
        }
-       wprintf("</SELECT></FORM>\n");
+       wprintf("</select></span></form>\n");
 }
 
 
 
-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.
@@ -334,7 +360,7 @@ void embed_room_banner(char *got) {
         */
        if (got == NULL) {
                serv_printf("GOTO %s", WC->wc_roomname);
-               serv_gets(fakegot);
+               serv_getln(fakegot, sizeof fakegot);
                got = fakegot;
        }
 
@@ -357,7 +383,187 @@ void embed_room_banner(char *got) {
        svcallback("YOUHAVEMAIL", embed_newmail_button);
        svcallback("VIEWOMATIC", embed_view_o_matic);
        svcallback("START", offer_start_page);
+
        do_template("roombanner");
+       if (navbar_style != navbar_none) {
+
+               wprintf("<div style=\"position:absolute; bottom:0px; left:0px\">\n"
+                       "<table width=\"100%%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr>\n");
+
+
+               if (navbar_style == navbar_default) wprintf(
+                       "<td>"
+                       "<a href=\"/ungoto\">"
+                       "<img align=\"middle\" src=\"/static/ungoto2_24x.gif\" border=\"0\">"
+                       "<span class=\"navbar_link\">%s</span></A>"
+                       "</td>\n", _("Ungoto")
+               );
+
+               if ( (navbar_style == navbar_default) && (WC->wc_view == VIEW_BBS) ) {
+                       wprintf(
+                               "<td>"
+                               "<A HREF=\"/readnew\">"
+                               "<img align=\"middle\" src=\"/static/newmess2_24x.gif\" border=\"0\">"
+                               "<span class=\"navbar_link\">%s</span></A>"
+                               "</td>\n", _("Read new messages")
+                       );
+               }
+
+               if (navbar_style == navbar_default) {
+                       switch(WC->wc_view) {
+                               case VIEW_ADDRESSBOOK:
+                                       wprintf(
+                                               "<td>"
+                                               "<A HREF=\"/readfwd\">"
+                                               "<img align=\"middle\" src=\"/static/viewcontacts_24x.gif\" "
+                                               "border=\"0\">"
+                                               "<span class=\"navbar_link\">"
+                                               "%s"
+                                               "</span></a></td>\n", _("View contacts")
+                                       );
+                                       break;
+                               case VIEW_CALENDAR:
+                                       wprintf(
+                                               "<td>"
+                                               "<A HREF=\"/readfwd?calview=day\">"
+                                               "<img align=\"middle\" src=\"/static/taskday2_24x.gif\" "
+                                               "border=\"0\">"
+                                               "<span class=\"navbar_link\">"
+                                               "%s"
+                                               "</span></a></td>\n", _("Day view")
+                                       );
+                                       wprintf(
+                                               "<td>"
+                                               "<A HREF=\"/readfwd?calview=month\">"
+                                               "<img align=\"middle\" src=\"/static/monthview2_24x.gif\" "
+                                               "border=\"0\">"
+                                               "<span class=\"navbar_link\">"
+                                               "%s"
+                                               "</span></a></td>\n", _("Month view")
+                                       );
+                                       break;
+                               case VIEW_TASKS:
+                                       wprintf(
+                                               "<td>"
+                                               "<A HREF=\"/readfwd\">"
+                                               "<img align=\"middle\" src=\"/static/taskmanag_24x.gif\" "
+                                               "border=\"0\">"
+                                               "<span class=\"navbar_link\">"
+                                               "%s"
+                                               "</span></a></td>\n", _("View tasks")
+                                       );
+                                       break;
+                               case VIEW_NOTES:
+                                       wprintf(
+                                               "<td>"
+                                               "<A HREF=\"/readfwd\">"
+                                               "<img align=\"middle\" src=\"/static/viewnotes_24x.gif\" "
+                                               "border=\"0\">"
+                                               "<span class=\"navbar_link\">"
+                                               "%s"
+                                               "</span></a></td>\n", _("View notes")
+                                       );
+                                       break;
+                               case VIEW_MAILBOX:
+                                       wprintf(
+                                               "<td>"
+                                               "<A HREF=\"/readfwd\">"
+                                               "<img align=\"middle\" src=\"/static/readallmess3_24x.gif\" "
+                                               "border=\"0\">"
+                                               "<span class=\"navbar_link\">"
+                                               "%s"
+                                               "</span></a></td>\n", _("View message list")
+                                       );
+                                       break;
+                               default:
+                                       wprintf(
+                                               "<td>"
+                                               "<A HREF=\"/readfwd\">"
+                                               "<img align=\"middle\" src=\"/static/readallmess3_24x.gif\" "
+                                               "border=\"0\">"
+                                               "<span class=\"navbar_link\">"
+                                               "%s"
+                                               "</span></a></td>\n", _("Read all messages")
+                                       );
+                                       break;
+                       }
+               }
+
+               if (navbar_style == navbar_default) {
+                       switch(WC->wc_view) {
+                               case VIEW_ADDRESSBOOK:
+                                       wprintf(
+                                               "<td><A HREF=\"/display_enter\">"
+                                               "<img align=\"middle\" src=\"/static/addnewcontact_24x.gif\" "
+                                               "border=\"0\"><span class=\"navbar_link\">"
+                                               "%s"
+                                               "</span></a></td>\n", _("Add new contact")
+                                       );
+                                       break;
+                               case VIEW_CALENDAR:
+                                       wprintf(
+                                               "<td><A HREF=\"/display_enter\">"
+                                               "<img align=\"middle\" src=\"/static/addevent_24x.gif\" "
+                                               "border=\"0\"><span class=\"navbar_link\">"
+                                               "%s"
+                                               "</span></a></td>\n", _("Add new event")
+                                       );
+                                       break;
+                               case VIEW_TASKS:
+                                       wprintf(
+                                               "<td><A HREF=\"/display_enter\">"
+                                               "<img align=\"middle\" src=\"/static/newmess3_24x.gif\" "
+                                               "border=\"0\"><span class=\"navbar_link\">"
+                                               "%s"
+                                               "</span></a></td>\n", _("Add new task")
+                                       );
+                                       break;
+                               case VIEW_NOTES:
+                                       wprintf(
+                                               "<td><A HREF=\"/display_enter\">"
+                                               "<img align=\"middle\" src=\"/static/enternewnote_24x.gif\" "
+                                               "border=\"0\"><span class=\"navbar_link\">"
+                                               "%s"
+                                               "</span></a></td>\n", _("Add new note")
+                                       );
+                                       break;
+                               default:
+                                       wprintf(
+                                               "<td><A HREF=\"/display_enter\">"
+                                               "<img align=\"middle\" src=\"/static/newmess3_24x.gif\" "
+                                               "border=\"0\"><span class=\"navbar_link\">"
+                                               "%s"
+                                               "</span></a></td>\n", _("Enter a message")
+                                       );
+                                       break;
+                       }
+               }
+
+               if (navbar_style == navbar_default) wprintf(
+                       "<td>"
+                       "<A HREF=\"/skip\" "
+                       "TITLE=\"%s\">"
+                       "<img align=\"middle\" src=\"/static/skipthisroom_24x.gif\" border=\"0\">"
+                       "<span class=\"navbar_link\">%s</span></a>"
+                       "</td>\n",
+                       _("Leave all messages marked as unread, go to next room with unread messages"),
+                       _("Skip this room")
+               );
+
+               if (navbar_style == navbar_default) wprintf(
+                       "<td>"
+                       "<A HREF=\"/gotonext\" "
+                       "TITLE=\"%s\">"
+                       "<img align=\"middle\" src=\"/static/markngo_24x.gif\" border=\"0\">"
+                       "<span class=\"navbar_link\">%s</span></a>"
+                       "</td>\n",
+                       _("Mark all messages as read, go to next room with unread messages"),
+                       _("Goto next room")
+               );
+
+               wprintf("</tr></table></div>\n");
+       }
+
 }
 
 
@@ -368,10 +574,11 @@ void embed_room_banner(char *got) {
  * back end routine to take the session to a new room
  *
  */
-void gotoroom(char *gname)
+int gotoroom(char *gname)
 {
        char buf[SIZ];
        static long ls = (-1L);
+       int err = 0;
 
        /* store ungoto information */
        strcpy(WC->ugname, WC->wc_roomname);
@@ -379,15 +586,19 @@ void gotoroom(char *gname)
 
        /* move to the new room */
        serv_printf("GOTO %s", gname);
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
        if (buf[0] != '2') {
+               buf[3] = 0;
+               err = atoi(buf);
                serv_puts("GOTO _BASEROOM_");
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
        }
        if (buf[0] != '2') {
-               return;
+               buf[3] = 0;
+               err = atoi(buf);
+               return err;
        }
-       extract(WC->wc_roomname, &buf[4], 0);
+       extract_token(WC->wc_roomname, &buf[4], 0, '|', sizeof WC->wc_roomname);
        WC->room_flags = extract_int(&buf[4], 4);
        /* highest_msg_read = extract_int(&buf[4],6);
           maxmsgnum = extract_int(&buf[4],5);
@@ -405,6 +616,8 @@ void gotoroom(char *gname)
        remove_march(WC->wc_roomname);
        if (!strcasecmp(gname, "_BASEROOM_"))
                remove_march(gname);
+
+       return err;
 }
 
 
@@ -466,12 +679,12 @@ void gotonext(void)
 
        if (WC->march == NULL) {
                serv_puts("LKRN");
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
                if (buf[0] == '1')
-                       while (serv_gets(buf), strcmp(buf, "000")) {
+                       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
                                mptr = (struct march *) malloc(sizeof(struct march));
                                mptr->next = NULL;
-                               extract(mptr->march_name, buf, 0);
+                               extract_token(mptr->march_name, buf, 0, '|', sizeof mptr->march_name);
                                mptr->march_floor = extract_int(buf, 2);
                                mptr->march_order = extract_int(buf, 3);
                                if (WC->march == NULL) {
@@ -530,7 +743,7 @@ void slrp_highest(void)
 
        /* set pointer */
        serv_puts("SLRP HIGHEST");
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
        if (buf[0] != '2') {
                wprintf("<EM>%s</EM><br />\n", &buf[4]);
                return;
@@ -550,14 +763,14 @@ void ungoto(void)
                return;
        }
        serv_printf("GOTO %s", WC->ugname);
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
        if (buf[0] != '2') {
                smart_goto(WC->wc_roomname);
                return;
        }
        if (WC->uglsn >= 0L) {
                serv_printf("SLRP %ld", WC->uglsn);
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
        }
        strcpy(buf, WC->ugname);
        strcpy(WC->ugname, "");
@@ -585,12 +798,12 @@ int self_service(int newval) {
        int flags, floor, order, view, flags2;
 
        serv_puts("GETR");
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
        if (buf[0] != '2') return(0);
 
-       extract(name, &buf[4], 0);
-       extract(password, &buf[4], 1);
-       extract(dirname, &buf[4], 2);
+       extract_token(name, &buf[4], 0, '|', sizeof name);
+       extract_token(password, &buf[4], 1, '|', sizeof password);
+       extract_token(dirname, &buf[4], 2, '|', sizeof dirname);
        flags = extract_int(&buf[4], 3);
        floor = extract_int(&buf[4], 4);
        order = extract_int(&buf[4], 5);
@@ -618,7 +831,7 @@ int self_service(int newval) {
                serv_printf("SETR %s|%s|%s|%d|0|%d|%d|%d|%d",
                        name, password, dirname, flags,
                        floor, order, view, flags2);
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
        }
 
        return(newval);
@@ -640,7 +853,7 @@ void display_editroom(void)
        char node[SIZ];
        char remote_room[SIZ];
        char recp[SIZ];
-       char er_name[20];
+       char er_name[128];
        char er_password[10];
        char er_dirname[15];
        char er_roomaide[26];
@@ -660,23 +873,25 @@ void display_editroom(void)
 
        load_floorlist();
        serv_puts("GETR");
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
 
        if (buf[0] != '2') {
                strcpy(WC->ImportantMessage, &buf[4]);
                display_main_menu();
                return;
        }
-       extract(er_name, &buf[4], 0);
-       extract(er_password, &buf[4], 1);
-       extract(er_dirname, &buf[4], 2);
+       extract_token(er_name, &buf[4], 0, '|', sizeof er_name);
+       extract_token(er_password, &buf[4], 1, '|', sizeof er_password);
+       extract_token(er_dirname, &buf[4], 2, '|', sizeof er_dirname);
        er_flags = extract_int(&buf[4], 3);
        er_floor = extract_int(&buf[4], 4);
 
-       output_headers(1, 1, 1, 0, 0, 0, 0);
+       output_headers(1, 1, 1, 0, 0, 0);
 
        /* print the tabbed dialog */
-       wprintf("<br /><TABLE border=0 cellspacing=0 cellpadding=0 width=100%%>"
+       wprintf("<br />"
+               "<div id=\"fix_scrollbar_bug\">"
+               "<TABLE border=0 cellspacing=0 cellpadding=0 width=100%%>"
                "<TR ALIGN=CENTER>"
                "<TD>&nbsp;</TD>\n");
 
@@ -686,7 +901,7 @@ void display_editroom(void)
        else {
                wprintf("<TD BGCOLOR=\"#CCCCCC\"><A HREF=\"/display_editroom&tab=admin\">");
        }
-       wprintf("Administration");
+       wprintf(_("Administration"));
        if (!strcmp(tab, "admin")) {
                wprintf("</SPAN></TD>\n");
        }
@@ -702,7 +917,7 @@ void display_editroom(void)
        else {
                wprintf("<TD BGCOLOR=\"#CCCCCC\"><A HREF=\"/display_editroom&tab=config\">");
        }
-       wprintf("Configuration");
+       wprintf(_("Configuration"));
        if (!strcmp(tab, "config")) {
                wprintf("</SPAN></TD>\n");
        }
@@ -718,7 +933,7 @@ void display_editroom(void)
        else {
                wprintf("<TD BGCOLOR=\"#CCCCCC\"><A HREF=\"/display_editroom&tab=expire\">");
        }
-       wprintf("Message expire policy");
+       wprintf(_("Message expire policy"));
        if (!strcmp(tab, "expire")) {
                wprintf("</SPAN></TD>\n");
        }
@@ -728,13 +943,29 @@ void display_editroom(void)
 
        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=\"#CCCCCC\"><A HREF=\"/display_editroom&tab=sharing\">");
        }
-       wprintf("Sharing");
+       wprintf(_("Sharing"));
        if (!strcmp(tab, "sharing")) {
                wprintf("</SPAN></TD>\n");
        }
@@ -750,7 +981,7 @@ void display_editroom(void)
        else {
                wprintf("<TD BGCOLOR=\"#CCCCCC\"><A HREF=\"/display_editroom&tab=listserv\">");
        }
-       wprintf("Mailing list service");
+       wprintf(_("Mailing list service"));
        if (!strcmp(tab, "listserv")) {
                wprintf("</SPAN></TD>\n");
        }
@@ -760,31 +991,43 @@ void display_editroom(void)
 
        wprintf("<TD>&nbsp;</TD>\n");
 
-       wprintf("</TR></TABLE>\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 id=\"fix_scrollbar_bug\">"
+               "<TABLE border=0 width=100%% bgcolor=\"#FFFFFF\">\n"
                "<TR><TD>\n");
 
        if (!strcmp(tab, "admin")) {
                wprintf("<UL>"
-                       "<LI><A HREF=\"/confirm_delete_room\">\n"
-                       "Delete this room</A>\n"
-                       "<LI><A HREF=\"/display_editroompic\">\n"
-                       "Set or change the graphic for this room's banner</A>\n"
-                       "<LI><A HREF=\"/display_editinfo\">\n"
-                       "Edit this room's Info file</A>\n"
+                       "<LI><A HREF=\"/delete_room\" "
+                       "onClick=\"return confirm('");
+               wprintf(_("Are you sure you want to delete this room?"));
+               wprintf("');\">\n");
+               wprintf(_("Delete this room"));
+               wprintf("</A>\n"
+                       "<LI><A HREF=\"/display_editroompic\">\n");
+               wprintf(_("Set or change the icon for this room's banner"));
+               wprintf("</A>\n"
+                       "<LI><A HREF=\"/display_editinfo\">\n");
+               wprintf(_("Edit this room's Info file"));
+               wprintf("</A>\n"
                        "</UL>");
        }
 
        if (!strcmp(tab, "config")) {
                wprintf("<FORM METHOD=\"POST\" ACTION=\"/editroom\">\n");
        
-               wprintf("<UL><LI>Name of room: ");
-               wprintf("<INPUT TYPE=\"text\" NAME=\"er_name\" VALUE=\"%s\" MAXLENGTH=\"19\">\n", er_name);
+               wprintf("<UL><LI>");
+               wprintf(_("Name of room: "));
+               wprintf("<INPUT TYPE=\"text\" NAME=\"er_name\" VALUE=\"%s\" MAXLENGTH=\"%d\">\n",
+                       er_name,
+                       (sizeof(er_name)-1)
+               );
        
-               wprintf("<LI>Resides on floor: ");
+               wprintf("<LI>");
+               wprintf(_("Resides on floor: "));
                wprintf("<SELECT NAME=\"er_floor\" SIZE=\"1\">\n");
                for (i = 0; i < 128; ++i)
                        if (strlen(floorlist[i]) > 0) {
@@ -797,122 +1040,151 @@ void display_editroom(void)
                        }
                wprintf("</SELECT>\n");
        
-               wprintf("<LI>Type of room:<UL>\n");
+               wprintf("<LI>");
+               wprintf(_("Type of room:"));
+               wprintf("<UL>\n");
 
                wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"public\" ");
                if ((er_flags & QR_PRIVATE) == 0)
                wprintf("CHECKED ");
-               wprintf("> Public room\n");
+               wprintf("> ");
+               wprintf(_("Public room"));
+               wprintf("\n");
 
-               wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"guessname\" ");
+               wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"hidden\" ");
                if ((er_flags & QR_PRIVATE) &&
                    (er_flags & QR_GUESSNAME))
                        wprintf("CHECKED ");
-               wprintf("> Private - guess name\n");
+               wprintf("> ");
+               wprintf(_("Private - guess name"));
        
-               wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"passworded\" ");
+               wprintf("\n<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"passworded\" ");
                if ((er_flags & QR_PRIVATE) &&
                    (er_flags & QR_PASSWORDED))
                        wprintf("CHECKED ");
-               wprintf("> Private - require password:\n");
-               wprintf("<INPUT TYPE=\"text\" NAME=\"er_password\" VALUE=\"%s\" MAXLENGTH=\"9\">\n", er_password);
+               wprintf("> ");
+               wprintf(_("Private - require password:"));
+               wprintf("\n<INPUT TYPE=\"text\" NAME=\"er_password\" VALUE=\"%s\" MAXLENGTH=\"9\">\n",
+                       er_password);
        
                wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"invonly\" ");
                if ((er_flags & QR_PRIVATE)
                    && ((er_flags & QR_GUESSNAME) == 0)
                    && ((er_flags & QR_PASSWORDED) == 0))
                        wprintf("CHECKED ");
-               wprintf("> Private - invitation only\n");
+               wprintf("> ");
+               wprintf(_("Private - invitation only"));
        
-               wprintf("<LI><INPUT TYPE=\"checkbox\" NAME=\"bump\" VALUE=\"yes\" ");
-               wprintf("> If private, cause current users to forget room\n");
+               wprintf("\n<LI><INPUT TYPE=\"checkbox\" NAME=\"bump\" VALUE=\"yes\" ");
+               wprintf("> ");
+               wprintf(_("If private, cause current users to forget room"));
        
-               wprintf("</UL>\n");
+               wprintf("\n</UL>\n");
        
                wprintf("<LI><INPUT TYPE=\"checkbox\" NAME=\"prefonly\" VALUE=\"yes\" ");
                if (er_flags & QR_PREFONLY)
                        wprintf("CHECKED ");
-               wprintf("> Preferred users only\n");
+               wprintf("> ");
+               wprintf(_("Preferred users only"));
        
-               wprintf("<LI><INPUT TYPE=\"checkbox\" NAME=\"readonly\" VALUE=\"yes\" ");
+               wprintf("\n<LI><INPUT TYPE=\"checkbox\" NAME=\"readonly\" VALUE=\"yes\" ");
                if (er_flags & QR_READONLY)
                        wprintf("CHECKED ");
-               wprintf("> Read-only room\n");
+               wprintf("> ");
+               wprintf(_("Read-only room"));
        
        /* directory stuff */
-               wprintf("<LI><INPUT TYPE=\"checkbox\" NAME=\"directory\" VALUE=\"yes\" ");
+               wprintf("\n<LI><INPUT TYPE=\"checkbox\" NAME=\"directory\" VALUE=\"yes\" ");
                if (er_flags & QR_DIRECTORY)
                        wprintf("CHECKED ");
-               wprintf("> File directory room\n");
+               wprintf("> ");
+               wprintf(_("File directory room"));
 
-               wprintf("<UL><LI>Directory name: ");
-               wprintf("<INPUT TYPE=\"text\" NAME=\"er_dirname\" VALUE=\"%s\" MAXLENGTH=\"14\">\n", er_dirname);
+               wprintf("\n<UL><LI>");
+               wprintf(_("Directory name: "));
+               wprintf("<INPUT TYPE=\"text\" NAME=\"er_dirname\" VALUE=\"%s\" MAXLENGTH=\"14\">\n",
+                       er_dirname);
 
                wprintf("<LI><INPUT TYPE=\"checkbox\" NAME=\"ulallowed\" VALUE=\"yes\" ");
                if (er_flags & QR_UPLOAD)
                        wprintf("CHECKED ");
-               wprintf("> Uploading allowed\n");
+               wprintf("> ");
+               wprintf(_("Uploading allowed"));
        
-               wprintf("<LI><INPUT TYPE=\"checkbox\" NAME=\"dlallowed\" VALUE=\"yes\" ");
+               wprintf("\n<LI><INPUT TYPE=\"checkbox\" NAME=\"dlallowed\" VALUE=\"yes\" ");
                if (er_flags & QR_DOWNLOAD)
                        wprintf("CHECKED ");
-               wprintf("> Downloading allowed\n");
+               wprintf("> ");
+               wprintf(_("Downloading allowed"));
        
-               wprintf("<LI><INPUT TYPE=\"checkbox\" NAME=\"visdir\" VALUE=\"yes\" ");
+               wprintf("\n<LI><INPUT TYPE=\"checkbox\" NAME=\"visdir\" VALUE=\"yes\" ");
                if (er_flags & QR_VISDIR)
                        wprintf("CHECKED ");
-               wprintf("> Visible directory</UL>\n");
+               wprintf("> ");
+               wprintf(_("Visible directory"));
+               wprintf("</UL>\n");
        
        /* end of directory stuff */
        
                wprintf("<LI><INPUT TYPE=\"checkbox\" NAME=\"network\" VALUE=\"yes\" ");
                if (er_flags & QR_NETWORK)
                        wprintf("CHECKED ");
-               wprintf("> Network shared room\n");
+               wprintf("> ");
+               wprintf(_("Network shared room"));
 
-               wprintf("<LI><INPUT TYPE=\"checkbox\" NAME=\"permanent\" VALUE=\"yes\" ");
+               wprintf("\n<LI><INPUT TYPE=\"checkbox\" NAME=\"permanent\" VALUE=\"yes\" ");
                if (er_flags & QR_PERMANENT)
                        wprintf("CHECKED ");
-               wprintf("> Permanent (does not auto-purge)\n");
+               wprintf("> ");
+               wprintf(_("Permanent (does not auto-purge)"));
 
        /* start of anon options */
        
-               wprintf("<LI>Anonymous messages<UL>\n");
+               wprintf("\n<LI>");
+               wprintf(_("Anonymous messages"));
+               wprintf("<UL>\n");
        
                wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"anon\" VALUE=\"no\" ");
                if (((er_flags & QR_ANONONLY) == 0)
                    && ((er_flags & QR_ANONOPT) == 0))
                        wprintf("CHECKED ");
-               wprintf("> No anonymous messages\n");
+               wprintf("> ");
+               wprintf(_("No anonymous messages"));
        
-               wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"anon\" VALUE=\"anononly\" ");
+               wprintf("\n<LI><INPUT TYPE=\"radio\" NAME=\"anon\" VALUE=\"anononly\" ");
                if (er_flags & QR_ANONONLY)
                        wprintf("CHECKED ");
-               wprintf("> All messages are anonymous\n");
+               wprintf("> ");
+               wprintf(_("All messages are anonymous"));
        
-               wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"anon\" VALUE=\"anon2\" ");
+               wprintf("\n<LI><INPUT TYPE=\"radio\" NAME=\"anon\" VALUE=\"anon2\" ");
                if (er_flags & QR_ANONOPT)
                        wprintf("CHECKED ");
-               wprintf("> Prompt user when entering messages</UL>\n");
+               wprintf("> ");
+               wprintf(_("Prompt user when entering messages"));
+               wprintf("</UL>\n");
        
        /* end of anon options */
        
-               wprintf("<LI>Room aide: \n");
+               wprintf("<LI>");
+               wprintf(_("Room aide: "));
                serv_puts("GETA");
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
                if (buf[0] != '2') {
                        wprintf("<EM>%s</EM>\n", &buf[4]);
                } else {
-                       extract(er_roomaide, &buf[4], 0);
+                       extract_token(er_roomaide, &buf[4], 0, '|', sizeof er_roomaide);
                        wprintf("<INPUT TYPE=\"text\" NAME=\"er_roomaide\" VALUE=\"%s\" MAXLENGTH=\"25\">\n", er_roomaide);
                }
        
                wprintf("</UL><CENTER>\n");
                wprintf("<INPUT TYPE=\"hidden\" NAME=\"tab\" VALUE=\"config\">\n"
-                       "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">"
+                       "<INPUT TYPE=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">"
                        "&nbsp;"
-                       "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">"
-                       "</CENTER>\n"
+                       "<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">"
+                       "</CENTER>\n",
+                       _("Save changes"),
+                       _("Cancel")
                );
        }
 
@@ -925,9 +1197,9 @@ void display_editroom(void)
 
                /* Learn the current configuration */
                serv_puts("CONF getsys|application/x-citadel-ignet-config");
-               serv_gets(buf);
-               if (buf[0]=='1') while (serv_gets(buf), strcmp(buf, "000")) {
-                       extract(node, buf, 0);
+               serv_getln(buf, sizeof buf);
+               if (buf[0]=='1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+                       extract_token(node, buf, 0, '|', sizeof node);
                        not_shared_with = realloc(not_shared_with,
                                        strlen(not_shared_with) + 32);
                        strcat(not_shared_with, node);
@@ -935,11 +1207,11 @@ void display_editroom(void)
                }
 
                serv_puts("GNET");
-               serv_gets(buf);
-               if (buf[0]=='1') while (serv_gets(buf), strcmp(buf, "000")) {
-                       extract(cmd, buf, 0);
-                       extract(node, buf, 1);
-                       extract(remote_room, buf, 2);
+               serv_getln(buf, sizeof buf);
+               if (buf[0]=='1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+                       extract_token(cmd, buf, 0, '|', sizeof cmd);
+                       extract_token(node, buf, 1, '|', sizeof node);
+                       extract_token(remote_room, buf, 2, '|', sizeof remote_room);
                        if (!strcasecmp(cmd, "ignet_push_share")) {
                                shared_with = realloc(shared_with,
                                                strlen(shared_with) + 32);
@@ -953,10 +1225,10 @@ void display_editroom(void)
                }
 
                for (i=0; i<num_tokens(shared_with, '\n'); ++i) {
-                       extract_token(buf, shared_with, i, '\n');
-                       extract_token(node, buf, 0, '|');
+                       extract_token(buf, shared_with, i, '\n', sizeof buf);
+                       extract_token(node, buf, 0, '|', sizeof node);
                        for (j=0; j<num_tokens(not_shared_with, '\n'); ++j) {
-                               extract_token(cmd, not_shared_with, j, '\n');
+                               extract_token(cmd, not_shared_with, j, '\n', sizeof cmd);
                                if (!strcasecmp(node, cmd)) {
                                        remove_token(not_shared_with, j, '\n');
                                }
@@ -966,21 +1238,26 @@ void display_editroom(void)
                /* Display the stuff */
                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"
+                       "<TD><B><I>");
+               wprintf(_("Shared with"));
+               wprintf("</I></B></TD>"
+                       "<TD><B><I>");
+               wprintf(_("Not shared with"));
+               wprintf("</I></B></TD></TR>\n"
                        "<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"
-               );
+               wprintf("<TABLE border=0 cellpadding=5><TR BGCOLOR=\"#CCCCCC\"><TD>");
+               wprintf(_("Remote node name"));
+               wprintf("</TD><TD>");
+               wprintf(_("Remote room name"));
+               wprintf("</TD><TD>");
+               wprintf(_("Actions"));
+               wprintf("</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, '|');
+                       extract_token(buf, shared_with, i, '\n', sizeof buf);
+                       extract_token(node, buf, 0, '|', sizeof node);
+                       extract_token(remote_room, buf, 1, '|', sizeof remote_room);
                        if (strlen(node) > 0) {
                                wprintf("<FORM METHOD=\"POST\" "
                                        "ACTION=\"/netedit\">"
@@ -1007,22 +1284,23 @@ void display_editroom(void)
                                wprintf("<INPUT TYPE=\"hidden\" NAME=\"cmd\" "
                                        "VALUE=\"remove\">\n");
                                wprintf("<INPUT TYPE=\"submit\" "
-                                       "NAME=\"sc\" VALUE=\"Unshare\">");
+                                       "NAME=\"unshare_button\" VALUE=\"%s\">", _("Unshare"));
                                wprintf("</TD></TR></FORM>\n");
                        }
                }
 
                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"
-               );
+               wprintf("<TABLE border=0 cellpadding=5><TR BGCOLOR=\"#CCCCCC\"><TD>");
+               wprintf(_("Remote node name"));
+               wprintf("</TD><TD>");
+               wprintf(_("Remote room name"));
+               wprintf("</TD><TD>");
+               wprintf(_("Actions"));
+               wprintf("</TD></TR>\n");
 
                for (i=0; i<num_tokens(not_shared_with, '\n'); ++i) {
-                       extract_token(node, not_shared_with, i, '\n');
+                       extract_token(node, not_shared_with, i, '\n', sizeof node);
                        if (strlen(node) > 0) {
                                wprintf("<FORM METHOD=\"POST\" "
                                        "ACTION=\"/netedit\">"
@@ -1043,7 +1321,7 @@ void display_editroom(void)
                                wprintf("<INPUT TYPE=\"hidden\" NAME=\"cmd\" "
                                        "VALUE=\"add\">\n");
                                wprintf("<INPUT TYPE=\"submit\" "
-                                       "NAME=\"sc\" VALUE=\"Share\">");
+                                       "NAME=\"add_button\" VALUE=\"%s\">", _("Share"));
                                wprintf("</TD></TR></FORM>\n");
                        }
                }
@@ -1051,17 +1329,18 @@ void display_editroom(void)
                wprintf("</TABLE>\n");
                wprintf("</TD></TR>"
                        "</TABLE></CENTER><br />\n"
-                       "<I><B>Notes:</B><UL><LI>When sharing a room, "
+                       "<I><B>%s</B><UL><LI>", _("Notes:"));
+               wprintf(_("When sharing a room, "
                        "it must be shared from both ends.  Adding a node to "
                        "the 'shared' list sends messages out, but in order to"
                        " receive messages, the other nodes must be configured"
-                       " to send messages out to your system as well.\n"
+                       " to send messages out to your system as well. "
                        "<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"
-               );
+               ));
 
        }
 
@@ -1072,82 +1351,84 @@ void display_editroom(void)
                        "<TABLE BORDER=0 WIDTH=100%% CELLPADDING=5>"
                        "<TR><TD VALIGN=TOP>");
 
-               wprintf("<i>The contents of this room are being "
+               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);
-               if (buf[0]=='1') while (serv_gets(buf), strcmp(buf, "000")) {
-                       extract(cmd, buf, 0);
+               serv_getln(buf, sizeof buf);
+               if (buf[0]=='1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+                       extract_token(cmd, buf, 0, '|', sizeof cmd);
                        if (!strcasecmp(cmd, "listrecp")) {
-                               extract(recp, buf, 1);
+                               extract_token(recp, buf, 1, '|', sizeof recp);
                        
                                escputs(recp);
                                wprintf(" <A HREF=\"/netedit&cmd=remove&line="
                                        "listrecp|");
                                urlescputs(recp);
-                               wprintf("&tab=listserv\">(remove)</A><br />");
-
+                               wprintf("&tab=listserv\">");
+                               wprintf(_("(remove)"));
+                               wprintf("</A><br />");
                        }
                }
                wprintf("<br /><FORM METHOD=\"POST\" ACTION=\"/netedit\">\n"
                        "<INPUT TYPE=\"hidden\" NAME=\"tab\" VALUE=\"listserv\">\n"
                        "<INPUT TYPE=\"hidden\" NAME=\"prefix\" VALUE=\"listrecp|\">\n");
                wprintf("<INPUT TYPE=\"text\" NAME=\"line\">\n");
-               wprintf("<INPUT TYPE=\"submit\" NAME=\"cmd\" VALUE=\"Add\">");
+               wprintf("<INPUT TYPE=\"submit\" NAME=\"add_button\" VALUE=\"%s\">", _("Add"));
                wprintf("</FORM>\n");
 
                wprintf("</TD><TD VALIGN=TOP>\n");
                
-               wprintf("<i>The contents of this room are being "
+               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);
-               if (buf[0]=='1') while (serv_gets(buf), strcmp(buf, "000")) {
-                       extract(cmd, buf, 0);
+               serv_getln(buf, sizeof buf);
+               if (buf[0]=='1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+                       extract_token(cmd, buf, 0, '|', sizeof cmd);
                        if (!strcasecmp(cmd, "digestrecp")) {
-                               extract(recp, buf, 1);
+                               extract_token(recp, buf, 1, '|', sizeof recp);
                        
                                escputs(recp);
                                wprintf(" <A HREF=\"/netedit&cmd=remove&line="
                                        "digestrecp|");
                                urlescputs(recp);
-                               wprintf("&tab=listserv\">(remove)</A><br />");
-
+                               wprintf("&tab=listserv\">");
+                               wprintf(_("(remove)"));
+                               wprintf("</A><br />");
                        }
                }
                wprintf("<br /><FORM METHOD=\"POST\" ACTION=\"/netedit\">\n"
                        "<INPUT TYPE=\"hidden\" NAME=\"tab\" VALUE=\"listserv\">\n"
                        "<INPUT TYPE=\"hidden\" NAME=\"prefix\" VALUE=\"digestrecp|\">\n");
                wprintf("<INPUT TYPE=\"text\" NAME=\"line\">\n");
-               wprintf("<INPUT TYPE=\"submit\" NAME=\"cmd\" VALUE=\"Add\">");
+               wprintf("<INPUT TYPE=\"submit\" NAME=\"add_button\" VALUE=\"%s\">", _("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
-                       );
+                       wprintf(_("This room is configured to allow "
+                               "self-service subscribe/unsubscribe requests."));
+                       wprintf("<A HREF=\"/toggle_self_service?newval=0&tab=listserv\">");
+                       wprintf(_("Click to disable."));
+                       wprintf("</A><br />\n");
+                       wprintf(_("The URL for subscribe/unsubscribe is: "));
+                       wprintf("<TT>%s://%s/listsub</TT><br />\n",
+                               (is_https ? "https" : "http"),
+                               WC->http_host);
                }
                else {
-                       wprintf("This room is <i>not</i> configured to allow "
-                               "self-service subscribe/unsubscribe requests."
-                               " <A HREF=\"/toggle_self_service?newval=1&"
-                               "tab=listserv\">"
-                               "Click to enable.</A><br />\n"
-                       );
+                       wprintf(_("This room is <i>not</i> configured to allow "
+                               "self-service subscribe/unsubscribe requests."));
+                       wprintf(" <A HREF=\"/toggle_self_service?newval=1&"
+                               "tab=listserv\">");
+                       wprintf(_("Click to enable."));
+                       wprintf("</A><br />\n");
                }
 
 
@@ -1159,14 +1440,14 @@ void display_editroom(void)
        if (!strcmp(tab, "expire")) {
 
                serv_puts("GPEX room");
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
                if (buf[0] == '2') {
                        roompolicy = extract_int(&buf[4], 0);
                        roomvalue = extract_int(&buf[4], 1);
                }
                
                serv_puts("GPEX floor");
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
                if (buf[0] == '2') {
                        floorpolicy = extract_int(&buf[4], 0);
                        floorvalue = extract_int(&buf[4], 1);
@@ -1174,52 +1455,63 @@ void display_editroom(void)
                
                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 />(");
+               wprintf("<TR><TD>");
+               wprintf(_("Message expire policy for this room"));
+               wprintf("<br />(");
                escputs(WC->wc_roomname);
                wprintf(")</TD><TD>");
                wprintf("<INPUT TYPE=\"radio\" NAME=\"roompolicy\" VALUE=\"0\" %s>",
                        ((roompolicy == 0) ? "CHECKED" : "") );
-               wprintf("Use the default policy for this floor<br />\n");
+               wprintf(_("Use the default policy for this floor"));
+               wprintf("<br />\n");
                wprintf("<INPUT TYPE=\"radio\" NAME=\"roompolicy\" VALUE=\"1\" %s>",
                        ((roompolicy == 1) ? "CHECKED" : "") );
-               wprintf("Never automatically expire messages<br />\n");
+               wprintf(_("Never automatically expire messages"));
+               wprintf("<br />\n");
                wprintf("<INPUT TYPE=\"radio\" NAME=\"roompolicy\" VALUE=\"2\" %s>",
                        ((roompolicy == 2) ? "CHECKED" : "") );
                wprintf("Expire by message count<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(_("Expire by message age"));
+               wprintf("<br />");
+               wprintf(_("Number of messages or days: "));
                wprintf("<INPUT TYPE=\"text\" NAME=\"roomvalue\" MAXLENGTH=\"5\" VALUE=\"%d\">", roomvalue);
                wprintf("</TD></TR>\n");
 
                if (WC->axlevel >= 6) {
                        wprintf("<TR><TD COLSPAN=2><hr /></TD></TR>\n");
-                       wprintf("<TR><TD>Message expire policy for this floor<br />(");
+                       wprintf("<TR><TD>");
+                       wprintf(_("Message expire policy for this floor"));
+                       wprintf("<br />(");
                        escputs(floorlist[WC->wc_floor]);
                        wprintf(")</TD><TD>");
                        wprintf("<INPUT TYPE=\"radio\" NAME=\"floorpolicy\" VALUE=\"0\" %s>",
                                ((floorpolicy == 0) ? "CHECKED" : "") );
-                       wprintf("Use the system default<br />\n");
+                       wprintf(_("Use the system default"));
+                       wprintf("<br />\n");
                        wprintf("<INPUT TYPE=\"radio\" NAME=\"floorpolicy\" VALUE=\"1\" %s>",
                                ((floorpolicy == 1) ? "CHECKED" : "") );
-                       wprintf("Never automatically expire messages<br />\n");
+                       wprintf(_("Never automatically expire messages"));
+                       wprintf("<br />\n");
                        wprintf("<INPUT TYPE=\"radio\" NAME=\"floorpolicy\" VALUE=\"2\" %s>",
                                ((floorpolicy == 2) ? "CHECKED" : "") );
-                       wprintf("Expire by message count<br />\n");
+                       wprintf(_("Expire by message count"));
+                       wprintf("<br />\n");
                        wprintf("<INPUT TYPE=\"radio\" NAME=\"floorpolicy\" VALUE=\"3\" %s>",
                                ((floorpolicy == 3) ? "CHECKED" : "") );
-                       wprintf("Expire by message age<br />");
-                       wprintf("Number of messages or days: ");
+                       wprintf(_("Expire by message age"));
+                       wprintf("<br />");
+                       wprintf(_("Number of messages or days: "));
                        wprintf("<INPUT TYPE=\"text\" NAME=\"floorvalue\" MAXLENGTH=\"5\" VALUE=\"%d\">",
                                floorvalue);
                }
 
                wprintf("<CENTER>\n");
                wprintf("<TR><TD COLSPAN=2><hr /><CENTER>\n");
-               wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
+               wprintf("<INPUT TYPE=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Save changes"));
                wprintf("&nbsp;");
-               wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
+               wprintf("<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
                wprintf("</CENTER></TD><TR>\n");
 
                wprintf("</TABLE>\n"
@@ -1229,9 +1521,13 @@ void display_editroom(void)
 
        }
 
+       /* 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);
 }
@@ -1256,7 +1552,7 @@ void toggle_self_service(void) {
 void editroom(void)
 {
        char buf[SIZ];
-       char er_name[20];
+       char er_name[128];
        char er_password[10];
        char er_dirname[15];
        char er_roomaide[26];
@@ -1265,39 +1561,40 @@ void editroom(void)
        int bump;
 
 
-       if (strcmp(bstr("sc"), "OK")) {
+       if (strlen(bstr("ok_button")) == 0) {
                strcpy(WC->ImportantMessage,
-                       "Cancelled.  Changes were not saved.");
+                       _("Cancelled.  Changes were not saved."));
                display_editroom();
                return;
        }
        serv_puts("GETR");
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
 
        if (buf[0] != '2') {
                strcpy(WC->ImportantMessage, &buf[4]);
                display_editroom();
                return;
        }
-       extract(er_name, &buf[4], 0);
-       extract(er_password, &buf[4], 1);
-       extract(er_dirname, &buf[4], 2);
+       extract_token(er_name, &buf[4], 0, '|', sizeof er_name);
+       extract_token(er_password, &buf[4], 1, '|', sizeof er_password);
+       extract_token(er_dirname, &buf[4], 2, '|', sizeof er_dirname);
        er_flags = extract_int(&buf[4], 3);
 
        strcpy(er_roomaide, bstr("er_roomaide"));
        if (strlen(er_roomaide) == 0) {
                serv_puts("GETA");
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
                if (buf[0] != '2') {
                        strcpy(er_roomaide, "");
                } else {
-                       extract(er_roomaide, &buf[4], 0);
+                       extract_token(er_roomaide, &buf[4], 0, '|', sizeof er_roomaide);
                }
        }
        strcpy(buf, bstr("er_name"));
-       buf[20] = 0;
-       if (strlen(buf) > 0)
+       buf[128] = 0;
+       if (strlen(buf) > 0) {
                strcpy(er_name, buf);
+       }
 
        strcpy(buf, bstr("er_password"));
        buf[10] = 0;
@@ -1315,7 +1612,7 @@ void editroom(void)
        if (!strcmp(buf, "invonly")) {
                er_flags |= (QR_PRIVATE);
        }
-       if (!strcmp(buf, "guessname")) {
+       if (!strcmp(buf, "hidden")) {
                er_flags |= (QR_PRIVATE | QR_GUESSNAME);
        }
        if (!strcmp(buf, "passworded")) {
@@ -1386,7 +1683,7 @@ void editroom(void)
        sprintf(buf, "SETR %s|%s|%s|%u|%d|%d",
             er_name, er_password, er_dirname, er_flags, bump, er_floor);
        serv_puts(buf);
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
        if (buf[0] != '2') {
                strcpy(WC->ImportantMessage, &buf[4]);
                display_editroom();
@@ -1397,7 +1694,7 @@ void editroom(void)
        if (strlen(er_roomaide) > 0) {
                sprintf(buf, "SETA %s", er_roomaide);
                serv_puts(buf);
-               serv_gets(buf);
+               serv_getln(buf, sizeof buf);
                if (buf[0] != '2') {
                        strcpy(WC->ImportantMessage, &buf[4]);
                        display_main_menu();
@@ -1405,73 +1702,93 @@ void editroom(void)
                }
        }
        gotoroom(er_name);
-       strcpy(WC->ImportantMessage, "Your changes have been saved.");
+       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);
+        serv_getln(buf, sizeof buf);
 
         if (buf[0] != '2') {
-               strcpy(WC->ImportantMessage, &buf[4]);
-               display_main_menu();
+               escputs(&buf[4]);
                return;
         }
-        extract(room, &buf[4], 0);
+        extract_token(room, &buf[4], 0, '|', sizeof room);
 
         strcpy(username, bstr("username"));
 
-        if(!strcmp(bstr("sc"), "Kick")) {
+        if (strlen(bstr("kick_button")) > 0) {
                 sprintf(buf, "KICK %s", username);
                 serv_puts(buf);
-                serv_gets(buf);
+                serv_getln(buf, sizeof buf);
 
                 if (buf[0] != '2') {
                         strcpy(WC->ImportantMessage, &buf[4]);
                 } else {
                         sprintf(WC->ImportantMessage,
-                               "<B><I>User %s kicked out of room %s.</I></B>\n"
+                               _("<B><I>User %s kicked out of room %s.</I></B>\n")
                                 username, room);
                 }
-        } else if(!strcmp(bstr("sc"), "Invite")) {
+        }
+
+       if (strlen(bstr("invite_button")) > 0) {
                 sprintf(buf, "INVT %s", username);
                 serv_puts(buf);
-                serv_gets(buf);
+                serv_getln(buf, sizeof buf);
 
                 if (buf[0] != '2') {
                         strcpy(WC->ImportantMessage, &buf[4]);
                 } else {
                         sprintf(WC->ImportantMessage,
-                               "<B><I>User %s invited to room %s.</I></B>\n"
+                               _("<B><I>User %s invited to room %s.</I></B>\n")
                                 username, room);
                 }
         }
-        
-        output_headers(1, 1, 1, 0, 0, 0, 0);
-       stresc(buf, WC->wc_roomname, 1, 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.  "
+       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_getln(buf, sizeof buf);
+
+        if (buf[0] != '2') {
+               escputs(&buf[4]);
+               return;
+        }
+        extract_token(room, &buf[4], 0, '|', sizeof room);
+
+        
+       wprintf("<TABLE border=0 CELLSPACING=10><TR VALIGN=TOP><TD>");
+       wprintf(_("The users listed below have access to this room.  "
                "To remove a user from the access list, select the user "
-               "name from the list and click 'Kick'.<br /><br />");
+               "name from the list and click 'Kick'."));
+       wprintf("<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);
+        serv_getln(buf, sizeof buf);
         if (buf[0] == '1') {
-                while (serv_gets(buf), strcmp(buf, "000")) {
-                        extract(username, buf, 0);
+                while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+                        extract_token(username, buf, 0, '|', sizeof username);
                         wprintf("<OPTION>");
                         escputs(username);
                         wprintf("\n");
@@ -1479,22 +1796,23 @@ void display_whok(void)
         }
         wprintf("</SELECT><br />\n");
 
-        wprintf("<input type=submit name=sc value=\"Kick\">");
+        wprintf("<input type=\"submit\" name=\"kick_button\" value=\"%s\">", _("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 />");
+       wprintf("</TD><TD>");
+       wprintf(_("To grant another user access to this room, enter the "
+               "user name in the box below and click 'Invite'."));
+       wprintf("<br /><br />");
 
-        wprintf("<CENTER><FORM METHOD=\"POST\" ACTION=\"/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\">"
-               "</FORM></CENTER>\n");
+        wprintf("<input type=\"text\" name=\"username\" style=\"width:100%%\"><br />\n"
+               "<input type=\"hidden\" name=\"invite_button\" value=\"Invite\">"
+               "<input type=\"submit\" value=\"%s\">"
+               "</FORM></CENTER>\n", _("Invite"));
 
        wprintf("</TD></TR></TABLE>\n");
-       do_template("endbox");
         wDumpContent(1);
 }
 
@@ -1509,23 +1827,35 @@ void display_entroom(void)
        char buf[SIZ];
 
        serv_puts("CRE8 0");
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
 
        if (buf[0] != '2') {
                strcpy(WC->ImportantMessage, &buf[4]);
                display_main_menu();
                return;
        }
-       output_headers(1, 1, 0, 0, 0, 0, 0);
-       svprintf("BOXTITLE", WCS_STRING, "Create a new room");
-       do_template("beginbox");
 
-       wprintf("<FORM METHOD=\"POST\" ACTION=\"/entroom\">\n");
+       output_headers(1, 1, 2, 0, 0, 0);
+       wprintf("<div id=\"banner\">\n"
+               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<SPAN CLASS=\"titlebar\">");
+       wprintf(_("Create a new room"));
+       wprintf("</SPAN>"
+               "</TD></TR></TABLE>\n"
+               "</div>\n<div id=\"content\">\n"
+       );
+
+       wprintf("<div id=\"fix_scrollbar_bug\">"
+               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
-       wprintf("<UL><LI>Name of room: ");
+       wprintf("<form name=\"create_room_form\" method=\"POST\" action=\"/entroom\">\n");
+
+       wprintf("<UL><LI>");
+       wprintf(_("Name of room: "));
        wprintf("<INPUT TYPE=\"text\" NAME=\"er_name\" MAXLENGTH=\"127\">\n");
 
-        wprintf("<LI>Resides on floor: ");
+        wprintf("<LI>");
+       wprintf(_("Resides on floor: "));
         load_floorlist(); 
         wprintf("<SELECT NAME=\"er_floor\" SIZE=\"1\">\n");
         for (i = 0; i < 128; ++i)
@@ -1537,27 +1867,23 @@ void display_entroom(void)
                 }
         wprintf("</SELECT>\n");
 
-       wprintf("<LI>Type of room:<UL>\n");
-
-       wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"public\" ");
-       wprintf("CHECKED > Public room\n");
-
-       wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"guessname\" ");
-       wprintf("> Private - guess name\n");
-
-       wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"passworded\" ");
-       wprintf("> Private - require password:\n");
-       wprintf("<INPUT TYPE=\"text\" NAME=\"er_password\" MAXLENGTH=\"9\">\n");
-
-       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>Default view for room: "); /* FOO */
-        wprintf("<SELECT NAME=\"er_view\" SIZE=\"1\">\n");
+       /* Our clever little snippet of JavaScript automatically selects
+        * a public room if the view is set to Bulletin Board, and it
+        * selects a mailbox room otherwise.  The user can override this,
+        * of course.
+        */
+       wprintf("<LI>");
+       wprintf(_("Default view for room: "));
+        wprintf("<SELECT NAME=\"er_view\" SIZE=\"1\" OnChange=\""
+               "       if (this.form.er_view.value == 0) {     "       
+               "               this.form.type[0].checked=true;         "
+               "               this.form.er_floor.disabled = false;    "
+               "       }                                               "
+               "       else {                                          "
+               "               this.form.type[4].checked=true;         "
+               "               this.form.er_floor.disabled = true;     "
+               "       }                                               "
+               "\">\n");
        for (i=0; i<(sizeof viewdefs / sizeof (char *)); ++i) {
                wprintf("<OPTION %s VALUE=\"%d\">",
                        ((i == 0) ? "SELECTED" : ""), i );
@@ -1566,18 +1892,62 @@ void display_entroom(void)
        }
        wprintf("</SELECT>\n");
 
+       wprintf("<LI>");
+       wprintf(_("Type of room:"));
+       wprintf("<UL>\n");
+
+       wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"public\" ");
+       wprintf("CHECKED OnChange=\""
+               "       if (this.form.type[0].checked == true) {        "
+               "               this.form.er_floor.disabled = false;    "
+               "       }                                               "
+               "\"> ");
+       wprintf(_("Public (automatically appears to everyone)"));
+
+       wprintf("\n<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"hidden\" OnChange=\""
+               "       if (this.form.type[1].checked == true) {        "
+               "               this.form.er_floor.disabled = false;    "
+               "       }                                               "
+               "\"> ");
+       wprintf(_("Private - hidden (accessible to anyone who knows its name)"));
+
+       wprintf("\n<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"passworded\" OnChange=\""
+               "       if (this.form.type[2].checked == true) {        "
+               "               this.form.er_floor.disabled = false;    "
+               "       }                                               "
+               "\"> ");
+       wprintf(_("Private - require password: "));
+       wprintf("<INPUT TYPE=\"text\" NAME=\"er_password\" MAXLENGTH=\"9\">\n");
+
+       wprintf("<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"invonly\" OnChange=\""
+               "       if (this.form.type[3].checked == true) {        "
+               "               this.form.er_floor.disabled = false;    "
+               "       }                                               "
+               "\"> ");
+       wprintf(_("Private - invitation only"));
+
+       wprintf("\n<LI><INPUT TYPE=\"radio\" NAME=\"type\" VALUE=\"personal\" "
+               "OnChange=\""
+               "       if (this.form.type[4].checked == true) {        "
+               "               this.form.er_floor.disabled = true;     "
+               "       }                                               "
+               "\"> ");
+       wprintf(_("Personal (mailbox for you only)"));
+
+       wprintf("\n</UL>\n");
+
        wprintf("<CENTER>\n");
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
+       wprintf("<INPUT TYPE=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Create new room"));
        wprintf("&nbsp;");
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
+       wprintf("<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
        wprintf("</CENTER>\n");
        wprintf("</FORM>\n<hr />");
        serv_printf("MESG roomaccess");
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
        if (buf[0] == '1') {
-               fmout(NULL, "CENTER");
+               fmout("CENTER");
        }
-       do_template("endbox");
+       wprintf("</td></tr></table></div>\n");
        wDumpContent(1);
 }
 
@@ -1600,12 +1970,12 @@ void er_set_default_view(int newview) {
        int rm_bits2;
 
        serv_puts("GETR");
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
        if (buf[0] != '2') return;
 
-       extract(rm_name, &buf[4], 0);
-       extract(rm_pass, &buf[4], 1);
-       extract(rm_dir, &buf[4], 2);
+       extract_token(rm_name, &buf[4], 0, '|', sizeof rm_name);
+       extract_token(rm_pass, &buf[4], 1, '|', sizeof rm_pass);
+       extract_token(rm_dir, &buf[4], 2, '|', sizeof rm_dir);
        rm_bits1 = extract_int(&buf[4], 3);
        rm_floor = extract_int(&buf[4], 4);
        rm_listorder = extract_int(&buf[4], 5);
@@ -1615,7 +1985,7 @@ void er_set_default_view(int newview) {
                rm_name, rm_pass, rm_dir, rm_bits1, rm_floor,
                rm_listorder, newview, rm_bits2
        );
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
 }
 
 
@@ -1633,9 +2003,9 @@ void entroom(void)
        int er_num_type;
        int er_view;
 
-       if (strcmp(bstr("sc"), "OK")) {
+       if (strlen(bstr("ok_button")) == 0) {
                strcpy(WC->ImportantMessage,
-                       "Cancelled.  No new room was created.");
+                       _("Cancelled.  No new room was created."));
                display_main_menu();
                return;
        }
@@ -1646,7 +2016,7 @@ void entroom(void)
        er_view = atoi(bstr("er_view"));
 
        er_num_type = 0;
-       if (!strcmp(er_type, "guessname"))
+       if (!strcmp(er_type, "hidden"))
                er_num_type = 1;
        if (!strcmp(er_type, "passworded"))
                er_num_type = 2;
@@ -1658,7 +2028,7 @@ void entroom(void)
        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);
+       serv_getln(buf, sizeof buf);
        if (buf[0] != '2') {
                strcpy(WC->ImportantMessage, &buf[4]);
                display_main_menu();
@@ -1674,41 +2044,54 @@ void entroom(void)
  */
 void display_private(char *rname, int req_pass)
 {
+       output_headers(1, 1, 2, 0, 0, 0);
+       wprintf("<div id=\"banner\">\n"
+               "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
+               "<SPAN CLASS=\"titlebar\">");
+       wprintf(_("Go to a hidden room"));
+       wprintf("</SPAN>"
+               "</TD></TR></TABLE>\n"
+               "</div>\n<div id=\"content\">\n"
+       );
 
-       output_headers(1, 1, 0, 0, 0, 0, 0);
-
-       svprintf("BOXTITLE", WCS_STRING, "Go to a hidden room");
-       do_template("beginbox");
+       wprintf("<div id=\"fix_scrollbar_bug\">"
+               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
 
        wprintf("<CENTER>\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 />");
+       wprintf(_("If you know the name of a hidden (guess-name) or "
+               "passworded room, you can enter that room by typing "
+               "its name below.  Once you gain access to a private "
+               "room, it will appear in your regular room listings "
+               "so you don't have to keep returning here."));
+       wprintf("\n<br /><br />");
 
-       wprintf("<FORM METHOD=\"GET\" ACTION=\"/goto_private\">\n");
+       wprintf("<FORM METHOD=\"POST\" ACTION=\"/goto_private\">\n");
 
        wprintf("<table border=\"0\" cellspacing=\"5\" "
                "cellpadding=\"5\" BGCOLOR=\"#EEEEEE\">\n"
-               "<TR><TD>"
-               "Enter room name:</TD><TD>"
+               "<TR><TD>");
+       wprintf(_("Enter room name:"));
+       wprintf("</TD><TD>"
                "<INPUT TYPE=\"text\" NAME=\"gr_name\" "
-               "VALUE=\"%s\" MAXLENGTH=\"19\">\n", rname);
+               "VALUE=\"%s\" MAXLENGTH=\"128\">\n", rname);
 
        if (req_pass) {
                wprintf("</TD></TR><TR><TD>");
-               wprintf("Enter room password:</TD><TD>");
+               wprintf(_("Enter room password:"));
+               wprintf("</TD><TD>");
                wprintf("<INPUT TYPE=\"password\" NAME=\"gr_pass\" MAXLENGTH=\"9\">\n");
        }
        wprintf("</TD></TR></TABLE><br />\n");
 
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">"
+       wprintf("<INPUT TYPE=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">"
                "&nbsp;"
-               "<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
+               "<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">",
+               _("Go there"),
+               _("Cancel")
+       );
        wprintf("</FORM>\n");
-       do_template("endbox");
+       wprintf("</td></tr></table></div>\n");
        wDumpContent(1);
 }
 
@@ -1720,7 +2103,7 @@ void goto_private(void)
        char hold_rm[SIZ];
        char buf[SIZ];
 
-       if (strcasecmp(bstr("sc"), "OK")) {
+       if (strlen(bstr("ok_button")) == 0) {
                display_main_menu();
                return;
        }
@@ -1730,7 +2113,7 @@ void goto_private(void)
        strcat(buf, "|");
        strcat(buf, bstr("gr_pass"));
        serv_puts(buf);
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
 
        if (buf[0] == '2') {
                smart_goto(bstr("gr_name"));
@@ -1740,7 +2123,7 @@ void goto_private(void)
                display_private(bstr("gr_name"), 1);
                return;
        }
-       output_headers(1, 1, 1, 0, 0, 0, 0);
+       output_headers(1, 1, 1, 0, 0, 0);
        wprintf("%s\n", &buf[4]);
        wDumpContent(1);
        return;
@@ -1752,22 +2135,24 @@ void goto_private(void)
  */
 void display_zap(void)
 {
-       output_headers(1, 1, 2, 0, 0, 0, 0);
+       output_headers(1, 1, 2, 0, 0, 0);
 
        wprintf("<div id=\"banner\">\n");
        wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
-       wprintf("<SPAN CLASS=\"titlebar\">Zap (forget/unsubscribe) the current room</SPAN>\n");
+       wprintf("<SPAN CLASS=\"titlebar\">");
+       wprintf(_("Zap (forget/unsubscribe) the current room"));
+       wprintf("</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(_("If you select this option, <em>%s</em> will "
+               "disappear from your room list.  Is this what you wish "
+               "to do?<br />\n"), WC->wc_roomname);
 
-       wprintf("<FORM METHOD=\"GET\" ACTION=\"/zap\">\n");
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"OK\">");
+       wprintf("<FORM METHOD=\"POST\" ACTION=\"/zap\">\n");
+       wprintf("<INPUT TYPE=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Zap this room"));
        wprintf("&nbsp;");
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
+       wprintf("<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
        wprintf("</FORM>\n");
        wDumpContent(1);
 }
@@ -1786,17 +2171,13 @@ void zap(void)
         */
        strcpy(final_destination, WC->wc_roomname);
 
-       if (!strcasecmp(bstr("sc"), "OK")) {
+       if (strlen(bstr("ok_button")) > 0) {
                serv_printf("GOTO %s", WC->wc_roomname);
-               serv_gets(buf);
-               if (buf[0] != '2') {
-                       /* ExpressMessageCat(&buf[4]); */
-               } else {
+               serv_getln(buf, sizeof buf);
+               if (buf[0] == '2') {
                        serv_puts("FORG");
-                       serv_gets(buf);
-                       if (buf[0] != '2') {
-                               /* ExpressMessageCat(&buf[4]); */
-                       } else {
+                       serv_getln(buf, sizeof buf);
+                       if (buf[0] == '2') {
                                strcpy(final_destination, "_BASEROOM_");
                        }
                }
@@ -1806,61 +2187,15 @@ void zap(void)
 
 
 
-
-/*
- * Confirm deletion of the current room
- */
-void confirm_delete_room(void)
-{
-       char buf[SIZ];
-
-       serv_puts("KILL 0");
-       serv_gets(buf);
-       if (buf[0] != '2') {
-               strcpy(WC->ImportantMessage, &buf[4]);
-               display_main_menu();
-               return;
-       }
-       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("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Delete\">");
-       wprintf("<INPUT TYPE=\"submit\" NAME=\"sc\" VALUE=\"Cancel\">");
-
-       wprintf("</FORM></CENTER>\n");
-       wDumpContent(1);
-}
-
-
 /*
  * Delete the current room
  */
 void delete_room(void)
 {
        char buf[SIZ];
-       char sc[SIZ];
-
-       strcpy(sc, bstr("sc"));
 
-       if (strcasecmp(sc, "Delete")) {
-               strcpy(WC->ImportantMessage,
-                       "Cancelled.  This room was not deleted.");
-               display_main_menu();
-               return;
-       }
        serv_puts("KILL 1");
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
        if (buf[0] != '2') {
                strcpy(WC->ImportantMessage, &buf[4]);
                display_main_menu();
@@ -1900,7 +2235,7 @@ void netedit(void) {
        }
 
        serv_puts("GNET");
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
        if (buf[0] != '1') {
                fclose(fp);
                display_editroom();
@@ -1908,11 +2243,11 @@ void netedit(void) {
        }
 
        /* This loop works for add *or* remove.  Spiffy, eh? */
-       while (serv_gets(buf), strcmp(buf, "000")) {
-               extract(cmpa0, buf, 0);
-               extract(cmpa1, buf, 1);
-               extract(cmpb0, line, 0);
-               extract(cmpb1, line, 1);
+       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+               extract_token(cmpa0, buf, 0, '|', sizeof cmpa0);
+               extract_token(cmpa1, buf, 1, '|', sizeof cmpa1);
+               extract_token(cmpb0, line, 0, '|', sizeof cmpb0);
+               extract_token(cmpb1, line, 1, '|', sizeof cmpb1);
                if ( (strcasecmp(cmpa0, cmpb0)) 
                   || (strcasecmp(cmpa1, cmpb1)) ) {
                        fprintf(fp, "%s\n", buf);
@@ -1921,7 +2256,7 @@ void netedit(void) {
 
        rewind(fp);
        serv_puts("SNET");
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
        if (buf[0] != '4') {
                fclose(fp);
                display_editroom();
@@ -1933,7 +2268,7 @@ void netedit(void) {
                serv_puts(buf);
        }
 
-       if (!strcasecmp(bstr("cmd"), "add")) {
+       if (strlen(bstr("add_button")) > 0) {
                serv_puts(line);
        }
 
@@ -1983,7 +2318,7 @@ void do_change_view(int newview) {
        char buf[SIZ];
 
        serv_printf("VIEW %d", newview);
-       serv_gets(buf);
+       serv_getln(buf, sizeof buf);
        WC->wc_view = newview;
        smart_goto(WC->wc_roomname);
 }
@@ -2006,20 +2341,35 @@ void change_view(void) {
  */
 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 levels;
+       int i;
        int has_subfolders = 0;
+       int *parents;
 
-       /* Include the menu expanding/collapsing code */
-       wprintf("<script type=\"text/javascript\" src=\"/static/menuExpandable3.js\"></script>\n");
+       parents = malloc(max_folders * sizeof(int));
 
        /* BEGIN TREE MENU */
-       wprintf("<div id=\"mainMenu\">\n");
-       wprintf("<UL id=\"menuList\">\n");
-       levels = 0;
-       oldlevels = 0;
+       wprintf("<div id=\"roomlist_div\">Loading folder list...</div>\n");
+
+       /* include NanoTree */
+       wprintf("<script type=\"text/javascript\" src=\"static/nanotree.js\"></script>\n");
+
+       /* initialize NanoTree */
+       wprintf("<script type=\"text/javascript\">                      \n"
+               "       showRootNode = false;                           \n"
+               "       sortNodes = false;                              \n"
+               "       dragable = false;                               \n"
+               "                                                       \n"
+               "       function standardClick(treeNode) {              \n"
+               "       }                                               \n"
+               "                                                       \n"
+               "       var closedGif = 'static/folder_closed.gif';     \n"
+               "       var openGif = 'static/folder_open.gif';         \n"
+               "                                                       \n"
+               "       rootNode = new TreeNode(1, 'root node - hide'); \n"
+       );
 
+       levels = 0;
        for (i=0; i<max_folders; ++i) {
 
                has_subfolders = 0;
@@ -2031,22 +2381,9 @@ void do_folder_view(struct folder *fold, int max_folders, int num_floors) {
                }
 
                levels = num_tokens(fold[i].name, '|');
+               parents[levels] = i;
 
-               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>");
-               }
+               wprintf("var node%d = new TreeNode(%d, '", i, i);
 
                if (fold[i].selectable) {
                        wprintf("<A HREF=\"/dotgoto?room=");
@@ -2063,35 +2400,50 @@ void do_folder_view(struct folder *fold, int max_folders, int num_floors) {
                else {
                        wprintf("<SPAN CLASS=\"roomlist_old\">");
                }
-               extract(buf, fold[i].name, levels-1);
+               extract_token(buf, fold[i].name, levels-1, '|', sizeof buf);
                escputs(buf);
                wprintf("</SPAN>");
 
-               if (!strcasecmp(fold[i].name, "My Folders|Mail")) {
-                       wprintf(" (INBOX)");
+               wprintf("</a>', ");
+               if (has_subfolders) {
+                       wprintf("new Array(closedGif, openGif)");
                }
-
-               if (fold[i].selectable) {
-                       wprintf("</A>");
+               else if (fold[i].view == VIEW_ADDRESSBOOK) {
+                       wprintf("'static/viewcontacts_16x.gif'");
                }
-               wprintf("\n");
-
-               if (has_subfolders) {
-                       wprintf("<UL id=\"menu%d\" class=\"%s\">\n",
-                               actnum++,
-                               ( (levels == 1) ? "menu" : "submenu")
-                       );
+               else if (fold[i].view == VIEW_CALENDAR) {
+                       wprintf("'static/calarea_16x.gif'");
+               }
+               else if (fold[i].view == VIEW_TASKS) {
+                       wprintf("'static/taskmanag_16x.gif'");
                }
+               else if (fold[i].view == VIEW_NOTES) {
+                       wprintf("'static/storenotes_16x.gif'");
+               }
+               else if (fold[i].view == VIEW_MAILBOX) {
+                       wprintf("'static/privatemess_16x.gif'");
+               }
+               else {
+                       wprintf("'static/chatrooms_16x.gif'");
+               }
+               wprintf(", '");
+               urlescputs(fold[i].name);
+               wprintf("');\n");
 
-               oldlevels = levels;
-       }
-       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);
+               if (levels < 2) {
+                       wprintf("rootNode.addChild(node%d);\n", i);
+               }
+               else {
+                       wprintf("node%d.addChild(node%d);\n", parents[levels-1], i);
+               }
        }
-       wprintf(" ' > \n");
-       wprintf("</DIV>\n");
+
+       wprintf("container = document.getElementById('roomlist_div');   \n"
+               "showTree('');  \n"
+               "</script>\n"
+       );
+
+       free(parents);
        /* END TREE MENU */
 }
 
@@ -2141,7 +2493,7 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
                if (levels == 1) {
 
                        /* Begin inner box */
-                       extract(buf, fold[i].name, levels-1);
+                       extract_token(buf, fold[i].name, levels-1, '|', sizeof buf);
                        stresc(boxtitle, buf, 1, 0);
                        svprintf("BOXTITLE", WCS_STRING, boxtitle);
                        do_template("beginbox");
@@ -2167,7 +2519,7 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
                        else {
                                wprintf("<SPAN CLASS=\"roomlist_old\">");
                        }
-                       extract(buf, fold[i].name, levels-1);
+                       extract_token(buf, fold[i].name, levels-1, '|', sizeof buf);
                        escputs(buf);
                        wprintf("</SPAN>");
                        if (fold[i].selectable) {
@@ -2216,30 +2568,30 @@ void list_all_rooms_by_floor(char *viewpref) {
 
        /* Then add floors */
        serv_puts("LFLR");
-       serv_gets(buf);
-       if (buf[0]=='1') while(serv_gets(buf), strcmp(buf, "000")) {
+       serv_getln(buf, sizeof buf);
+       if (buf[0]=='1') while(serv_getln(buf, sizeof 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].name, buf, 1);
+               extract_token(fold[max_folders].name, buf, 1, '|', sizeof fold[max_folders].name);
                ++max_folders;
                ++num_floors;
        }
 
        /* Now add rooms */
        serv_puts("LKRA");
-       serv_gets(buf);
-       if (buf[0]=='1') while(serv_gets(buf), strcmp(buf, "000")) {
+       serv_getln(buf, sizeof buf);
+       if (buf[0]=='1') while(serv_getln(buf, sizeof 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);
+               extract_token(fold[max_folders].room, buf, 0, '|', sizeof fold[max_folders].room);
                ra_flags = extract_int(buf, 5);
                flags = extract_int(buf, 1);
                fold[max_folders].floor = extract_int(buf, 2);
@@ -2248,6 +2600,7 @@ void list_all_rooms_by_floor(char *viewpref) {
                if (flags & QR_MAILBOX) {
                        fold[max_folders].is_mailbox = 1;
                }
+               fold[max_folders].view = extract_int(buf, 6);
                room_to_folder(fold[max_folders].name,
                                fold[max_folders].room,
                                fold[max_folders].floor,
@@ -2307,17 +2660,17 @@ void list_all_rooms_by_floor(char *viewpref) {
 void knrooms() {
        char listviewpref[SIZ];
 
-       output_headers(1, 1, 2, 0, 0, 0, 0);
+       output_headers(1, 1, 2, 0, 0, 0);
        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"));
+                       set_preference("roomlistview", bstr("view"), 1);
                }
        }
 
-       get_preference("roomlistview", listviewpref);
+       get_preference("roomlistview", listviewpref, sizeof listviewpref);
 
        if ( (strcasecmp(listviewpref, "folders"))
           && (strcasecmp(listviewpref, "table")) ) {
@@ -2362,6 +2715,7 @@ void knrooms() {
        offer_start_page();
        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 */
@@ -2376,21 +2730,21 @@ void knrooms() {
 void set_room_policy(void) {
        char buf[SIZ];
 
-       if (strcmp(bstr("sc"), "OK")) {
+       if (strlen(bstr("ok_button")) == 0) {
                strcpy(WC->ImportantMessage,
-                       "Cancelled.  Changes were not saved.");
+                       _("Cancelled.  Changes were not saved."));
                display_editroom();
                return;
        }
 
        serv_printf("SPEX room|%d|%d", atoi(bstr("roompolicy")), atoi(bstr("roomvalue")));
-       serv_gets(buf);
+       serv_getln(buf, sizeof 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);
+               serv_getln(buf, sizeof buf);
                strcat(WC->ImportantMessage, &buf[4]);
        }