* move some more vars from the session context to strbuf (the use of StrBufAppendTemp...
[citadel.git] / webcit / roomops.c
index d8a3d7c5f0eaaacc1a78e7497618478989f8fe7d..5efd7109ab5d9673373c1bbf007fc009e4f5fb14 100644 (file)
@@ -10,6 +10,8 @@ char floorlist[MAX_FLOORS][SIZ]; /**< list of our floor names */
 
 char *viewdefs[9]; /**< the different kinds of available views */
 
+void display_whok(void);
+
 /*
  * Initialize the viewdefs with localized strings
  */
@@ -77,7 +79,7 @@ void load_floorlist(void)
 /*
  * Free a session's march list
  */
-void free_march_list(struct wcsession *wcf)
+void free_march_list(wcsession *wcf)
 {
        struct march *mptr;
 
@@ -94,14 +96,14 @@ void free_march_list(struct wcsession *wcf)
 /*
  * remove a room from the march list
  */
-void remove_march(char *aaa)
+void remove_march(const StrBuf *aaa)
 {
        struct march *mptr, *mptr2;
 
        if (WC->march == NULL)
                return;
 
-       if (!strcasecmp(WC->march->march_name, aaa)) {
+       if (!strcasecmp(WC->march->march_name, ChrPtr(aaa))) {
                mptr = WC->march->next;
                free(WC->march);
                WC->march = mptr;
@@ -109,7 +111,7 @@ void remove_march(char *aaa)
        }
        mptr2 = WC->march;
        for (mptr = WC->march; mptr != NULL; mptr = mptr->next) {
-               if (!strcasecmp(mptr->march_name, aaa)) {
+               if (!strcasecmp(mptr->march_name, ChrPtr(aaa))) {
                        mptr2->next = mptr->next;
                        free(mptr);
                        mptr = mptr2;
@@ -254,16 +256,23 @@ void listrms(char *variety)
  */
 void zapped_list(void)
 {
+       WCTemplputParams SubTP;
+       StrBuf *Buf;
+
        output_headers(1, 1, 1, 0, 0, 0);
+       memset(&SubTP, 0, sizeof(WCTemplputParams));
+       Buf = NewStrBufPlain(_("Zapped (forgotten) rooms"), -1);
+       SubTP.ContextType = CTX_STRBUF;
+       SubTP.Context = Buf;
+       DoTemplate(HKEY("beginbox"), NULL, &SubTP);
 
-       svput("BOXTITLE", WCS_STRING, _("Zapped (forgotten) rooms"));
-       do_template("beginbox");
+       FreeStrBuf(&Buf);
 
        listrms("LZRM -1");
 
        wprintf("<br /><br />\n");
        wprintf(_("Click on any room to un-zap it and goto that room.\n"));
-       do_template("endbox");
+       do_template("endbox", NULL);
        wDumpContent(1);
 }
 
@@ -271,7 +280,7 @@ void zapped_list(void)
 /**
  * \brief read this room's info file (set v to 1 for verbose mode)
  */
-void readinfo(void)
+void readinfo(StrBuf *Target, WCTemplputParams *TP)
 {
        char buf[256];
        char briefinfo[128];
@@ -320,14 +329,15 @@ void readinfo(void)
  * keep the browser from using a cached icon from 
  * another room.
  */
-void embed_room_graphic(void) {
+void embed_room_graphic(StrBuf *Target, WCTemplputParams *TP)
+{
        char buf[SIZ];
 
        serv_puts("OIMG _roompic_");
        serv_getln(buf, sizeof buf);
        if (buf[0] == '2') {
                wprintf("<img height=\"64px\" src=\"image&name=_roompic_&room=");
-               urlescputs(WC->wc_roomname);
+               urlescputs(ChrPtr(WC->wc_roomname));
                wprintf("\">");
                serv_puts("CLOS");
                serv_getln(buf, sizeof buf);
@@ -376,11 +386,12 @@ void embed_room_graphic(void) {
 /**
  * \brief Display the current view and offer an option to change it
  */
-void embed_view_o_matic(void) {
+void embed_view_o_matic(StrBuf *Target, WCTemplputParams *TP)
+{
        int i;
 
        wprintf("<form name=\"viewomatic\" action=\"changeview\">\n");
-       wprintf("\t<div style=\"display: inline;\">\n\t<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       wprintf("\t<div style=\"display: inline;\">\n\t<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
        wprintf("<label for=\"view_name\">");
        wprintf(_("View as:"));
        wprintf("</label> "
@@ -417,9 +428,10 @@ void embed_view_o_matic(void) {
 /**
  * \brief Display a search box
  */
-void embed_search_o_matic(void) {
+void embed_search_o_matic(StrBuf *Target, WCTemplputParams *TP)
+{
        wprintf("<form name=\"searchomatic\" action=\"do_search\">\n");
-       wprintf("<div style=\"display: inline;\"><input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       wprintf("<div style=\"display: inline;\"><input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
        wprintf("<label for=\"search_name\">");
        wprintf(_("Search: "));
        wprintf("</label><input ");
@@ -442,7 +454,6 @@ void embed_search_o_matic(void) {
 void embed_room_banner(char *got, int navbar_style) {
        char buf[256];
        char buf2[1024];
-       char sanitized_roomname[256];
        char with_files[256];
        int file_count=0;
        
@@ -451,7 +462,9 @@ void embed_room_banner(char *got, int navbar_style) {
         * If it isn't supplied, we fake it by issuing our own GOTO.
         */
        if (got == NULL) {
-               serv_printf("GOTO %s", WC->wc_roomname);
+               memset(buf, '0', 20);
+               buf[20] = '\0';
+               serv_printf("GOTO %s", ChrPtr(WC->wc_roomname));
                serv_getln(buf, sizeof buf);
                got = buf;
        }
@@ -469,7 +482,7 @@ void embed_room_banner(char *got, int navbar_style) {
         * a "skip" or "gotonext" or something like that.
         */
        snprintf(WC->this_page, sizeof(WC->this_page), "dotskip&room=%s",
-               WC->wc_roomname);
+                ChrPtr(WC->wc_roomname));
 
        /** Check for new mail. */
        WC->new_mail = extract_int(&got[4], 9);
@@ -483,15 +496,13 @@ void embed_room_banner(char *got, int navbar_style) {
                if (buf2[0] == '1') while (serv_getln(buf2, sizeof buf2), strcmp(buf2, "000"))
                        file_count++;
                snprintf (with_files, sizeof with_files, 
-                         "; <a href=\"display_room_directory\"> %d %s </a>", 
+                         "; <a href=\"do_template?template=files\"> %d %s </a>", 
                          file_count, 
                          ((file_count>1) || (file_count == 0)  ? _("files") : _("file")));
        }
        else
                strcpy (with_files, "");
-               
-       stresc(sanitized_roomname, 256, WC->wc_roomname, 1, 1);
-       svprintf(HKEY("ROOMNAME"), WCS_STRING, "%s", sanitized_roomname);
+       
        svprintf(HKEY("NUMMSGS"), WCS_STRING,
                _("%d new of %d messages%s"),
                extract_int(&got[4], 1),
@@ -500,12 +511,13 @@ void embed_room_banner(char *got, int navbar_style) {
        );
        svcallback("ROOMPIC", embed_room_graphic);
        svcallback("ROOMINFO", readinfo);
-       svcallback("VIEWOMATIC", embed_view_o_matic);
+       svcallback("VIEWOMATIC", embed_view_o_matic); 
        svcallback("SEARCHOMATIC", embed_search_o_matic);
-       svcallback("START", offer_start_page);
-
-       do_template("roombanner");
-       if (navbar_style != navbar_none) {
+       svcallback("START", offer_start_page); 
+       do_template("roombanner", NULL);
+       /* roombanner contains this for mobile */
+       if (navbar_style != navbar_none && !WC->is_mobile) { 
 
                wprintf("<div id=\"navbar\"><ul>");
 
@@ -737,56 +749,59 @@ void embed_room_banner(char *got, int navbar_style) {
 }
 
 
-/**
- * \brief back end routine to take the session to a new room
- * \param gname room to go to
- *
+/*
+ * back end routine to take the session to a new room
  */
-int gotoroom(char *gname)
+long gotoroom(const StrBuf *gname)
 {
+       StrBuf *Buf;
        char buf[SIZ];
        static long ls = (-1L);
-       int err = 0;
+       long err = 0;
 
-       /** store ungoto information */
-       strcpy(WC->ugname, WC->wc_roomname);
+       /* store ungoto information */
+       strcpy(WC->ugname, ChrPtr(WC->wc_roomname));
        WC->uglsn = ls;
-
+       Buf = NewStrBuf();
        /** move to the new room */
-       serv_printf("GOTO %s", gname);
-       serv_getln(buf, sizeof buf);
-       if (buf[0] != '2') {
-               buf[3] = 0;
-               err = atoi(buf);
-               serv_puts("GOTO _BASEROOM_");
-               serv_getln(buf, sizeof buf);
-       }
-       if (buf[0] != '2') {
-               buf[3] = 0;
-               err = atoi(buf);
+       serv_printf("GOTO %s", ChrPtr(gname));
+       StrBuf_ServGetln(Buf);
+       if  (GetServerStatus(Buf, &err) != 2) {
+               FreeStrBuf(&Buf);
                return err;
        }
-       extract_token(WC->wc_roomname, &buf[4], 0, '|', sizeof WC->wc_roomname);
-       WC->room_flags = extract_int(&buf[4], 4);
+
+       serv_puts("GOTO _BASEROOM_");
+       serv_getln(buf, sizeof buf);
+
+       if (WC->wc_roomname == NULL)
+               WC->wc_roomname = NewStrBuf();
+       else
+               FlushStrBuf(WC->wc_roomname);
+
+       StrBufExtract_token(WC->wc_roomname, Buf, 0, '|');
+       StrBufCutLeft(WC->wc_roomname, 4);
+       WC->room_flags = StrBufExtract_int(Buf, 4, '|');
        /* highest_msg_read = extract_int(&buf[4],6);
           maxmsgnum = extract_int(&buf[4],5);
         */
-       WC->is_mailbox = extract_int(&buf[4],7);
-       ls = extract_long(&buf[4], 6);
-       WC->wc_floor = extract_int(&buf[4], 10);
-       WC->wc_view = extract_int(&buf[4], 11);
-       WC->wc_default_view = extract_int(&buf[4], 12);
-       WC->wc_is_trash = extract_int(&buf[4], 13);
-       WC->room_flags2 = extract_int(&buf[4], 14);
+       WC->is_mailbox = StrBufExtract_int(Buf, 7, '|');   
+       ls = StrBufExtract_long(Buf, 6, '|');
+       WC->wc_floor = StrBufExtract_int(Buf, 10, '|');
+       WC->wc_view = StrBufExtract_int(Buf, 11, '|');
+       WC->wc_default_view = StrBufExtract_int(Buf, 12, '|');
+       WC->wc_is_trash = StrBufExtract_int(Buf, 13, '|');
+       WC->room_flags2 = StrBufExtract_int(Buf, 14, '|');
 
        if (WC->is_aide)
                WC->is_room_aide = WC->is_aide;
        else
-               WC->is_room_aide = (char) extract_int(&buf[4], 8);
+               WC->is_room_aide = (char) StrBufExtract_int(Buf, 8, '|');
 
        remove_march(WC->wc_roomname);
-       if (!strcasecmp(gname, "_BASEROOM_"))
+       if (!strcasecmp(ChrPtr(gname), "_BASEROOM_"))
                remove_march(gname);
+       FreeStrBuf(&Buf);
 
        return err;
 }
@@ -849,7 +864,7 @@ void gotonext(void)
        struct march *mptr = NULL;
        struct march *mptr2 = NULL;
        char room_name[128];
-       char next_room[128];
+       StrBuf *next_room;
        int ELoop = 0;
 
        /*
@@ -871,7 +886,7 @@ void gotonext(void)
                                        continue;                                       
                                }
                                extract_token(room_name, buf, 0, '|', sizeof room_name);
-                               if (strcasecmp(room_name, WC->wc_roomname)) {
+                               if (strcasecmp(room_name, ChrPtr(WC->wc_roomname))) {
                                        mptr = (struct march *) malloc(sizeof(struct march));
                                        mptr->next = NULL;
                                        safestrncpy(mptr->march_name, room_name, sizeof mptr->march_name);
@@ -909,22 +924,23 @@ void gotonext(void)
                remove_march(WC->wc_roomname);
        }
        if (WC->march != NULL) {
-               strcpy(next_room, pop_march(-1));
+               next_room = NewStrBufPlain(pop_march(-1), -1);/*TODO: migrate march to strbuf */
        } else {
-               strcpy(next_room, "_BASEROOM_");
+               next_room = NewStrBufPlain(HKEY("_BASEROOM_"));
        }
 
 
        smart_goto(next_room);
+       FreeStrBuf(&next_room);
 }
 
 
 /*
  * goto next room
  */
-void smart_goto(char *next_room) {
+void smart_goto(const StrBuf *next_room) {
        gotoroom(next_room);
-       readloop("readnew");
+       readloop(readnew);
 }
 
 
@@ -946,25 +962,29 @@ void slrp_highest(void)
  */
 void ungoto(void)
 {
-       char buf[SIZ];
+       StrBuf *Buf;
 
        if (!strcmp(WC->ugname, "")) {
                smart_goto(WC->wc_roomname);
                return;
        }
        serv_printf("GOTO %s", WC->ugname);
-       serv_getln(buf, sizeof buf);
-       if (buf[0] != '2') {
+       Buf = NewStrBuf();
+       StrBuf_ServGetln(Buf);
+       if (GetServerStatus(Buf, NULL) != 2) {
                smart_goto(WC->wc_roomname);
+               FreeStrBuf(&Buf);
                return;
        }
        if (WC->uglsn >= 0L) {
                serv_printf("SLRP %ld", WC->uglsn);
-               serv_getln(buf, sizeof buf);
+               StrBuf_ServGetln(Buf);
        }
-       strcpy(buf, WC->ugname);
+       FlushStrBuf(Buf);
+       StrBufAppendBufPlain(Buf, WC->ugname, -1, 0);
        strcpy(WC->ugname, "");
-       smart_goto(buf);
+       smart_goto(Buf);
+       FreeStrBuf(&Buf);
 }
 
 typedef struct __room_states {
@@ -1111,7 +1131,7 @@ void display_editroom(void)
        char node[256];
        char remote_room[128];
        char recp[1024];
-       char er_name[128];
+       char er_name[128] = "";
        char er_password[10];
        char er_dirname[15];
        char er_roomaide[26];
@@ -1138,10 +1158,15 @@ void display_editroom(void)
 
        wprintf("<div class=\"fix_scrollbar_bug\">");
 
-       /** print the tabbed dialog */
-       wprintf("<ul class=\"tabbed_dialog\">\n");
+       wprintf("<br />\n");
 
-       wprintf("<li class=\"tablabel ");
+       /* print the tabbed dialog */
+       wprintf("<div align=\"center\">");
+       wprintf("<table id=\"AdminTabs\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\""
+               "<tr align=\"center\" style=\"cursor:pointer\"><td>&nbsp;</td>"
+               );
+
+       wprintf("<td class=\"");
        if (!strcmp(tab, "admin")) {
                wprintf(" tab_cell_label\">");
                wprintf(_("Administration"));
@@ -1151,11 +1176,12 @@ void display_editroom(void)
                wprintf(_("Administration"));
                wprintf("</a>");
        }
-       wprintf("</li>\n");
+       wprintf("</td>\n");
+       wprintf("<td>&nbsp;</td>\n");
 
        if ( (WC->axlevel >= 6) || (WC->is_room_aide) ) {
 
-               wprintf("<li class=\"tablabel ");
+               wprintf("<td class=\"");
                if (!strcmp(tab, "config")) {
                        wprintf(" tab_cell_label\">");
                        wprintf(_("Configuration"));
@@ -1165,9 +1191,10 @@ void display_editroom(void)
                        wprintf(_("Configuration"));
                        wprintf("</a>");
                }
-               wprintf("</li>\n");
+               wprintf("</td>\n");
+               wprintf("<td>&nbsp;</td>\n");
 
-               wprintf("<li class=\"tablabel ");
+               wprintf("<td class=\"");
                if (!strcmp(tab, "expire")) {
                        wprintf(" tab_cell_label\">");
                        wprintf(_("Message expire policy"));
@@ -1177,9 +1204,10 @@ void display_editroom(void)
                        wprintf(_("Message expire policy"));
                        wprintf("</a>");
                }
-               wprintf("</li>\n");
+               wprintf("</td>\n");
+               wprintf("<td>&nbsp;</td>\n");
        
-               wprintf("<li class=\"tablabel ");
+               wprintf("<td class=\"");
                if (!strcmp(tab, "access")) {
                        wprintf(" tab_cell_label\">");
                        wprintf(_("Access controls"));
@@ -1189,9 +1217,10 @@ void display_editroom(void)
                        wprintf(_("Access controls"));
                        wprintf("</a>");
                }
-               wprintf("</li>\n");
+               wprintf("</td>\n");
+               wprintf("<td>&nbsp;</td>\n");
 
-               wprintf("<li class=\"tablabel ");
+               wprintf("<td class=\"");
                if (!strcmp(tab, "sharing")) {
                        wprintf(" tab_cell_label\">");
                        wprintf(_("Sharing"));
@@ -1201,9 +1230,10 @@ void display_editroom(void)
                        wprintf(_("Sharing"));
                        wprintf("</a>");
                }
-               wprintf("</li>\n");
+               wprintf("</td>\n");
+               wprintf("<td>&nbsp;</td>\n");
 
-               wprintf("<li class=\"tablabel ");
+               wprintf("<td class=\"");
                if (!strcmp(tab, "listserv")) {
                        wprintf(" tab_cell_label\">");
                        wprintf(_("Mailing list service"));
@@ -1213,11 +1243,12 @@ void display_editroom(void)
                        wprintf(_("Mailing list service"));
                        wprintf("</a>");
                }
-               wprintf("</li>\n");
+               wprintf("</td>\n");
+               wprintf("<td>&nbsp;</td>\n");
 
        }
 
-       wprintf("<li class=\"tablabel ");
+       wprintf("<td class=\"");
        if (!strcmp(tab, "feeds")) {
                wprintf(" tab_cell_label\">");
                wprintf(_("Remote retrieval"));
@@ -1227,11 +1258,18 @@ void display_editroom(void)
                wprintf(_("Remote retrieval"));
                wprintf("</a>");
        }
-       wprintf("</li>\n");
+       wprintf("</td>\n");
+       wprintf("<td>&nbsp;</td>\n");
 
-       wprintf("</ul>\n");
+       wprintf("</tr></table>\n");
+       wprintf("</div>\n");
        /* end tabbed dialog */ 
 
+       wprintf("<script type=\"text/javascript\">"
+               " Nifty(\"table#AdminTabs td\", \"small transparent top\");"
+               "</script>"
+       );
+
        /* begin content of whatever tab is open now */
 
        if (!strcmp(tab, "admin")) {
@@ -1275,7 +1313,7 @@ void display_editroom(void)
                        er_flags2 = extract_int(&buf[4], 7);
        
                        wprintf("<form method=\"POST\" action=\"editroom\">\n");
-                       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+                       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
                
                        wprintf("<ul><li>");
                        wprintf(_("Name of room: "));
@@ -1561,7 +1599,7 @@ void display_editroom(void)
                        extract_token(remote_room, buf, 1, '|', sizeof remote_room);
                        if (!IsEmptyStr(node)) {
                                wprintf("<form method=\"POST\" action=\"netedit\">");
-                               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+                               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
                                wprintf("<tr><td>%s</td>\n", node);
 
                                wprintf("<td>");
@@ -1602,7 +1640,7 @@ void display_editroom(void)
                        extract_token(node, not_shared_with, i, '\n', sizeof node);
                        if (!IsEmptyStr(node)) {
                                wprintf("<form method=\"POST\" action=\"netedit\">");
-                               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+                               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
                                wprintf("<tr><td>");
                                escputs(node);
                                wprintf("</td><td>"
@@ -1676,7 +1714,7 @@ void display_editroom(void)
                wprintf("<br /><form method=\"POST\" action=\"netedit\">\n"
                        "<input type=\"hidden\" NAME=\"tab\" VALUE=\"listserv\">\n"
                        "<input type=\"hidden\" NAME=\"prefix\" VALUE=\"listrecp|\">\n");
-               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
                wprintf("<input type=\"text\" id=\"add_as_listrecp\" NAME=\"line\">\n");
                wprintf("<input type=\"submit\" NAME=\"add_button\" VALUE=\"%s\">", _("Add"));
                wprintf("</form>\n");
@@ -1707,7 +1745,7 @@ void display_editroom(void)
                wprintf("<br /><form method=\"POST\" action=\"netedit\">\n"
                        "<input type=\"hidden\" NAME=\"tab\" VALUE=\"listserv\">\n"
                        "<input type=\"hidden\" NAME=\"prefix\" VALUE=\"digestrecp|\">\n");
-               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
                wprintf("<input type=\"text\" id=\"add_as_digestrecp\" NAME=\"line\">\n");
                wprintf("<input type=\"submit\" NAME=\"add_button\" VALUE=\"%s\">", _("Add"));
                wprintf("</form>\n");
@@ -1791,12 +1829,12 @@ void display_editroom(void)
                        }
                        
                        wprintf("<br /><form method=\"POST\" action=\"set_room_policy\">\n");
-                       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+                       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
                        wprintf("<table border=0 cellspacing=5>\n");
                        wprintf("<tr><td>");
                        wprintf(_("Message expire policy for this room"));
                        wprintf("<br />(");
-                       escputs(WC->wc_roomname);
+                       escputs(ChrPtr(WC->wc_roomname));
                        wprintf(")</td><td>");
                        wprintf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"0\" %s>",
                                ((roompolicy == 0) ? "CHECKED" : "") );
@@ -1917,7 +1955,7 @@ void display_editroom(void)
 
                                wprintf("<td>%s</td>", extract_int(buf, 4) ? _("Yes") : _("No"));
 
-                               wprintf("<td>%ld</td>", extract_long(buf, 5));  // Fetching interval
+                               wprintf("<td>%ld</td>", extract_long(buf, 5));  /* Fetching interval */
                        
                                wprintf("<td class=\"button_link\">");
                                wprintf(" <a href=\"netedit&cmd=remove&tab=feeds&line=pop3client|");
@@ -1934,7 +1972,7 @@ void display_editroom(void)
                        "<tr>"
                        "<input type=\"hidden\" name=\"tab\" value=\"feeds\">"
                        "<input type=\"hidden\" name=\"prefix\" value=\"pop3client|\">\n");
-               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
                wprintf("<td>");
                wprintf("<input type=\"text\" id=\"add_as_pop3host\" NAME=\"line_pop3host\">\n");
                wprintf("</td>");
@@ -2001,7 +2039,7 @@ void display_editroom(void)
                        "<tr>"
                        "<input type=\"hidden\" name=\"tab\" value=\"feeds\">"
                        "<input type=\"hidden\" name=\"prefix\" value=\"rssclient|\">\n");
-               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
                wprintf("<td>");
                wprintf("<input type=\"text\" id=\"add_as_pop3host\" size=\"72\" "
                        "maxlength=\"256\" name=\"line_pop3host\">\n");
@@ -2062,11 +2100,12 @@ void toggle_self_service(void) {
  */
 void editroom(void)
 {
-       char buf[SIZ];
-       char er_name[128];
-       char er_password[10];
-       char er_dirname[15];
-       char er_roomaide[26];
+       const StrBuf *Ptr;
+       StrBuf *Buf;
+       StrBuf *er_name;
+       StrBuf *er_password;
+       StrBuf *er_dirname;
+       StrBuf *er_roomaide;
        int er_floor;
        unsigned er_flags;
        int er_listingorder;
@@ -2082,60 +2121,68 @@ void editroom(void)
                return;
        }
        serv_puts("GETR");
-       serv_getln(buf, sizeof buf);
-
-       if (buf[0] != '2') {
-               strcpy(WC->ImportantMessage, &buf[4]);
+       Buf = NewStrBuf();
+       StrBuf_ServGetln(Buf);
+       if (GetServerStatus(Buf, NULL) != 2) {
+               StrBufCutLeft(Buf, 4);
+               strcpy(WC->ImportantMessage, ChrPtr(Buf));
                display_editroom();
+               FreeStrBuf(&Buf);
                return;
        }
-       extract_token(er_name, &buf[4], 0, '|', sizeof er_name);
-       extract_token(er_password, &buf[4], 1, '|', sizeof er_password);
-       extract_token(er_dirname, &buf[4], 2, '|', sizeof er_dirname);
-       er_flags = extract_int(&buf[4], 3);
-       er_listingorder = extract_int(&buf[4], 5);
-       er_defaultview = extract_int(&buf[4], 6);
-       er_flags2 = extract_int(&buf[4], 7);
-
-       strcpy(er_roomaide, bstr("er_roomaide"));
-       if (IsEmptyStr(er_roomaide)) {
+       StrBufCutLeft(Buf, 4);
+       StrBufExtract_token(er_name, Buf, 0, '|');
+       StrBufExtract_token(er_password, Buf, 1, '|');
+       StrBufExtract_token(er_dirname, Buf, 2, '|');
+       er_flags = StrBufExtract_int(Buf, 3, '|');
+       er_listingorder = StrBufExtract_int(Buf, 5, '|');
+       er_defaultview = StrBufExtract_int(Buf, 6, '|');
+       er_flags2 = StrBufExtract_int(Buf, 7, '|');
+
+       er_roomaide = NewStrBufDup(sbstr("er_roomaide"));
+       if (StrLength(er_roomaide) == 0) {
                serv_puts("GETA");
-               serv_getln(buf, sizeof buf);
-               if (buf[0] != '2') {
-                       strcpy(er_roomaide, "");
+               StrBuf_ServGetln(Buf);
+               if (GetServerStatus(Buf, NULL) != 2) {
+                       FlushStrBuf(er_roomaide);
                } else {
-                       extract_token(er_roomaide, &buf[4], 0, '|', sizeof er_roomaide);
+                       StrBufCutLeft(Buf, 4);
+                       StrBufExtract_token(er_roomaide, Buf, 0, '|');
                }
        }
-       strcpy(buf, bstr("er_name"));
-       buf[128] = 0;
-       if (!IsEmptyStr(buf)) {
-               strcpy(er_name, buf);
+       Ptr = sbstr("er_name");
+       if (StrLength(Ptr) > 0) {
+               FlushStrBuf(er_name);
+               StrBufAppendBuf(er_name, Ptr, 0);
+       }
+
+       Ptr = sbstr("er_password");
+       if (StrLength(Ptr) > 0) {
+               FlushStrBuf(er_password);
+               StrBufAppendBuf(er_password, Ptr, 0);
        }
+               
 
-       strcpy(buf, bstr("er_password"));
-       buf[10] = 0;
-       if (!IsEmptyStr(buf))
-               strcpy(er_password, buf);
+       Ptr = sbstr("er_dirname");
+       if (StrLength(Ptr) > 0) { /* todo: cut 15 */
+               FlushStrBuf(er_dirname);
+               StrBufAppendBuf(er_dirname, Ptr, 0);
+       }
 
-       strcpy(buf, bstr("er_dirname"));
-       buf[15] = 0;
-       if (!IsEmptyStr(buf))
-               strcpy(er_dirname, buf);
 
-       strcpy(buf, bstr("type"));
+       Ptr = sbstr("type");
        er_flags &= !(QR_PRIVATE | QR_PASSWORDED | QR_GUESSNAME);
 
-       if (!strcmp(buf, "invonly")) {
+       if (!strcmp(ChrPtr(Ptr), "invonly")) {
                er_flags |= (QR_PRIVATE);
        }
-       if (!strcmp(buf, "hidden")) {
+       if (!strcmp(ChrPtr(Ptr), "hidden")) {
                er_flags |= (QR_PRIVATE | QR_GUESSNAME);
        }
-       if (!strcmp(buf, "passworded")) {
+       if (!strcmp(ChrPtr(Ptr), "passworded")) {
                er_flags |= (QR_PRIVATE | QR_PASSWORDED);
        }
-       if (!strcmp(buf, "personal")) {
+       if (!strcmp(ChrPtr(Ptr), "personal")) {
                er_flags |= QR_MAILBOX;
        } else {
                er_flags &= ~QR_MAILBOX;
@@ -2202,45 +2249,64 @@ void editroom(void)
                er_flags &= ~QR_VISDIR;
        }
 
-       strcpy(buf, bstr("anon"));
+       Ptr = sbstr("anon");
 
        er_flags &= ~(QR_ANONONLY | QR_ANONOPT);
-       if (!strcmp(buf, "anononly"))
+       if (!strcmp(ChrPtr(Ptr), "anononly"))
                er_flags |= QR_ANONONLY;
-       if (!strcmp(buf, "anon2"))
+       if (!strcmp(ChrPtr(Ptr), "anon2"))
                er_flags |= QR_ANONOPT;
 
-       bump = 0;
-       if (!strcmp(bstr("bump"), "yes"))
-               bump = 1;
+       bump = yesbstr("bump");
 
        er_floor = ibstr("er_floor");
 
-       sprintf(buf, "SETR %s|%s|%s|%u|%d|%d|%d|%d|%u",
-               er_name, er_password, er_dirname, er_flags, bump, er_floor,
-               er_listingorder, er_defaultview, er_flags2);
-       serv_puts(buf);
-       serv_getln(buf, sizeof buf);
-       if (buf[0] != '2') {
-               strcpy(WC->ImportantMessage, &buf[4]);
+       StrBufPrintf(Buf, "SETR %s|%s|%s|%u|%d|%d|%d|%d|%u",
+                    ChrPtr(er_name), 
+                    ChrPtr(er_password), 
+                    ChrPtr(er_dirname), 
+                    er_flags, 
+                    bump, 
+                    er_floor,
+                    er_listingorder, 
+                    er_defaultview, 
+                    er_flags2);
+       serv_putbuf(Buf);
+       StrBuf_ServGetln(Buf);
+       if (GetServerStatus(Buf, NULL) != 2) {
+               strcpy(WC->ImportantMessage, &ChrPtr(Buf)[4]);
                display_editroom();
+               FreeStrBuf(&Buf);
+               FreeStrBuf(&er_name);
+               FreeStrBuf(&er_password);
+               FreeStrBuf(&er_dirname);
+               FreeStrBuf(&er_roomaide);
                return;
        }
        gotoroom(er_name);
 
-       if (!IsEmptyStr(er_roomaide)) {
-               sprintf(buf, "SETA %s", er_roomaide);
-               serv_puts(buf);
-               serv_getln(buf, sizeof buf);
-               if (buf[0] != '2') {
-                       strcpy(WC->ImportantMessage, &buf[4]);
+       if (StrLength(er_roomaide) > 0) {
+               serv_printf("SETA %s", ChrPtr(er_roomaide));
+               StrBuf_ServGetln(Buf);
+               if (GetServerStatus(Buf, NULL) != 2) {
+                       strcpy(WC->ImportantMessage, &ChrPtr(Buf)[4]);
                        display_main_menu();
+                       FreeStrBuf(&Buf);
+                       FreeStrBuf(&er_name);
+                       FreeStrBuf(&er_password);
+                       FreeStrBuf(&er_dirname);
+                       FreeStrBuf(&er_roomaide);
                        return;
                }
        }
        gotoroom(er_name);
        strcpy(WC->ImportantMessage, _("Your changes have been saved."));
        display_editroom();
+       FreeStrBuf(&Buf);
+       FreeStrBuf(&er_name);
+       FreeStrBuf(&er_password);
+       FreeStrBuf(&er_dirname);
+       FreeStrBuf(&er_roomaide);
        return;
 }
 
@@ -2319,7 +2385,7 @@ void display_whok(void)
        wprintf("<br /><br />");
        
         wprintf("<CENTER><form method=\"POST\" action=\"do_invt_kick\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
        wprintf("<input type=\"hidden\" NAME=\"tab\" VALUE=\"access\">\n");
         wprintf("<select NAME=\"username\" SIZE=\"10\" style=\"width:100%%\">\n");
         serv_puts("WHOK");
@@ -2344,7 +2410,7 @@ void display_whok(void)
 
         wprintf("<CENTER><form method=\"POST\" action=\"do_invt_kick\">\n");
        wprintf("<input type=\"hidden\" NAME=\"tab\" VALUE=\"access\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
         wprintf(_("Invite:"));
        wprintf(" ");
         wprintf("<input type=\"text\" name=\"username\" id=\"username_id\" style=\"width:100%%\"><br />\n"
@@ -2389,10 +2455,10 @@ void display_entroom(void)
        output_headers(1, 1, 1, 0, 0, 0);
 
        svprintf(HKEY("BOXTITLE"), WCS_STRING, _("Create a new room"));
-       do_template("beginbox");
+       do_template("beginbox", NULL);
 
        wprintf("<form name=\"create_room_form\" method=\"POST\" action=\"entroom\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
 
        wprintf("<table class=\"altern\"> ");
 
@@ -2511,7 +2577,7 @@ void display_entroom(void)
                fmout("LEFT");
        }
 
-       do_template("endbox");
+       do_template("endbox", NULL);
 
        wDumpContent(1);
 }
@@ -2561,9 +2627,9 @@ void er_set_default_view(int newview) {
 void entroom(void)
 {
        char buf[SIZ];
-       char er_name[SIZ];
-       char er_type[SIZ];
-       char er_password[SIZ];
+       const StrBuf *er_name;
+       const StrBuf *er_type;
+       const StrBuf *er_password;
        int er_floor;
        int er_num_type;
        int er_view;
@@ -2574,25 +2640,30 @@ void entroom(void)
                display_main_menu();
                return;
        }
-       strcpy(er_name, bstr("er_name"));
-       strcpy(er_type, bstr("type"));
-       strcpy(er_password, bstr("er_password"));
+       er_name = sbstr("er_name");
+       er_type = sbstr("type");
+       er_password = sbstr("er_password");
        er_floor = ibstr("er_floor");
        er_view = ibstr("er_view");
 
        er_num_type = 0;
-       if (!strcmp(er_type, "hidden"))
+       if (!strcmp(ChrPtr(er_type), "hidden"))
                er_num_type = 1;
-       if (!strcmp(er_type, "passworded"))
+       else if (!strcmp(ChrPtr(er_type), "passworded"))
                er_num_type = 2;
-       if (!strcmp(er_type, "invonly"))
+       else if (!strcmp(ChrPtr(er_type), "invonly"))
                er_num_type = 3;
-       if (!strcmp(er_type, "personal"))
+       else if (!strcmp(ChrPtr(er_type), "personal"))
                er_num_type = 4;
 
-       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_printf("CRE8 1|%s|%d|%s|%d|%d|%d", 
+                   ChrPtr(er_name), 
+                   er_num_type, 
+                   ChrPtr(er_password), 
+                   er_floor, 
+                   0, 
+                   er_view);
+
        serv_getln(buf, sizeof buf);
        if (buf[0] != '2') {
                strcpy(WC->ImportantMessage, &buf[4]);
@@ -2613,10 +2684,17 @@ void entroom(void)
  */
 void display_private(char *rname, int req_pass)
 {
+       WCTemplputParams SubTP;
+       StrBuf *Buf;
        output_headers(1, 1, 1, 0, 0, 0);
 
-       svprintf(HKEY("BOXTITLE"), WCS_STRING, _("Go to a hidden room"));
-       do_template("beginbox");
+       Buf = NewStrBufPlain(_("Go to a hidden room"), -1);
+       memset(&SubTP, 0, sizeof(WCTemplputParams));
+       SubTP.ContextType = CTX_STRBUF;
+       SubTP.Context = Buf;
+       DoTemplate(HKEY("beginbox"), NULL, &SubTP);
+
+       FreeStrBuf(&Buf);
 
        wprintf("<p>");
        wprintf(_("If you know the name of a hidden (guess-name) or "
@@ -2627,7 +2705,7 @@ void display_private(char *rname, int req_pass)
        wprintf("</p>");
 
        wprintf("<form method=\"post\" action=\"goto_private\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
 
        wprintf("<table class=\"altern\"> "
                "<tr class=\"even\"><td>");
@@ -2653,7 +2731,7 @@ void display_private(char *rname, int req_pass)
        );
        wprintf("</div></form>\n");
 
-       do_template("endbox");
+       do_template("endbox", NULL);
 
        wDumpContent(1);
 }
@@ -2670,16 +2748,14 @@ void goto_private(void)
                display_main_menu();
                return;
        }
-       strcpy(hold_rm, WC->wc_roomname);
-       strcpy(buf, "GOTO ");
-       strcat(buf, bstr("gr_name"));
-       strcat(buf, "|");
-       strcat(buf, bstr("gr_pass"));
-       serv_puts(buf);
+       strcpy(hold_rm, ChrPtr(WC->wc_roomname));
+       serv_printf("GOTO %s|%s",
+                   bstr("gr_name"),
+                   bstr("gr_pass"));
        serv_getln(buf, sizeof buf);
 
        if (buf[0] == '2') {
-               smart_goto(bstr("gr_name"));
+               smart_goto(sbstr("gr_name"));
                return;
        }
        if (!strncmp(buf, "540", 3)) {
@@ -2709,11 +2785,11 @@ void display_zap(void)
        wprintf("<div id=\"content\" class=\"service\">\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);
+                 "disappear from your room list.  Is this what you wish "
+                 "to do?<br />\n"), ChrPtr(WC->wc_roomname));
 
        wprintf("<form method=\"POST\" action=\"zap\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
        wprintf("<input type=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Zap this room"));
        wprintf("&nbsp;");
        wprintf("<input type=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
@@ -2728,26 +2804,28 @@ void display_zap(void)
 void zap(void)
 {
        char buf[SIZ];
-       char final_destination[SIZ];
+       StrBuf *final_destination;
 
        /**
         * If the forget-room routine fails for any reason, we fall back
         * to the current room; otherwise, we go to the Lobby
         */
-       strcpy(final_destination, WC->wc_roomname);
+       final_destination = NewStrBufDup(WC->wc_roomname);
 
        if (havebstr("ok_button")) {
-               serv_printf("GOTO %s", WC->wc_roomname);
+               serv_printf("GOTO %s", ChrPtr(WC->wc_roomname));
                serv_getln(buf, sizeof buf);
                if (buf[0] == '2') {
                        serv_puts("FORG");
                        serv_getln(buf, sizeof buf);
                        if (buf[0] == '2') {
-                               strcpy(final_destination, "_BASEROOM_");
+                               FlushStrBuf(final_destination);
+                               StrBufAppendBufPlain(final_destination, HKEY("_BASEROOM_"), 0);
                        }
                }
        }
        smart_goto(final_destination);
+       FreeStrBuf(&final_destination);
 }
 
 
@@ -2768,7 +2846,11 @@ void delete_room(void)
                display_main_menu();
                return;
        } else {
-               smart_goto("_BASEROOM_");
+               StrBuf *Buf;
+               
+               Buf = NewStrBufPlain(HKEY("_BASEROOM_"));
+               smart_goto(Buf);
+               FreeStrBuf(&Buf);
        }
 }
 
@@ -2786,7 +2868,7 @@ void netedit(void) {
        char cmpb0[SIZ];
        char cmpb1[SIZ];
        int i, num_addrs;
-       // TODO: do line dynamic!
+       /*/ TODO: do line dynamic! */
        if (havebstr("line_pop3host")) {
                strcpy(line, bstr("prefix"));
                strcat(line, bstr("line_pop3host"));
@@ -3075,7 +3157,6 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
        char buf[256];
        char floor_name[256];
        char old_floor_name[256];
-       char boxtitle[256];
        int levels, oldlevels;
        int i, t;
        int num_boxes = 0;
@@ -3107,7 +3188,7 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
                if ( (strcasecmp(floor_name, old_floor_name))
                   && (!IsEmptyStr(old_floor_name)) ) {
                        /* End inner box */
-                       do_template("endbox");
+                       do_template("endbox", NULL);
                        wprintf("<br>");
 
                        ++num_boxes;
@@ -3121,10 +3202,16 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
                strcpy(old_floor_name, floor_name);
 
                if (levels == 1) {
-                       /** Begin inner box */
-                       stresc(boxtitle, 256, floor_name, 1, 0);
-                       svprintf(HKEY("BOXTITLE"), WCS_STRING, boxtitle);
-                       do_template("beginbox");
+                       StrBuf *Buf;
+                       WCTemplputParams SubTP;
+
+                       Buf = NewStrBufPlain(floor_name, -1);
+                       memset(&SubTP, 0, sizeof(WCTemplputParams));
+                       SubTP.ContextType = CTX_STRBUF;
+                       SubTP.Context = Buf;
+                       DoTemplate(HKEY("beginbox"), NULL, &SubTP);
+                       
+                       FreeStrBuf(&Buf);
                }
 
                oldlevels = levels;
@@ -3162,7 +3249,7 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
                }
        }
        /** End the final inner box */
-       do_template("endbox");
+       do_template("endbox", NULL);
 
        wprintf("</td></tr></table>\n");
 }
@@ -3171,10 +3258,14 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
  * \brief print a floor div???
  * \param which_floordiv name of the floordiv???
  */
-void set_floordiv_expanded(char *which_floordiv) {
-       begin_ajax_response();
-       safestrncpy(WC->floordiv_expanded, which_floordiv, sizeof WC->floordiv_expanded);
-       end_ajax_response();
+void set_floordiv_expanded(void) {
+       wcsession *WCC = WC;
+       StrBuf *FloorDiv;
+       
+       FloorDiv = NewStrBuf();
+       StrBufAppendBuf(FloorDiv, WCC->UrlFragment2, 0);
+       set_preference("floordiv_expanded", FloorDiv, 1);
+       WCC->floordiv_expanded = FloorDiv;
 }
 
 /**
@@ -3222,7 +3313,7 @@ void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
                                "%s</span><br>\n", floordiv_id, floordivtitle);
                        wprintf("<div id=\"%s\" style=\"display:%s\">",
                                floordiv_id,
-                               (!strcasecmp(floordiv_id, WC->floordiv_expanded) ? "block" : "none")
+                               (!strcasecmp(floordiv_id, ChrPtr(WC->floordiv_expanded)) ? "block" : "none")
                        );
                }
 
@@ -3307,9 +3398,9 @@ void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
        }
 
        wprintf("num_drop_targets = %d;\n", num_drop_targets);
-       if ((WC->floordiv_expanded[0] != '\0')&&
-           (WC->floordiv_expanded[1] != '\0')){
-               wprintf("which_div_expanded = '%s';\n", WC->floordiv_expanded);
+       if ((ChrPtr(WC->floordiv_expanded)[0] != '\0')&&
+           (ChrPtr(WC->floordiv_expanded)[1] != '\0')){
+               wprintf("which_div_expanded = '%s';\n", ChrPtr(WC->floordiv_expanded));
        }
 
        wprintf("\">\n");
@@ -3344,7 +3435,7 @@ void burn_folder_cache(time_t age)
  * \param viewpref the view preferences???
  */
 
-void list_all_rooms_by_floor(char *viewpref) {
+void list_all_rooms_by_floor(const char *viewpref) {
        char buf[SIZ];
        int swap = 0;
        struct folder *fold = NULL;
@@ -3354,10 +3445,10 @@ void list_all_rooms_by_floor(char *viewpref) {
        int *floor_mapping;
        int IDMax;
        int i, j;
+       int ShowEmptyFloors;
        int ra_flags = 0;
        int flags = 0;
        int num_floors = 1;     /** add an extra one for private folders */
-       char buf2[SIZ];
        char buf3[SIZ];
        
        /** If our cached folder list is very old, burn it. */
@@ -3406,8 +3497,8 @@ void list_all_rooms_by_floor(char *viewpref) {
                floor_mapping[fold[i].floor]=i;
        
        /** refresh the messages index for this room */
-//     serv_puts("GOTO ");
-//     while (serv_getln(buf, sizeof buf), strcmp(buf, "000"));
+/* TODO        serv_puts("GOTO ");
+   while (serv_getln(buf, sizeof buf), strcmp(buf, "000")); */
        /** Now add rooms */
        serv_puts("LKRA");
        serv_getln(buf, sizeof buf);
@@ -3447,8 +3538,8 @@ void list_all_rooms_by_floor(char *viewpref) {
        /*
         * Remove any floors that don't have rooms
         */
-       get_preference("emptyfloors", buf2, sizeof buf2);
-       if (buf2[0]==0 || (strcasecmp(buf2, "no") == 0))
+       get_pref_yesno("emptyfloors", &ShowEmptyFloors, 0);
+       if (ShowEmptyFloors)
        {
                for (i=0; i<num_floors; i++)
                {
@@ -3523,35 +3614,41 @@ void list_all_rooms_by_floor(char *viewpref) {
  */
 void knrooms(void)
 {
-       char listviewpref[SIZ];
+       StrBuf *ListView = NULL;
 
        output_headers(1, 1, 2, 0, 0, 0);
 
        /** Determine whether the user is trying to change views */
-       if (bstr("view") != NULL) {
-               if (havebstr("view")) {
-                       set_preference("roomlistview", bstr("view"), 1);
+       if (havebstr("view")) {
+               ListView = NewStrBufPlain(bstr("view"), -1);
+               set_preference("roomlistview", ListView, 1);
+       }
+       /** Sanitize the input so its safe */
+       if(!get_preference("roomlistview", &ListView) ||
+          ((strcasecmp(ChrPtr(ListView), "folders") != 0) &&
+           (strcasecmp(ChrPtr(ListView), "table") != 0))) 
+       {
+               if (ListView == NULL) {
+                       ListView = NewStrBufPlain("rooms", sizeof("rooms") - 1);
+                       set_preference("roomlistview", ListView, 0);
+               }
+               else {
+                       StrBufPrintf(ListView, "rooms");
+                       save_preferences();
                }
-       }
-
-       get_preference("roomlistview", listviewpref, sizeof listviewpref);
-
-       if ( (strcasecmp(listviewpref, "folders"))
-          && (strcasecmp(listviewpref, "table")) ) {
-               strcpy(listviewpref, "rooms");
        }
 
        /** title bar */
        wprintf("<div id=\"banner\">\n");
        wprintf("<div class=\"room_banner\">");
        wprintf("<h1>");
-       if (!strcasecmp(listviewpref, "rooms")) {
+       if (!strcasecmp(ChrPtr(ListView), "rooms")) {
                wprintf(_("Room list"));
        }
-       if (!strcasecmp(listviewpref, "folders")) {
+       else if (!strcasecmp(ChrPtr(ListView), "folders")) {
                wprintf(_("Folder list"));
        }
-       if (!strcasecmp(listviewpref, "table")) {
+       else if (!strcasecmp(ChrPtr(ListView), "table")) {
                wprintf(_("Room list"));
        }
        wprintf("</h1></div>\n");
@@ -3559,7 +3656,7 @@ void knrooms(void)
        /** offer the ability to switch views */
        wprintf("<ul class=\"room_actions\">\n");
        wprintf("<li class=\"start_page\">");
-       offer_start_page();
+       offer_start_page(NULL, &NoCtx);
        wprintf("</li>");
        wprintf("<li><form name=\"roomlistomatic\">\n"
                "<select name=\"newview\" size=\"1\" "
@@ -3569,13 +3666,13 @@ void knrooms(void)
        wprintf("<option %s value=\"knrooms&view=rooms\">"
                "View as room list"
                "</option>\n",
-               ( !strcasecmp(listviewpref, "rooms") ? "SELECTED" : "" )
+               ( !strcasecmp(ChrPtr(ListView), "rooms") ? "SELECTED" : "" )
        );
 
        wprintf("<option %s value=\"knrooms&view=folders\">"
                "View as folder list"
                "</option>\n",
-               ( !strcasecmp(listviewpref, "folders") ? "SELECTED" : "" )
+               ( !strcasecmp(ChrPtr(ListView), "folders") ? "SELECTED" : "" )
        );
 
        wprintf("</select>");
@@ -3585,7 +3682,7 @@ void knrooms(void)
        wprintf("<div id=\"content\" class=\"service\">\n");
 
        /** Display the room list in the user's preferred format */
-       list_all_rooms_by_floor(listviewpref);
+       list_all_rooms_by_floor(ChrPtr(ListView));
        wDumpContent(1);
 }
 
@@ -3610,7 +3707,7 @@ void set_room_policy(void) {
 
        if (WC->axlevel >= 6) {
                strcat(WC->ImportantMessage, "<br />\n");
-               serv_printf("SPEX floor|%d|%d", ibstr("floorpolicy"), bstr("floorvalue"));
+               serv_printf("SPEX floor|%d|%d", ibstr("floorpolicy"), ibstr("floorvalue"));
                serv_getln(buf, sizeof buf);
                strcat(WC->ImportantMessage, &buf[4]);
        }
@@ -3618,4 +3715,231 @@ void set_room_policy(void) {
        display_editroom();
 }
 
+
+void tmplput_RoomName(StrBuf *Target, WCTemplputParams *TP)
+{
+       StrBufAppendTemplate(Target, TP, WC->wc_roomname, 0);
+}
+
+void _gotonext(void) { slrp_highest(); gotonext(); }
+void dotskip(void) {smart_goto(sbstr("room"));}
+void _display_private(void) { display_private("", 0); }
+void dotgoto(void) {
+       if (WC->wc_view != VIEW_MAILBOX) {      /* dotgoto acts like dotskip when we're in a mailbox view */
+               slrp_highest();
+       }
+       smart_goto(sbstr("room"));
+}
+
+void tmplput_roombanner(StrBuf *Target, WCTemplputParams *TP)
+{
+       wprintf("<div id=\"banner\">\n");
+       embed_room_banner(NULL, navbar_default);
+       wprintf("</div>\n");
+}
+
+
+void tmplput_ungoto(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+
+       if ((WCC!=NULL) && 
+           (!IsEmptyStr(WCC->ugname)))
+               StrBufAppendBufPlain(Target, WCC->ugname, -1, 0);
+}
+
+
+int ConditionalHaveUngoto(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) && 
+               (!IsEmptyStr(WCC->ugname)) && 
+               (strcasecmp(WCC->ugname, ChrPtr(WCC->wc_roomname)) == 0));
+}
+
+int ConditionalRoomHas_QR_PERMANENT(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_PERMANENT) != 0));
+}
+
+int ConditionalRoomHas_QR_INUSE(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_INUSE) != 0));
+}
+
+int ConditionalRoomHas_QR_PRIVATE(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_PRIVATE) != 0));
+}
+
+int ConditionalRoomHas_QR_PASSWORDED(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_PASSWORDED) != 0));
+}
+
+int ConditionalRoomHas_QR_GUESSNAME(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_GUESSNAME) != 0));
+}
+
+int ConditionalRoomHas_QR_DIRECTORY(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_DIRECTORY) != 0));
+}
+
+int ConditionalRoomHas_QR_UPLOAD(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_UPLOAD) != 0));
+}
+
+int ConditionalRoomHas_QR_DOWNLOAD(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_DOWNLOAD) != 0));
+}
+
+int ConditionalRoomHas_QR_VISDIR(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_VISDIR) != 0));
+}
+
+int ConditionalRoomHas_QR_ANONONLY(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_ANONONLY) != 0));
+}
+
+int ConditionalRoomHas_QR_ANONOPT(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_ANONOPT) != 0));
+}
+
+int ConditionalRoomHas_QR_NETWORK(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_NETWORK) != 0));
+}
+
+int ConditionalRoomHas_QR_PREFONLY(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_PREFONLY) != 0));
+}
+
+int ConditionalRoomHas_QR_READONLY(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_READONLY) != 0));
+}
+
+int ConditionalRoomHas_QR_MAILBOX(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_MAILBOX) != 0));
+}
+
+
+int ConditionalHaveRoomeditRights(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+
+       return ( (WCC!= NULL) && 
+                ((WCC->axlevel >= 6) || 
+                 (WCC->is_room_aide) || 
+                 (WCC->is_mailbox) ));
+}
+
+void 
+InitModule_ROOMOPS
+(void)
+{
+       RegisterNamespace("ROOMNAME", 0, 1, tmplput_RoomName, 0);
+
+       WebcitAddUrlHandler(HKEY("knrooms"), knrooms, 0);
+       WebcitAddUrlHandler(HKEY("gotonext"), _gotonext, NEED_URL);
+       WebcitAddUrlHandler(HKEY("skip"), gotonext, NEED_URL);
+       WebcitAddUrlHandler(HKEY("ungoto"), ungoto, NEED_URL);
+       WebcitAddUrlHandler(HKEY("dotgoto"), dotgoto, NEED_URL);
+       WebcitAddUrlHandler(HKEY("dotskip"), dotskip, NEED_URL);
+       WebcitAddUrlHandler(HKEY("display_private"), _display_private, 0);
+       WebcitAddUrlHandler(HKEY("goto_private"), goto_private, NEED_URL);
+       WebcitAddUrlHandler(HKEY("zapped_list"), zapped_list, 0);
+       WebcitAddUrlHandler(HKEY("display_zap"), display_zap, 0);
+       WebcitAddUrlHandler(HKEY("zap"), zap, 0);
+       WebcitAddUrlHandler(HKEY("display_entroom"), display_entroom, 0);
+       WebcitAddUrlHandler(HKEY("entroom"), entroom, 0);
+       WebcitAddUrlHandler(HKEY("display_whok"), display_whok, 0);
+       WebcitAddUrlHandler(HKEY("do_invt_kick"), do_invt_kick, 0);
+       WebcitAddUrlHandler(HKEY("display_editroom"), display_editroom, 0);
+       WebcitAddUrlHandler(HKEY("netedit"), netedit, 0);
+       WebcitAddUrlHandler(HKEY("editroom"), editroom, 0);
+       WebcitAddUrlHandler(HKEY("delete_room"), delete_room, 0);
+       WebcitAddUrlHandler(HKEY("set_room_policy"), set_room_policy, 0);
+       WebcitAddUrlHandler(HKEY("set_floordiv_expanded"), set_floordiv_expanded, NEED_URL|AJAX);
+       WebcitAddUrlHandler(HKEY("changeview"), change_view, 0);
+       WebcitAddUrlHandler(HKEY("toggle_self_service"), toggle_self_service, 0);
+       RegisterNamespace("ROOMBANNER", 0, 1, tmplput_roombanner, 0);
+
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_PERMANENT"), 0, ConditionalRoomHas_QR_PERMANENT, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_INUSE"), 0, ConditionalRoomHas_QR_INUSE, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_PRIVATE"), 0, ConditionalRoomHas_QR_PRIVATE, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_PASSWORDED"), 0, ConditionalRoomHas_QR_PASSWORDED, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_GUESSNAME"), 0, ConditionalRoomHas_QR_GUESSNAME, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_DIRECTORY"), 0, ConditionalRoomHas_QR_DIRECTORY, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_UPLOAD"), 0, ConditionalRoomHas_QR_UPLOAD, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_DOWNLOAD"), 0, ConditionalRoomHas_QR_DOWNLOAD, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_VISIDIR"), 0, ConditionalRoomHas_QR_VISDIR, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_ANONONLY"), 0, ConditionalRoomHas_QR_ANONONLY, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_ANONOPT"), 0, ConditionalRoomHas_QR_ANONOPT, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_NETWORK"), 0, ConditionalRoomHas_QR_NETWORK, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_PREFONLY"), 0, ConditionalRoomHas_QR_PREFONLY, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_READONLY"), 0, ConditionalRoomHas_QR_READONLY, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_MAILBOX"), 0, ConditionalRoomHas_QR_MAILBOX, CTX_NONE);
+
+       RegisterConditional(HKEY("COND:UNGOTO"), 0, ConditionalHaveUngoto, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:EDITACCESS"), 0, ConditionalHaveRoomeditRights, CTX_NONE);
+
+       RegisterNamespace("ROOM:UNGOTO", 0, 0, tmplput_ungoto, 0);
+}
+
 /*@}*/