* add New Tokens & conditionals for extended room attributes:
[citadel.git] / webcit / roomops.c
index 63ec7a0da39daea015677729f3f9b618fcc7a296..4dbab03224fad5fecb02ca67e4858a6fb5b885c1 100644 (file)
@@ -15,23 +15,8 @@ char *viewdefs[9];                   /* the different kinds of available views */
  * Basically we pull LFLR/LKRA etc. and set up a room HashList with these keys.
  */
 
-#define FLOOR_PARAM_LEN 3
-const ConstStr FLOOR_PARAM_NAMES[] = {{HKEY("ID")},
-                                     {HKEY("NAME")}, 
-                                     {HKEY("ROOMS")}};
-
-#define ROOM_PARAM_LEN 8
-const ConstStr ROOM_PARAM_NAMES[] = {{HKEY("NAME")},
-                                    {HKEY("FLAG")},
-                                    {HKEY("FLOOR")},
-                                    {HKEY("LISTORDER")},
-                                    {HKEY("ACL")},
-                                    {HKEY("CURVIEW")},
-                                    {HKEY("DEFVIEW")},
-                                    {HKEY("LASTCHANGE")}};
-
-
 void display_whok(void);
+int ConditionalHaveRoomeditRights(StrBuf *Target, WCTemplputParams *TP);
 
 /*
  * Initialize the viewdefs with localized strings
@@ -54,22 +39,16 @@ void initialize_viewdefs(void) {
 int is_view_allowed_as_default(int which_view)
 {
        switch(which_view) {
-       case VIEW_BBS:          return(1);
-       case VIEW_MAILBOX:      return(1);
-       case VIEW_ADDRESSBOOK:  return(1);
-       case VIEW_CALENDAR:     return(1);
-       case VIEW_TASKS:        return(1);
-       case VIEW_NOTES:        return(1);
-
-#ifdef TECH_PREVIEW
-       case VIEW_WIKI:         return(1);
-#else /* TECH_PREVIEW */
-       case VIEW_WIKI:         return(0);      /* because it isn't finished yet */
-#endif /* TECH_PREVIEW */
-
-       case VIEW_CALBRIEF:     return(0);
-       case VIEW_JOURNAL:      return(0);
-       default:                return(0);      /* should never get here */
+               case VIEW_BBS:          return(1);
+               case VIEW_MAILBOX:      return(1);
+               case VIEW_ADDRESSBOOK:  return(1);
+               case VIEW_CALENDAR:     return(1);
+               case VIEW_TASKS:        return(1);
+               case VIEW_NOTES:        return(1);
+               case VIEW_WIKI:         return(1);
+               case VIEW_CALBRIEF:     return(0);
+               case VIEW_JOURNAL:      return(0);
+               default:                return(0);      /* should never get here */
        }
 }
 
@@ -102,52 +81,6 @@ void load_floorlist(StrBuf *Buf)
 }
 
 
-/*
- * Free a session's march list
- */
-void free_march_list(wcsession *wcf)
-{
-       struct march *mptr;
-
-       while (wcf->march != NULL) {
-               mptr = wcf->march->next;
-               free(wcf->march);
-               wcf->march = mptr;
-       }
-
-}
-
-
-
-/*
- * remove a room from the march list
- */
-void remove_march(const StrBuf *aaa)
-{
-       struct march *mptr, *mptr2;
-
-       if (WC->march == NULL)
-               return;
-
-       if (!strcasecmp(WC->march->march_name, ChrPtr(aaa))) {
-               mptr = WC->march->next;
-               free(WC->march);
-               WC->march = mptr;
-               return;
-       }
-       mptr2 = WC->march;
-       for (mptr = WC->march; mptr != NULL; mptr = mptr->next) {
-               if (!strcasecmp(mptr->march_name, ChrPtr(aaa))) {
-                       mptr2->next = mptr->next;
-                       free(mptr);
-                       mptr = mptr2;
-               } else {
-                       mptr2 = mptr;
-               }
-       }
-}
-
-
 
 
 /*
@@ -167,20 +100,20 @@ void room_tree_list(struct roomlisting *rp)
        strcpy(rmname, rp->rlname);
        f = rp->rlflags;
 
-       wprintf("<a href=\"dotgoto?room=");
+       wc_printf("<a href=\"dotgoto?room=");
        urlescputs(rmname);
-       wprintf("\"");
-       wprintf(">");
+       wc_printf("\"");
+       wc_printf(">");
        escputs1(rmname, 1, 1);
        if ((f & QR_DIRECTORY) && (f & QR_NETWORK))
-               wprintf("}");
+               wc_printf("}");
        else if (f & QR_DIRECTORY)
-               wprintf("]");
+               wc_printf("]");
        else if (f & QR_NETWORK)
-               wprintf(")");
+               wc_printf(")");
        else
-               wprintf("&gt;");
-       wprintf("</a><tt> </tt>\n");
+               wc_printf("&gt;");
+       wc_printf("</a><tt> </tt>\n");
 
        room_tree_list(rp->rnext);
        free(rp);
@@ -226,7 +159,7 @@ void listrms(char *variety)
        serv_puts(variety);
        serv_getln(buf, sizeof buf);
        if (buf[0] != '1') {
-               wprintf("&nbsp;");
+               wc_printf("&nbsp;");
                return;
        }
 
@@ -269,7 +202,7 @@ void listrms(char *variety)
         * If no rooms were listed, print an nbsp to make the cell
         * borders show up anyway.
         */
-       if (num_rooms == 0) wprintf("&nbsp;");
+       if (num_rooms == 0) wc_printf("&nbsp;");
 }
 
 
@@ -292,8 +225,8 @@ void zapped_list(void)
 
        listrms("LZRM -1");
 
-       wprintf("<br /><br />\n");
-       wprintf(_("Click on any room to un-zap it and goto that room.\n"));
+       wc_printf("<br /><br />\n");
+       wc_printf(_("Click on any room to un-zap it and goto that room.\n"));
        do_template("endbox", NULL);
        wDumpContent(1);
 }
@@ -323,22 +256,22 @@ void readinfo(StrBuf *Target, WCTemplputParams *TP)
                safestrncpy(briefinfo, fullinfo, sizeof briefinfo);
                strcpy(&briefinfo[50], "...");
 
-                wprintf("<div class=\"infos\" "
+                wc_printf("<div class=\"infos\" "
                        "onclick=\"javascript:Effect.Appear('room_infos', { duration: 0.5 });\" "
                        ">"
                );
                escputs(briefinfo);
-                wprintf("</div><div id=\"room_infos\" style=\"display:none;\">");
-               wprintf("<img class=\"close_infos\" "
+                wc_printf("</div><div id=\"room_infos\" style=\"display:none;\">");
+               wc_printf("<img class=\"close_infos\" "
                        "onclick=\"javascript:Effect.Fade('room_infos', { duration: 0.5 });\" "
                        "src=\"static/closewindow.gif\" alt=\"%s\"  width=\"16\" height=\"16\">",
                        _("Close window")
                );
                escputs(fullinfo);
-                wprintf("</div>");
+                wc_printf("</div>");
        }
        else {
-               wprintf("&nbsp;");
+               wc_printf("&nbsp;");
        }
 }
 
@@ -357,44 +290,44 @@ void embed_room_graphic(StrBuf *Target, WCTemplputParams *TP)
        serv_puts("OIMG _roompic_");
        serv_getln(buf, sizeof buf);
        if (buf[0] == '2') {
-               wprintf("<img height=\"64px\" src=\"image?name=_roompic_&room=");
-               urlescputs(ChrPtr(WC->wc_roomname));
-               wprintf("\">");
+               wc_printf("<img height=\"64px\" src=\"image?name=_roompic_&room=");
+               urlescputs(ChrPtr(WC->CurRoom.name));
+               wc_printf("\">");
                serv_puts("CLOS");
                serv_getln(buf, sizeof buf);
        }
-       else if (WC->wc_view == VIEW_ADDRESSBOOK) {
-               wprintf("<img class=\"roompic\" alt=\"\" src=\""
+       else if (WC->CurRoom.view == VIEW_ADDRESSBOOK) {
+               wc_printf("<img class=\"roompic\" alt=\"\" src=\""
                        "static/viewcontacts_48x.gif"
                        "\" >"
                        );
        }
-       else if ( (WC->wc_view == VIEW_CALENDAR) || (WC->wc_view == VIEW_CALBRIEF) ) {
-               wprintf("<img class=\"roompic\" alt=\"\" src=\""
+       else if ( (WC->CurRoom.view == VIEW_CALENDAR) || (WC->CurRoom.view == VIEW_CALBRIEF) ) {
+               wc_printf("<img class=\"roompic\" alt=\"\" src=\""
                        "static/calarea_48x.gif"
                        "\" width=\"48\" height=\"48\">"
                        );
        }
-       else if (WC->wc_view == VIEW_TASKS) {
-               wprintf("<img class=\"roompic\" alt=\"\" src=\""
+       else if (WC->CurRoom.view == VIEW_TASKS) {
+               wc_printf("<img class=\"roompic\" alt=\"\" src=\""
                        "static/taskmanag_48x.gif"
                        "\" width=\"48\" height=\"48\">"
                        );
        }
-       else if (WC->wc_view == VIEW_NOTES) {
-               wprintf("<img class=\"roompic\" alt=\"\" src=\""
+       else if (WC->CurRoom.view == VIEW_NOTES) {
+               wc_printf("<img class=\"roompic\" alt=\"\" src=\""
                        "static/storenotes_48x.gif"
                        "\" width=\"48\" height=\"48\">"
                        );
        }
-       else if (WC->wc_view == VIEW_MAILBOX) {
-               wprintf("<img class=\"roompic\" alt=\"\" src=\""
+       else if (WC->CurRoom.view == VIEW_MAILBOX) {
+               wc_printf("<img class=\"roompic\" alt=\"\" src=\""
                        "static/privatemess_48x.gif"
                        "\" width=\"48\" height=\"48\">"
                        );
        }
        else {
-               wprintf("<img class=\"roompic\" alt=\"\" src=\""
+               wc_printf("<img class=\"roompic\" alt=\"\" src=\""
                        "static/chatrooms_48x.gif"
                        "\" width=\"48\" height=\"48\">"
                        );
@@ -411,11 +344,11 @@ 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=\"%d\">\n", WC->nonce);
-       wprintf("<label for=\"view_name\">");
-       wprintf(_("View as:"));
-       wprintf("</label> "
+       wc_printf("<form name=\"viewomatic\" action=\"changeview\">\n");
+       wc_printf("\t<div style=\"display: inline;\">\n\t<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+       wc_printf("<label for=\"view_name\">");
+       wc_printf(_("View as:"));
+       wc_printf("</label> "
                "<select name=\"newview\" size=\"1\" "
                "id=\"view_name\" class=\"selectbox\" "
                "OnChange=\"location.href=viewomatic.newview.options"
@@ -428,21 +361,21 @@ void embed_view_o_matic(StrBuf *Target, WCTemplputParams *TP)
                 * view in a non-Calendar room.
                 */
                if (
-                       (i == WC->wc_view)
-                       ||      (i == WC->wc_default_view)                      /* default */
-                       ||      ( (i == 0) && (WC->wc_default_view == 1) )      /* mail or bulletin */
-                       ||      ( (i == 1) && (WC->wc_default_view == 0) )      /* mail or bulletin */
-                       /* ||   ( (i == 7) && (WC->wc_default_view == 3) )      (calendar list temporarily disabled) */
+                       (i == WC->CurRoom.view)
+                       ||      (i == WC->CurRoom.defview)                      /* default */
+                       ||      ( (i == 0) && (WC->CurRoom.defview == 1) )      /* mail or bulletin */
+                       ||      ( (i == 1) && (WC->CurRoom.defview == 0) )      /* mail or bulletin */
+                       /* ||   ( (i == 7) && (WC->CurRoom.defview == 3) )      (calendar list temporarily disabled) */
                        ) {
 
-                       wprintf("<option %s value=\"changeview?view=%d\">",
-                               ((i == WC->wc_view) ? "selected" : ""),
+                       wc_printf("<option %s value=\"changeview?view=%d\">",
+                               ((i == WC->CurRoom.view) ? "selected" : ""),
                                i );
                        escputs(viewdefs[i]);
-                       wprintf("</option>\n");
+                       wc_printf("</option>\n");
                }
        }
-       wprintf("</select></div></form>\n");
+       wc_printf("</select></div></form>\n");
 }
 
 
@@ -451,15 +384,15 @@ void embed_view_o_matic(StrBuf *Target, WCTemplputParams *TP)
  */
 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=\"%d\">\n", WC->nonce);
-       wprintf("<label for=\"srchquery\">");
-       wprintf(_("Search: "));
-       wprintf("</label><input ");
-       wprintf("%s", WC->serv_info->serv_fulltext_enabled ? "" : "disabled ");
-       wprintf("type=\"text\" name=\"query\" id=\"srchquery\" size=\"15\" maxlength=\"128\" class=\"inputbox\">\n"
+       wc_printf("<form name=\"searchomatic\" action=\"do_search\">\n");
+       wc_printf("<div style=\"display: inline;\"><input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+       wc_printf("<label for=\"srchquery\">");
+       wc_printf(_("Search: "));
+       wc_printf("</label><input ");
+       wc_printf("%s", WC->serv_info->serv_fulltext_enabled ? "" : "disabled ");
+       wc_printf("type=\"text\" name=\"query\" id=\"srchquery\" size=\"15\" maxlength=\"128\" class=\"inputbox\">\n"
                );
-       wprintf("</div></form>\n");
+       wc_printf("</div></form>\n");
 }
 
 
@@ -485,16 +418,16 @@ void embed_room_banner(char *got, int navbar_style) {
        if (got == NULL) {
                memset(buf, '0', 20);
                buf[20] = '\0';
-               serv_printf("GOTO %s", ChrPtr(WC->wc_roomname));
+               serv_printf("GOTO %s", ChrPtr(WC->CurRoom.name));
                serv_getln(buf, sizeof buf);
                got = buf;
        }
 
        /* The browser needs some information for its own use */
-       wprintf("<script type=\"text/javascript\">      \n"
-               "       room_is_trash = %d;             \n"
-               "</script>\n",
-               WC->wc_is_trash
+       wc_printf("<script type=\"text/javascript\">    \n"
+                 "     room_is_trash = %d;             \n"
+                 "</script>\n",
+                 ((WC->CurRoom.RAFlags & UA_ISTRASH) != 0)
        );
 
        /*
@@ -507,15 +440,15 @@ void embed_room_banner(char *got, int navbar_style) {
        }
        StrBufPrintf(WCC->Hdr->this_page, 
                     "dotskip?room=%s",
-                    ChrPtr(WC->wc_roomname)
+                    ChrPtr(WC->CurRoom.name)
        );
 
        /* Check for new mail. */
        WC->new_mail = extract_int(&got[4], 9);
-       WC->wc_view = extract_int(&got[4], 11);
+       WC->CurRoom.view = extract_int(&got[4], 11);
 
        /* Is this a directory room and does it contain files and how many? */
-       if ((WC->room_flags & QR_DIRECTORY) && (WC->room_flags & QR_VISDIR))
+       if ((WC->CurRoom.QRFlags & QR_DIRECTORY) && (WC->CurRoom.QRFlags & QR_VISDIR))
        {
                serv_puts("RDIR");
                serv_getln(buf2, sizeof buf2);
@@ -543,11 +476,11 @@ void embed_room_banner(char *got, int navbar_style) {
  
        do_template("roombanner", NULL);
        /* roombanner contains this for mobile */
-       if (navbar_style != navbar_none && !WC->is_mobile) { 
+       if (navbar_style != navbar_none && (WC->is_mobile < 1)) { 
 
-               wprintf("<div id=\"navbar\"><ul>");
+               wc_printf("<div id=\"navbar\"><ul>");
 
-               if (navbar_style == navbar_default) wprintf(
+               if (navbar_style == navbar_default) wc_printf(
                        "<li class=\"ungoto\">"
                        "<a href=\"ungoto\">"
                        "<img src=\"static/ungoto2_24x.gif\" alt=\"\" width=\"24\" height=\"24\">"
@@ -555,8 +488,8 @@ void embed_room_banner(char *got, int navbar_style) {
                        "</li>\n", _("Ungoto")
                        );
 
-               if ( (navbar_style == navbar_default) && (WC->wc_view == VIEW_BBS) ) {
-                       wprintf(
+               if ( (navbar_style == navbar_default) && (WC->CurRoom.view == VIEW_BBS) ) {
+                       wc_printf(
                                "<li class=\"newmess\">"
                                "<a href=\"readnew\">"
                                "<img src=\"static/newmess2_24x.gif\" alt=\"\" width=\"24\" height=\"24\">"
@@ -566,9 +499,9 @@ void embed_room_banner(char *got, int navbar_style) {
                }
 
                if (navbar_style == navbar_default) {
-                       switch(WC->wc_view) {
+                       switch(WC->CurRoom.view) {
                        case VIEW_ADDRESSBOOK:
-                               wprintf(
+                               wc_printf(
                                        "<li class=\"viewcontacts\">"
                                        "<a href=\"readfwd\">"
                                        "<img src=\"static/viewcontacts_24x.gif\" "
@@ -579,7 +512,7 @@ void embed_room_banner(char *got, int navbar_style) {
                                        );
                                break;
                        case VIEW_CALENDAR:
-                               wprintf(
+                               wc_printf(
                                        "<li class=\"staskday\">"
                                        "<a href=\"readfwd?calview=day\">"
                                        "<img src=\"static/taskday2_24x.gif\" "
@@ -588,7 +521,7 @@ void embed_room_banner(char *got, int navbar_style) {
                                        "%s"
                                        "</span></a></li>\n", _("Day view")
                                        );
-                               wprintf(
+                               wc_printf(
                                        "<li class=\"monthview\">"
                                        "<a href=\"readfwd?calview=month\">"
                                        "<img src=\"static/monthview2_24x.gif\" "
@@ -599,7 +532,7 @@ void embed_room_banner(char *got, int navbar_style) {
                                        );
                                break;
                        case VIEW_CALBRIEF:
-                               wprintf(
+                               wc_printf(
                                        "<li class=\"monthview\">"
                                        "<a href=\"readfwd?calview=month\">"
                                        "<img src=\"static/monthview2_24x.gif\" "
@@ -610,7 +543,7 @@ void embed_room_banner(char *got, int navbar_style) {
                                        );
                                break;
                        case VIEW_TASKS:
-                               wprintf(
+                               wc_printf(
                                        "<li class=\"taskmanag\">"
                                        "<a href=\"readfwd\">"
                                        "<img src=\"static/taskmanag_24x.gif\" "
@@ -621,7 +554,7 @@ void embed_room_banner(char *got, int navbar_style) {
                                        );
                                break;
                        case VIEW_NOTES:
-                               wprintf(
+                               wc_printf(
                                        "<li class=\"viewnotes\">"
                                        "<a href=\"readfwd\">"
                                        "<img src=\"static/viewnotes_24x.gif\" "
@@ -632,7 +565,7 @@ void embed_room_banner(char *got, int navbar_style) {
                                        );
                                break;
                        case VIEW_MAILBOX:
-                               wprintf(
+                               wc_printf(
                                        "<li class=\"readallmess\">"
                                        "<a id=\"m_refresh\" href=\"readfwd\">"
                                        "<img src=\"static/readallmess3_24x.gif\" "
@@ -643,9 +576,9 @@ void embed_room_banner(char *got, int navbar_style) {
                                        );
                                break;
                        case VIEW_WIKI:
-                               wprintf(
+                               wc_printf(
                                        "<li class=\"readallmess\">"
-                                       "<a href=\"readfwd\">"
+                                       "<a href=\"wiki?page=home\">"
                                        "<img src=\"static/readallmess3_24x.gif\" "
                                        "alt=\"\" width=\"24\" height=\"24\">"
                                        "<span class=\"navbar_link\">"
@@ -654,7 +587,7 @@ void embed_room_banner(char *got, int navbar_style) {
                                        );
                                break;
                        default:
-                               wprintf(
+                               wc_printf(
                                        "<li class=\"readallmess\">"
                                        "<a href=\"readfwd\">"
                                        "<img src=\"static/readallmess3_24x.gif\" "
@@ -668,9 +601,9 @@ void embed_room_banner(char *got, int navbar_style) {
                }
 
                if (navbar_style == navbar_default) {
-                       switch(WC->wc_view) {
+                       switch(WC->CurRoom.view) {
                        case VIEW_ADDRESSBOOK:
-                               wprintf(
+                               wc_printf(
                                        "<li class=\"addnewcontact\">"
                                        "<a href=\"display_enter\">"
                                        "<img src=\"static/addnewcontact_24x.gif\" "
@@ -682,11 +615,11 @@ void embed_room_banner(char *got, int navbar_style) {
                                break;
                        case VIEW_CALENDAR:
                        case VIEW_CALBRIEF:
-                               wprintf("<li class=\"addevent\"><a href=\"display_enter");
-                               if (havebstr("year" )) wprintf("?year=%s", bstr("year"));
-                               if (havebstr("month")) wprintf("?month=%s", bstr("month"));
-                               if (havebstr("day"  )) wprintf("?day=%s", bstr("day"));
-                               wprintf("\">"
+                               wc_printf("<li class=\"addevent\"><a href=\"display_enter");
+                               if (havebstr("year" )) wc_printf("?year=%s", bstr("year"));
+                               if (havebstr("month")) wc_printf("?month=%s", bstr("month"));
+                               if (havebstr("day"  )) wc_printf("?day=%s", bstr("day"));
+                               wc_printf("\">"
                                        "<img  src=\"static/addevent_24x.gif\" "
                                        "alt=\"\" width=\"24\" height=\"24\">"
                                        "<span class=\"navbar_link\">"
@@ -695,7 +628,7 @@ void embed_room_banner(char *got, int navbar_style) {
                                        );
                                break;
                        case VIEW_TASKS:
-                               wprintf(
+                               wc_printf(
                                        "<li class=\"newmess\">"
                                        "<a href=\"display_enter\">"
                                        "<img  src=\"static/newmess3_24x.gif\" "
@@ -706,7 +639,7 @@ void embed_room_banner(char *got, int navbar_style) {
                                        );
                                break;
                        case VIEW_NOTES:
-                               wprintf(
+                               wc_printf(
                                        "<li class=\"enternewnote\">"
                                        "<a href=\"add_new_note\">"
                                        "<img  src=\"static/enternewnote_24x.gif\" "
@@ -718,19 +651,47 @@ void embed_room_banner(char *got, int navbar_style) {
                                break;
                        case VIEW_WIKI:
                                safestrncpy(buf, bstr("page"), sizeof buf);
+                               if (IsEmptyStr(buf)) {
+                                       safestrncpy(buf, "home", sizeof buf);
+                               }
                                str_wiki_index(buf);
-                               wprintf(
+                               wc_printf(
                                        "<li class=\"newmess\">"
-                                       "<a href=\"display_enter?wikipage=%s\">"
+                                       "<a href=\"display_enter?page=%s\">"
                                        "<img  src=\"static/newmess3_24x.gif\" "
                                        "alt=\"\" width=\"24\" height=\"24\">"
                                        "<span class=\"navbar_link\">"
                                        "%s"
                                        "</span></a></li>\n", buf, _("Edit this page")
                                        );
+
+                               if (bmstrcasestr((char *)ChrPtr(WCC->Hdr->HR.ReqLine), "wiki_history")) {
+                                       /* already viewing history; display a link to the current page */
+                                       wc_printf(
+                                               "<li class=\"newmess\">"
+                                               "<a href=\"wiki?page=%s\">"
+                                               "<img  src=\"static/newmess3_24x.gif\" "
+                                               "alt=\"\" width=\"24\" height=\"24\">"
+                                               "<span class=\"navbar_link\">"
+                                               "%s"
+                                               "</span></a></li>\n", buf, _("Current version")
+                                               );
+                               }
+                               else {
+                                       /* display a link to the history */
+                                       wc_printf(
+                                               "<li class=\"newmess\">"
+                                               "<a href=\"wiki_history?page=%s\">"
+                                               "<img  src=\"static/newmess3_24x.gif\" "
+                                               "alt=\"\" width=\"24\" height=\"24\">"
+                                               "<span class=\"navbar_link\">"
+                                               "%s"
+                                               "</span></a></li>\n", buf, _("History")
+                                               );
+                               }
                                break;
                        case VIEW_MAILBOX:
-                               wprintf(
+                               wc_printf(
                                        "<li class=\"newmess\">"
                                        "<a href=\"display_enter\">"
                                        "<img  src=\"static/newmess3_24x.gif\" "
@@ -739,7 +700,7 @@ void embed_room_banner(char *got, int navbar_style) {
                                        "%s"
                                        "</span></a></li>\n", _("Write mail")
                                        );
-                               wprintf(
+                               wc_printf(
                                        "<li class=\"newmess\">"
                                        "<a href=\"javascript:deleteAllSelectedMessages();\">"
                                        "<img  src=\"static/delete.gif\" "
@@ -749,7 +710,7 @@ void embed_room_banner(char *got, int navbar_style) {
                                        );
                                break;
                        default:
-                               wprintf(
+                               wc_printf(
                                        "<li class=\"newmess\">"
                                        "<a href=\"display_enter\">"
                                        "<img  src=\"static/newmess3_24x.gif\" "
@@ -762,7 +723,7 @@ void embed_room_banner(char *got, int navbar_style) {
                        }
                }
 
-               if (navbar_style == navbar_default) wprintf(
+               if (navbar_style == navbar_default) wc_printf(
                        "<li class=\"skipthisroom\">"
                        "<a href=\"skip\" "
                        "title=\"%s\">"
@@ -774,7 +735,7 @@ void embed_room_banner(char *got, int navbar_style) {
                        _("Skip this room")
                        );
 
-               if (navbar_style == navbar_default) wprintf(
+               if (navbar_style == navbar_default) wc_printf(
                        "<li class=\"markngo\">"
                        "<a href=\"gotonext\" "
                        "title=\"%s\">"
@@ -786,7 +747,7 @@ void embed_room_banner(char *got, int navbar_style) {
                        _("Goto next room")
                        );
 
-               wprintf("</ul></div>\n");
+               wc_printf("</ul></div>\n");
        }
 
 }
@@ -797,13 +758,14 @@ void embed_room_banner(char *got, int navbar_style) {
  */
 long gotoroom(const StrBuf *gname)
 {
+       wcsession *WCC = WC;
        StrBuf *Buf;
        static long ls = (-1L);
        long err = 0;
 
        /* store ungoto information */
-       strcpy(WC->ugname, ChrPtr(WC->wc_roomname));
-       WC->uglsn = ls;
+       strcpy(WCC->ugname, ChrPtr(WCC->CurRoom.name));
+       WCC->uglsn = ls;
        Buf = NewStrBuf();
 
        /* move to the new room */
@@ -822,32 +784,9 @@ long gotoroom(const StrBuf *gname)
                        return err;
                }
        }
+       ParseGoto(&WCC->CurRoom, 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 = 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) StrBufExtract_int(Buf, 8, '|');
-
-       remove_march(WC->wc_roomname);
+       remove_march(WCC->CurRoom.name);
        if (!strcasecmp(ChrPtr(gname), "_BASEROOM_"))
                remove_march(gname);
        FreeStrBuf(&Buf);
@@ -856,144 +795,261 @@ long gotoroom(const StrBuf *gname)
 }
 
 
-/**
- * \brief Locate the room on the march list which we most want to go to.  
- * Each room
- * is measured given a "weight" of preference based on various factors.
- * \param desired_floor the room number on the citadel server
- * \return the roomname
- */
-char *pop_march(int desired_floor)
+void ParseGoto(folder *room, StrBuf *Line)
 {
-       static char TheRoom[128];
-       int TheFloor = 0;
-       int TheOrder = 32767;
-       int TheWeight = 0;
-       int weight;
-       struct march *mptr = NULL;
-
-       strcpy(TheRoom, "_BASEROOM_");
-       if (WC->march == NULL)
-               return (TheRoom);
-
-       for (mptr = WC->march; mptr != NULL; mptr = mptr->next) {
-               weight = 0;
-               if ((strcasecmp(mptr->march_name, "_BASEROOM_")))
-                       weight = weight + 10000;
-               if (mptr->march_floor == desired_floor)
-                       weight = weight + 5000;
-
-               weight = weight + ((128 - (mptr->march_floor)) * 128);
-               weight = weight + (128 - (mptr->march_order));
-
-               if (weight > TheWeight) {
-                       TheWeight = weight;
-                       strcpy(TheRoom, mptr->march_name);
-                       TheFloor = mptr->march_floor;
-                       TheOrder = mptr->march_order;
-               }
+       wcsession *WCC = WC;
+       const char *Pos;
+       int flag;
+       void *vFloor = NULL;
+       StrBuf *pBuf;
+
+       if (StrLength(Line) < 4) {
+               return;
        }
-       return (TheRoom);
-}
+       
+       /* ignore the commandstate... */
+       Pos = ChrPtr(Line) + 4;
 
+       if (room->RoomNameParts != NULL)
+       {
+               int i;
+               for (i=0; i < room->nRoomNameParts; i++)
+                       FreeStrBuf(&room->RoomNameParts[i]);
+               free(room->RoomNameParts);
+               room->RoomNameParts = NULL;
+       }
 
+       pBuf = room->name;  
+       if (pBuf == NULL)
+               pBuf = NewStrBufPlain(NULL, StrLength(Line));
+       else
+               FlushStrBuf(pBuf);
+       memset(room, 0, sizeof(folder));
+       room->name = pBuf;
 
-/*
- * Goto next room having unread messages.
- *
- * We want to skip over rooms that the user has already been to, and take the
- * user back to the lobby when done.  The room we end up in is placed in
- * newroom - which is set to 0 (the lobby) initially.
- * We start the search in the current room rather than the beginning to prevent
- * two or more concurrent users from dragging each other back to the same room.
- */
-void gotonext(void)
-{
-       char buf[256];
-       struct march *mptr = NULL;
-       struct march *mptr2 = NULL;
-       char room_name[128];
-       StrBuf *next_room;
-       int ELoop = 0;
+       StrBufExtract_NextToken(room->name, Line, &Pos, '|'); // WC->CurRoom->name
 
-       /*
-        * First check to see if the march-mode list is already allocated.
-        * If it is, pop the first room off the list and go there.
-        */
-       if (havebstr("startmsg")) {
-                readloop(readnew);
-                return;
+       room->nNewMessages = StrBufExtractNext_long(Line, &Pos, '|'); 
+       if (room->nNewMessages > 0)
+               room->RAFlags |= UA_HASNEWMSGS;
+
+       room->nTotalMessages = StrBufExtractNext_long(Line, &Pos, '|');
+
+       room->ShowInfo =  StrBufExtractNext_long(Line, &Pos, '|');
+       
+       room->QRFlags = StrBufExtractNext_long(Line, &Pos, '|'); //CurRoom->QRFlags
+
+       room->HighestRead = StrBufExtractNext_long(Line, &Pos, '|');
+       room->LastMessageRead = StrBufExtractNext_long(Line, &Pos, '|');
+
+       room->is_inbox = StrBufExtractNext_long(Line, &Pos, '|'); // is_mailbox
+
+       flag = StrBufExtractNext_long(Line, &Pos, '|');
+       if (WCC->is_aide || flag) {
+               room->RAFlags |= UA_ADMINALLOWED;
        }
 
-       if (WC->march == NULL) {
-               serv_puts("LKRN");
-               serv_getln(buf, sizeof buf);
-               if (buf[0] == '1')
-                       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-                               if (IsEmptyStr(buf)) {
-                                       if (ELoop > 10000)
-                                               return;
-                                       if (ELoop % 100 == 0)
-                                               sleeeeeeeeeep(1);
-                                       ELoop ++;
-                                       continue;                                       
-                               }
-                               extract_token(room_name, buf, 0, '|', sizeof room_name);
-                               if (strcasecmp(room_name, ChrPtr(WC->wc_roomname))) {
-                                       mptr = (struct march *) malloc(sizeof(struct march));
-                                       mptr->next = NULL;
-                                       safestrncpy(mptr->march_name, room_name, sizeof mptr->march_name);
-                                       mptr->march_floor = extract_int(buf, 2);
-                                       mptr->march_order = extract_int(buf, 3);
-                                       if (WC->march == NULL) 
-                                               WC->march = mptr;
-                                       else 
-                                               mptr2->next = mptr;
-                                       mptr2 = mptr;
-                               }
-                               buf[0] = '\0';
-                       }
-               /*
-                * add _BASEROOM_ to the end of the march list, so the user will end up
-                * in the system base room (usually the Lobby>) at the end of the loop
-                */
-               mptr = (struct march *) malloc(sizeof(struct march));
-               mptr->next = NULL;
-               mptr->march_order = 0;
-               mptr->march_floor = 0;
-               strcpy(mptr->march_name, "_BASEROOM_");
-               if (WC->march == NULL) {
-                       WC->march = mptr;
-               } else {
-                       mptr2 = WC->march;
-                       while (mptr2->next != NULL)
-                               mptr2 = mptr2->next;
-                       mptr2->next = mptr;
+       room->UsersNewMAilboxMessages = StrBufExtractNext_long(Line, &Pos, '|');
+
+       room->floorid = StrBufExtractNext_int(Line, &Pos, '|'); // wc_floor
+
+       room->view = StrBufExtractNext_long(Line, &Pos, '|'); // CurRoom->view
+
+       room->defview = StrBufExtractNext_long(Line, &Pos, '|'); // CurRoom->defview
+
+       flag = StrBufExtractNext_long(Line, &Pos, '|');
+       if (flag)
+               room->RAFlags |= UA_ISTRASH; // wc_is_trash
+
+       room->QRFlags2 = StrBufExtractNext_long(Line, &Pos, '|'); // CurRoom->QRFlags2
+
+       /* find out, whether we are in a sub-room */
+       room->nRoomNameParts = StrBufNum_tokens(room->name, '\\');
+       if (room->nRoomNameParts > 1)
+       {
+               int i;
+               
+               Pos = NULL;
+               room->RoomNameParts = malloc(sizeof(StrBuf*) * (room->nRoomNameParts + 1));
+               memset(room->RoomNameParts, 0, sizeof(StrBuf*) * (room->nRoomNameParts + 1));
+               for (i=0; i < room->nRoomNameParts; i++)
+               {
+                       room->RoomNameParts[i] = NewStrBuf();
+                       StrBufExtract_NextToken(room->RoomNameParts[i],
+                                               room->name, &Pos, '\\');
                }
-               /*
-                * ...and remove the room we're currently in, so a <G>oto doesn't make us
-                * walk around in circles
-                */
-               remove_march(WC->wc_roomname);
        }
-       if (WC->march != NULL) {
-               next_room = NewStrBufPlain(pop_march(-1), -1);/*TODO: migrate march to strbuf */
+
+       /* Private mailboxes on the main floor get remapped to the personal folder */
+       if ((room->QRFlags & QR_MAILBOX) && 
+           (room->floorid == 0))
+       {
+               room->floorid = VIRTUAL_MY_FLOOR;
+               if ((room->nRoomNameParts == 1) && 
+                   (StrLength(room->name) == 4) && 
+                   (strcmp(ChrPtr(room->name), "Mail") == 0))
+               {
+                       room->is_inbox = 1;
+               }
+               
+       }
+       /* get a pointer to the floor we're on: */
+       GetHash(WCC->Floors, IKEY(room->floorid), &vFloor);
+       room->Floor = (const Floor*) vFloor;
+}
+
+void LoadRoomAide(void)
+{
+       wcsession *WCC = WC;
+       StrBuf *Buf;
+       
+       if (WCC->CurRoom.RoomAideLoaded)
+               return;
+
+       WCC->CurRoom.RoomAideLoaded = 1;
+       Buf = NewStrBuf();
+       serv_puts("GETA");
+       StrBuf_ServGetln(Buf);
+       if (GetServerStatus(Buf, NULL) != 2) {
+               FlushStrBuf(WCC->CurRoom.RoomAide);
+               AppendImportantMessage (ChrPtr(Buf) + 4, 
+                                       StrLength(Buf) - 4);
        } else {
-               next_room = NewStrBufPlain(HKEY("_BASEROOM_"));
+               const char *Pos;
+
+               Pos = ChrPtr(Buf) + 4;
+
+               FreeStrBuf(&WCC->CurRoom.RoomAide);
+               WCC->CurRoom.RoomAide = NewStrBufPlain (NULL, StrLength (Buf));
+
+               StrBufExtract_NextToken(WCC->CurRoom.RoomAide, Buf, &Pos, '|'); 
        }
+       FreeStrBuf (&Buf);
+}
+
+void tmplput_CurrentRoomAide(StrBuf *Target, WCTemplputParams *TP) 
+{
+       wcsession *WCC = WC;
 
+       LoadRoomAide();
 
-       smart_goto(next_room);
-       FreeStrBuf(&next_room);
+       StrBufAppendTemplate(Target, TP, WCC->CurRoom.RoomAide, 0);
 }
 
 
+void LoadRoomXA (void)
+{
+       wcsession *WCC = WC;
+       StrBuf *Buf;
+       
+       if (WCC->CurRoom.XALoaded)
+               return;
+
+       WCC->CurRoom.XALoaded = 1;
+       Buf = NewStrBuf();
+       serv_puts("GETA");
+       StrBuf_ServGetln(Buf);
+       if (GetServerStatus(Buf, NULL) != 2) {
+               FlushStrBuf(WCC->CurRoom.XAPass);
+               FlushStrBuf(WCC->CurRoom.Directory);
+
+               AppendImportantMessage (ChrPtr(Buf) + 4, 
+                                       StrLength(Buf) - 4);
+       } else {
+               const char *Pos;
+
+               Pos = ChrPtr(Buf) + 4;
+
+               FreeStrBuf(&WCC->CurRoom.XAPass);
+               FreeStrBuf(&WCC->CurRoom.Directory);
+
+               WCC->CurRoom.XAPass = NewStrBufPlain (NULL, StrLength (Buf));
+               WCC->CurRoom.Directory = NewStrBufPlain (NULL, StrLength (Buf));
+
+               StrBufSkip_NTokenS(Buf, &Pos, '|', 1); /* The Name, we already know... */
+               StrBufExtract_NextToken(WCC->CurRoom.XAPass, Buf, &Pos, '|'); 
+               StrBufExtract_NextToken(WCC->CurRoom.Directory, Buf, &Pos, '|'); 
+               StrBufSkip_NTokenS(Buf, &Pos, '|', 2); /* QRFlags, FloorNum we already know... */
+               WCC->CurRoom.Order = StrBufExtractNext_long(Buf, &Pos, '|');
+               WCC->CurRoom.DefView = StrBufExtractNext_long(Buf, &Pos, '|');
+               /* QR2Flags, we already know them... */
+
+       }
+       FreeStrBuf (&Buf);
+}
+
+void tmplput_CurrentRoomPass(StrBuf *Target, WCTemplputParams *TP) 
+{
+       wcsession *WCC = WC;
+
+       LoadRoomXA();
+
+       StrBufAppendTemplate(Target, TP, WCC->CurRoom.XAPass, 0);
+}
+void tmplput_CurrentRoomDirectory(StrBuf *Target, WCTemplputParams *TP) 
+{
+       wcsession *WCC = WC;
+
+       LoadRoomXA();
+
+       StrBufAppendTemplate(Target, TP, WCC->CurRoom.Directory, 0);
+}
+void tmplput_CurrentRoomOrder(StrBuf *Target, WCTemplputParams *TP) 
+{
+       wcsession *WCC = WC;
+
+       LoadRoomXA();
+
+       StrBufAppendPrintf(Target, "%d", WCC->CurRoom.Order);
+}
+void tmplput_CurrentRoomDefView(StrBuf *Target, WCTemplputParams *TP) 
+{
+       wcsession *WCC = WC;
+
+       LoadRoomXA();
+
+       StrBufAppendPrintf(Target, "%d", WCC->CurRoom.DefView);
+}
+
+
+int ConditionalThisRoomOrder(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       long CheckThis;
+
+       if (WCC == NULL)
+               return 0;
+
+       LoadRoomXA();
+
+       CheckThis = GetTemplateTokenNumber(Target, TP, 2, 0);
+       return CheckThis == WCC->CurRoom.Order;
+}
+
+int ConditionalThisRoomDefView(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       long CheckThis;
+
+       if (WCC == NULL)
+               return 0;
+
+       LoadRoomXA();
+
+       CheckThis = GetTemplateTokenNumber(Target, TP, 2, 0);
+       return CheckThis == WCC->CurRoom.DefView;
+}
+
+
+
+
+
 /*
  * goto next room
  */
 void smart_goto(const StrBuf *next_room) {
        gotoroom(next_room);
-       readloop(readnew);
+       readloop(readnew, eUseDefault);
 }
 
 
@@ -1010,41 +1066,6 @@ void slrp_highest(void)
 }
 
 
-/*
- * un-goto the previous room
- */
-void ungoto(void)
-{
-       StrBuf *Buf;
-
-       if (havebstr("startmsg")) {
-               readloop(readnew);
-               return;
-       }
-
-       if (!strcmp(WC->ugname, "")) {
-               smart_goto(WC->wc_roomname);
-               return;
-       }
-       serv_printf("GOTO %s", WC->ugname);
-       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);
-               StrBuf_ServGetln(Buf);
-       }
-       FlushStrBuf(Buf);
-       StrBufAppendBufPlain(Buf, WC->ugname, -1, 0);
-       strcpy(WC->ugname, "");
-       smart_goto(Buf);
-       FreeStrBuf(&Buf);
-}
-
 typedef struct __room_states {
        char password[SIZ];
        char dirname[SIZ];
@@ -1200,7 +1221,7 @@ void display_editroom(void)
        int i, j;
        char *tab;
        char *shared_with;
-       char *not_shared_with;
+       char *not_shared_with = NULL;
        int roompolicy = 0;
        int roomvalue = 0;
        int floorpolicy = 0;
@@ -1217,116 +1238,116 @@ void display_editroom(void)
        FreeStrBuf(&Buf);
        output_headers(1, 1, 1, 0, 0, 0);
 
-       wprintf("<div class=\"fix_scrollbar_bug\">");
+       wc_printf("<div class=\"fix_scrollbar_bug\">");
 
-       wprintf("<br />\n");
+       wc_printf("<br />\n");
 
        /* print the tabbed dialog */
-       wprintf("<div align=\"center\">");
-       wprintf("<table id=\"AdminTabs\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">"
+       wc_printf("<div align=\"center\">");
+       wc_printf("<table id=\"AdminTabs\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">"
                "<tr align=\"center\" style=\"cursor:pointer\"><td>&nbsp;</td>"
                );
 
-       wprintf("<td class=\"");
+       wc_printf("<td class=\"");
        if (!strcmp(tab, "admin")) {
-               wprintf(" tab_cell_label\">");
-               wprintf(_("Administration"));
+               wc_printf(" tab_cell_label\">");
+               wc_printf(_("Administration"));
        }
        else {
-               wprintf("< tab_cell_edit\"><a href=\"display_editroom?tab=admin\">");
-               wprintf(_("Administration"));
-               wprintf("</a>");
+               wc_printf("< tab_cell_edit\"><a href=\"display_editroom?tab=admin\">");
+               wc_printf(_("Administration"));
+               wc_printf("</a>");
        }
-       wprintf("</td>\n");
-       wprintf("<td>&nbsp;</td>\n");
+       wc_printf("</td>\n");
+       wc_printf("<td>&nbsp;</td>\n");
 
-       if ( (WC->axlevel >= 6) || (WC->is_room_aide) ) {
+       if ( ConditionalHaveRoomeditRights(NULL, NULL)) {
 
-               wprintf("<td class=\"");
+               wc_printf("<td class=\"");
                if (!strcmp(tab, "config")) {
-                       wprintf(" tab_cell_label\">");
-                       wprintf(_("Configuration"));
+                       wc_printf(" tab_cell_label\">");
+                       wc_printf(_("Configuration"));
                }
                else {
-                       wprintf(" tab_cell_edit\"><a href=\"display_editroom?tab=config\">");
-                       wprintf(_("Configuration"));
-                       wprintf("</a>");
+                       wc_printf(" tab_cell_edit\"><a href=\"display_editroom?tab=config\">");
+                       wc_printf(_("Configuration"));
+                       wc_printf("</a>");
                }
-               wprintf("</td>\n");
-               wprintf("<td>&nbsp;</td>\n");
+               wc_printf("</td>\n");
+               wc_printf("<td>&nbsp;</td>\n");
 
-               wprintf("<td class=\"");
+               wc_printf("<td class=\"");
                if (!strcmp(tab, "expire")) {
-                       wprintf(" tab_cell_label\">");
-                       wprintf(_("Message expire policy"));
+                       wc_printf(" tab_cell_label\">");
+                       wc_printf(_("Message expire policy"));
                }
                else {
-                       wprintf(" tab_cell_edit\"><a href=\"display_editroom?tab=expire\">");
-                       wprintf(_("Message expire policy"));
-                       wprintf("</a>");
+                       wc_printf(" tab_cell_edit\"><a href=\"display_editroom?tab=expire\">");
+                       wc_printf(_("Message expire policy"));
+                       wc_printf("</a>");
                }
-               wprintf("</td>\n");
-               wprintf("<td>&nbsp;</td>\n");
+               wc_printf("</td>\n");
+               wc_printf("<td>&nbsp;</td>\n");
        
-               wprintf("<td class=\"");
+               wc_printf("<td class=\"");
                if (!strcmp(tab, "access")) {
-                       wprintf(" tab_cell_label\">");
-                       wprintf(_("Access controls"));
+                       wc_printf(" tab_cell_label\">");
+                       wc_printf(_("Access controls"));
                }
                else {
-                       wprintf(" tab_cell_edit\"><a href=\"display_editroom?tab=access\">");
-                       wprintf(_("Access controls"));
-                       wprintf("</a>");
+                       wc_printf(" tab_cell_edit\"><a href=\"display_editroom?tab=access\">");
+                       wc_printf(_("Access controls"));
+                       wc_printf("</a>");
                }
-               wprintf("</td>\n");
-               wprintf("<td>&nbsp;</td>\n");
+               wc_printf("</td>\n");
+               wc_printf("<td>&nbsp;</td>\n");
 
-               wprintf("<td class=\"");
+               wc_printf("<td class=\"");
                if (!strcmp(tab, "sharing")) {
-                       wprintf(" tab_cell_label\">");
-                       wprintf(_("Sharing"));
+                       wc_printf(" tab_cell_label\">");
+                       wc_printf(_("Sharing"));
                }
                else {
-                       wprintf(" tab_cell_edit\"><a href=\"display_editroom?tab=sharing\">");
-                       wprintf(_("Sharing"));
-                       wprintf("</a>");
+                       wc_printf(" tab_cell_edit\"><a href=\"display_editroom?tab=sharing\">");
+                       wc_printf(_("Sharing"));
+                       wc_printf("</a>");
                }
-               wprintf("</td>\n");
-               wprintf("<td>&nbsp;</td>\n");
+               wc_printf("</td>\n");
+               wc_printf("<td>&nbsp;</td>\n");
 
-               wprintf("<td class=\"");
+               wc_printf("<td class=\"");
                if (!strcmp(tab, "listserv")) {
-                       wprintf(" tab_cell_label\">");
-                       wprintf(_("Mailing list service"));
+                       wc_printf(" tab_cell_label\">");
+                       wc_printf(_("Mailing list service"));
                }
                else {
-                       wprintf("< tab_cell_edit\"><a href=\"display_editroom?tab=listserv\">");
-                       wprintf(_("Mailing list service"));
-                       wprintf("</a>");
+                       wc_printf("< tab_cell_edit\"><a href=\"display_editroom?tab=listserv\">");
+                       wc_printf(_("Mailing list service"));
+                       wc_printf("</a>");
                }
-               wprintf("</td>\n");
-               wprintf("<td>&nbsp;</td>\n");
+               wc_printf("</td>\n");
+               wc_printf("<td>&nbsp;</td>\n");
 
        }
 
-       wprintf("<td class=\"");
+       wc_printf("<td class=\"");
        if (!strcmp(tab, "feeds")) {
-               wprintf(" tab_cell_label\">");
-               wprintf(_("Remote retrieval"));
+               wc_printf(" tab_cell_label\">");
+               wc_printf(_("Remote retrieval"));
        }
        else {
-               wprintf("< tab_cell_edit\"><a href=\"display_editroom?tab=feeds\">");
-               wprintf(_("Remote retrieval"));
-               wprintf("</a>");
+               wc_printf("< tab_cell_edit\"><a href=\"display_editroom?tab=feeds\">");
+               wc_printf(_("Remote retrieval"));
+               wc_printf("</a>");
        }
-       wprintf("</td>\n");
-       wprintf("<td>&nbsp;</td>\n");
+       wc_printf("</td>\n");
+       wc_printf("<td>&nbsp;</td>\n");
 
-       wprintf("</tr></table>\n");
-       wprintf("</div>\n");
+       wc_printf("</tr></table>\n");
+       wc_printf("</div>\n");
        /* end tabbed dialog */ 
 
-       wprintf("<script type=\"text/javascript\">"
+       wc_printf("<script type=\"text/javascript\">"
                " Nifty(\"table#AdminTabs td\", \"small transparent top\");"
                "</script>"
                );
@@ -1334,36 +1355,38 @@ void display_editroom(void)
        /* begin content of whatever tab is open now */
 
        if (!strcmp(tab, "admin")) {
-               wprintf("<div class=\"tabcontent\">");
-               wprintf("<ul>"
+               wc_printf("<div class=\"tabcontent\">");
+               wc_printf("<ul>"
                        "<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"
+               wc_printf(_("Are you sure you want to delete this room?"));
+               wc_printf("');\">\n");
+               wc_printf(_("Delete this room"));
+               wc_printf("</a>\n"
+                       "<li><a href=\"display_editroompic?which_room=");
+               urlescputs(ChrPtr(WC->CurRoom.name));
+               wc_printf("\">\n");
+               wc_printf(_("Set or change the icon for this room's banner"));
+               wc_printf("</a>\n"
                        "<li><a href=\"display_editinfo\">\n");
-               wprintf(_("Edit this room's Info file"));
-               wprintf("</a>\n"
+               wc_printf(_("Edit this room's Info file"));
+               wc_printf("</a>\n"
                        "</ul>");
-               wprintf("</div>");
+               wc_printf("</div>");
        }
 
        if (!strcmp(tab, "config")) {
-               wprintf("<div class=\"tabcontent\">");
+               wc_printf("<div class=\"tabcontent\">");
                serv_puts("GETR");
                serv_getln(buf, sizeof buf);
 
                if (!strncmp(buf, "550", 3)) {
-                       wprintf("<br><br><div align=center>%s</div><br><br>\n",
+                       wc_printf("<br><br><div align=center>%s</div><br><br>\n",
                                _("Higher access is required to access this function.")
                                );
                }
                else if (buf[0] != '2') {
-                       wprintf("<br><br><div align=center>%s</div><br><br>\n", &buf[4]);
+                       wc_printf("<br><br><div align=center>%s</div><br><br>\n", &buf[4]);
                }
                else {
                        extract_token(er_name, &buf[4], 0, '|', sizeof er_name);
@@ -1373,209 +1396,209 @@ void display_editroom(void)
                        er_floor = extract_int(&buf[4], 4);
                        er_flags2 = extract_int(&buf[4], 7);
        
-                       wprintf("<form method=\"POST\" action=\"editroom\">\n");
-                       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+                       wc_printf("<form method=\"POST\" action=\"editroom\">\n");
+                       wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
                
-                       wprintf("<ul><li>");
-                       wprintf(_("Name of room: "));
-                       wprintf("<input type=\"text\" NAME=\"er_name\" VALUE=\"%s\" MAXLENGTH=\"%d\">\n",
+                       wc_printf("<ul><li>");
+                       wc_printf(_("Name of room: "));
+                       wc_printf("<input type=\"text\" NAME=\"er_name\" VALUE=\"%s\" MAXLENGTH=\""ULONG_FMT"\">\n",
                                er_name,
                                (sizeof(er_name)-1)
                                );
                
-                       wprintf("<li>");
-                       wprintf(_("Resides on floor: "));
-                       wprintf("<select NAME=\"er_floor\" SIZE=\"1\"");
+                       wc_printf("<li>");
+                       wc_printf(_("Resides on floor: "));
+                       wc_printf("<select NAME=\"er_floor\" SIZE=\"1\"");
                        if (er_flags & QR_MAILBOX)
-                               wprintf("disabled >\n");
+                               wc_printf("disabled >\n");
                        for (i = 0; i < 128; ++i)
                                if (!IsEmptyStr(floorlist[i])) {
-                                       wprintf("<OPTION ");
+                                       wc_printf("<OPTION ");
                                        if (i == er_floor )
-                                               wprintf("SELECTED ");
-                                       wprintf("VALUE=\"%d\">", i);
+                                               wc_printf("SELECTED ");
+                                       wc_printf("VALUE=\"%d\">", i);
                                        escputs(floorlist[i]);
-                                       wprintf("</OPTION>\n");
+                                       wc_printf("</OPTION>\n");
                                }
-                       wprintf("</select>\n");
+                       wc_printf("</select>\n");
 
-                       wprintf("<li>");
-                       wprintf(_("Type of room:"));
-                       wprintf("<ul>\n");
+                       wc_printf("<li>");
+                       wc_printf(_("Type of room:"));
+                       wc_printf("<ul>\n");
        
-                       wprintf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"public\" ");
+                       wc_printf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"public\" ");
                        if ((er_flags & (QR_PRIVATE + QR_MAILBOX)) == 0)
-                               wprintf("CHECKED ");
-                       wprintf("OnChange=\""
+                               wc_printf("CHECKED ");
+                       wc_printf("OnChange=\""
                                "       if (this.form.type[0].checked == true) {        "
                                "               this.form.er_floor.disabled = false;    "
                                "       }                                               "
                                "\"> ");
-                       wprintf(_("Public (automatically appears to everyone)"));
-                       wprintf("\n");
+                       wc_printf(_("Public (automatically appears to everyone)"));
+                       wc_printf("\n");
        
-                       wprintf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"hidden\" ");
+                       wc_printf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"hidden\" ");
                        if ((er_flags & QR_PRIVATE) &&
                            (er_flags & QR_GUESSNAME))
-                               wprintf("CHECKED ");
-                       wprintf(" OnChange=\""
+                               wc_printf("CHECKED ");
+                       wc_printf(" OnChange=\""
                                "       if (this.form.type[1].checked == true) {        "
                                "               this.form.er_floor.disabled = false;    "
                                "       }                                               "
                                "\"> ");
-                       wprintf(_("Private - hidden (accessible to anyone who knows its name)"));
+                       wc_printf(_("Private - hidden (accessible to anyone who knows its name)"));
                
-                       wprintf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"passworded\" ");
+                       wc_printf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"passworded\" ");
                        if ((er_flags & QR_PRIVATE) &&
                            (er_flags & QR_PASSWORDED))
-                               wprintf("CHECKED ");
-                       wprintf(" OnChange=\""
+                               wc_printf("CHECKED ");
+                       wc_printf(" OnChange=\""
                                "       if (this.form.type[2].checked == true) {        "
                                "               this.form.er_floor.disabled = false;    "
                                "       }                                               "
                                "\"> ");
-                       wprintf(_("Private - require password: "));
-                       wprintf("\n<input type=\"text\" NAME=\"er_password\" VALUE=\"%s\" MAXLENGTH=\"9\">\n",
+                       wc_printf(_("Private - require password: "));
+                       wc_printf("\n<input type=\"text\" NAME=\"er_password\" VALUE=\"%s\" MAXLENGTH=\"9\">\n",
                                er_password);
                
-                       wprintf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"invonly\" ");
+                       wc_printf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"invonly\" ");
                        if ((er_flags & QR_PRIVATE)
                            && ((er_flags & QR_GUESSNAME) == 0)
                            && ((er_flags & QR_PASSWORDED) == 0))
-                               wprintf("CHECKED ");
-                       wprintf(" OnChange=\""
+                               wc_printf("CHECKED ");
+                       wc_printf(" OnChange=\""
                                "       if (this.form.type[3].checked == true) {        "
                                "               this.form.er_floor.disabled = false;    "
                                "       }                                               "
                                "\"> ");
-                       wprintf(_("Private - invitation only"));
+                       wc_printf(_("Private - invitation only"));
                
-                       wprintf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"personal\" ");
+                       wc_printf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"personal\" ");
                        if (er_flags & QR_MAILBOX)
-                               wprintf("CHECKED ");
-                       wprintf (" OnChange=\""
+                               wc_printf("CHECKED ");
+                       wc_printf (" OnChange=\""
                                 "      if (this.form.type[4].checked == true) {        "
                                 "              this.form.er_floor.disabled = true;     "
                                 "      }                                               "
                                 "\"> ");
-                       wprintf(_("Personal (mailbox for you only)"));
+                       wc_printf(_("Personal (mailbox for you only)"));
                        
-                       wprintf("\n<li><input type=\"checkbox\" NAME=\"bump\" VALUE=\"yes\" ");
-                       wprintf("> ");
-                       wprintf(_("If private, cause current users to forget room"));
+                       wc_printf("\n<li><input type=\"checkbox\" NAME=\"bump\" VALUE=\"yes\" ");
+                       wc_printf("> ");
+                       wc_printf(_("If private, cause current users to forget room"));
                
-                       wprintf("\n</ul>\n");
+                       wc_printf("\n</ul>\n");
                
-                       wprintf("<li><input type=\"checkbox\" NAME=\"prefonly\" VALUE=\"yes\" ");
+                       wc_printf("<li><input type=\"checkbox\" NAME=\"prefonly\" VALUE=\"yes\" ");
                        if (er_flags & QR_PREFONLY)
-                               wprintf("CHECKED ");
-                       wprintf("> ");
-                       wprintf(_("Preferred users only"));
+                               wc_printf("CHECKED ");
+                       wc_printf("> ");
+                       wc_printf(_("Preferred users only"));
                
-                       wprintf("\n<li><input type=\"checkbox\" NAME=\"readonly\" VALUE=\"yes\" ");
+                       wc_printf("\n<li><input type=\"checkbox\" NAME=\"readonly\" VALUE=\"yes\" ");
                        if (er_flags & QR_READONLY)
-                               wprintf("CHECKED ");
-                       wprintf("> ");
-                       wprintf(_("Read-only room"));
+                               wc_printf("CHECKED ");
+                       wc_printf("> ");
+                       wc_printf(_("Read-only room"));
                
-                       wprintf("\n<li><input type=\"checkbox\" NAME=\"collabdel\" VALUE=\"yes\" ");
+                       wc_printf("\n<li><input type=\"checkbox\" NAME=\"collabdel\" VALUE=\"yes\" ");
                        if (er_flags2 & QR2_COLLABDEL)
-                               wprintf("CHECKED ");
-                       wprintf("> ");
-                       wprintf(_("All users allowed to post may also delete messages"));
+                               wc_printf("CHECKED ");
+                       wc_printf("> ");
+                       wc_printf(_("All users allowed to post may also delete messages"));
                
                        /** directory stuff */
-                       wprintf("\n<li><input type=\"checkbox\" NAME=\"directory\" VALUE=\"yes\" ");
+                       wc_printf("\n<li><input type=\"checkbox\" NAME=\"directory\" VALUE=\"yes\" ");
                        if (er_flags & QR_DIRECTORY)
-                               wprintf("CHECKED ");
-                       wprintf("> ");
-                       wprintf(_("File directory room"));
+                               wc_printf("CHECKED ");
+                       wc_printf("> ");
+                       wc_printf(_("File directory room"));
        
-                       wprintf("\n<ul><li>");
-                       wprintf(_("Directory name: "));
-                       wprintf("<input type=\"text\" NAME=\"er_dirname\" VALUE=\"%s\" MAXLENGTH=\"14\">\n",
+                       wc_printf("\n<ul><li>");
+                       wc_printf(_("Directory name: "));
+                       wc_printf("<input type=\"text\" NAME=\"er_dirname\" VALUE=\"%s\" MAXLENGTH=\"14\">\n",
                                er_dirname);
        
-                       wprintf("<li><input type=\"checkbox\" NAME=\"ulallowed\" VALUE=\"yes\" ");
+                       wc_printf("<li><input type=\"checkbox\" NAME=\"ulallowed\" VALUE=\"yes\" ");
                        if (er_flags & QR_UPLOAD)
-                               wprintf("CHECKED ");
-                       wprintf("> ");
-                       wprintf(_("Uploading allowed"));
+                               wc_printf("CHECKED ");
+                       wc_printf("> ");
+                       wc_printf(_("Uploading allowed"));
                
-                       wprintf("\n<li><input type=\"checkbox\" NAME=\"dlallowed\" VALUE=\"yes\" ");
+                       wc_printf("\n<li><input type=\"checkbox\" NAME=\"dlallowed\" VALUE=\"yes\" ");
                        if (er_flags & QR_DOWNLOAD)
-                               wprintf("CHECKED ");
-                       wprintf("> ");
-                       wprintf(_("Downloading allowed"));
+                               wc_printf("CHECKED ");
+                       wc_printf("> ");
+                       wc_printf(_("Downloading allowed"));
                
-                       wprintf("\n<li><input type=\"checkbox\" NAME=\"visdir\" VALUE=\"yes\" ");
+                       wc_printf("\n<li><input type=\"checkbox\" NAME=\"visdir\" VALUE=\"yes\" ");
                        if (er_flags & QR_VISDIR)
-                               wprintf("CHECKED ");
-                       wprintf("> ");
-                       wprintf(_("Visible directory"));
-                       wprintf("</ul>\n");
+                               wc_printf("CHECKED ");
+                       wc_printf("> ");
+                       wc_printf(_("Visible directory"));
+                       wc_printf("</ul>\n");
                
                        /** end of directory stuff */
        
-                       wprintf("<li><input type=\"checkbox\" NAME=\"network\" VALUE=\"yes\" ");
+                       wc_printf("<li><input type=\"checkbox\" NAME=\"network\" VALUE=\"yes\" ");
                        if (er_flags & QR_NETWORK)
-                               wprintf("CHECKED ");
-                       wprintf("> ");
-                       wprintf(_("Network shared room"));
+                               wc_printf("CHECKED ");
+                       wc_printf("> ");
+                       wc_printf(_("Network shared room"));
        
-                       wprintf("\n<li><input type=\"checkbox\" NAME=\"permanent\" VALUE=\"yes\" ");
+                       wc_printf("\n<li><input type=\"checkbox\" NAME=\"permanent\" VALUE=\"yes\" ");
                        if (er_flags & QR_PERMANENT)
-                               wprintf("CHECKED ");
-                       wprintf("> ");
-                       wprintf(_("Permanent (does not auto-purge)"));
+                               wc_printf("CHECKED ");
+                       wc_printf("> ");
+                       wc_printf(_("Permanent (does not auto-purge)"));
        
-                       wprintf("\n<li><input type=\"checkbox\" NAME=\"subjectreq\" VALUE=\"yes\" ");
+                       wc_printf("\n<li><input type=\"checkbox\" NAME=\"subjectreq\" VALUE=\"yes\" ");
                        if (er_flags2 & QR2_SUBJECTREQ)
-                               wprintf("CHECKED ");
-                       wprintf("> ");
-                       wprintf(_("Subject Required (Force users to specify a message subject)"));
+                               wc_printf("CHECKED ");
+                       wc_printf("> ");
+                       wc_printf(_("Subject Required (Force users to specify a message subject)"));
        
                        /** start of anon options */
                
-                       wprintf("\n<li>");
-                       wprintf(_("Anonymous messages"));
-                       wprintf("<ul>\n");
+                       wc_printf("\n<li>");
+                       wc_printf(_("Anonymous messages"));
+                       wc_printf("<ul>\n");
                
-                       wprintf("<li><input type=\"radio\" NAME=\"anon\" VALUE=\"no\" ");
+                       wc_printf("<li><input type=\"radio\" NAME=\"anon\" VALUE=\"no\" ");
                        if (((er_flags & QR_ANONONLY) == 0)
                            && ((er_flags & QR_ANONOPT) == 0))
-                               wprintf("CHECKED ");
-                       wprintf("> ");
-                       wprintf(_("No anonymous messages"));
+                               wc_printf("CHECKED ");
+                       wc_printf("> ");
+                       wc_printf(_("No anonymous messages"));
        
-                       wprintf("\n<li><input type=\"radio\" NAME=\"anon\" VALUE=\"anononly\" ");
+                       wc_printf("\n<li><input type=\"radio\" NAME=\"anon\" VALUE=\"anononly\" ");
                        if (er_flags & QR_ANONONLY)
-                               wprintf("CHECKED ");
-                       wprintf("> ");
-                       wprintf(_("All messages are anonymous"));
+                               wc_printf("CHECKED ");
+                       wc_printf("> ");
+                       wc_printf(_("All messages are anonymous"));
                
-                       wprintf("\n<li><input type=\"radio\" NAME=\"anon\" VALUE=\"anon2\" ");
+                       wc_printf("\n<li><input type=\"radio\" NAME=\"anon\" VALUE=\"anon2\" ");
                        if (er_flags & QR_ANONOPT)
-                               wprintf("CHECKED ");
-                       wprintf("> ");
-                       wprintf(_("Prompt user when entering messages"));
-                       wprintf("</ul>\n");
+                               wc_printf("CHECKED ");
+                       wc_printf("> ");
+                       wc_printf(_("Prompt user when entering messages"));
+                       wc_printf("</ul>\n");
                
                        /* end of anon options */
                
-                       wprintf("<li>");
-                       wprintf(_("Room aide: "));
+                       wc_printf("<li>");
+                       wc_printf(_("Room aide: "));
                        serv_puts("GETA");
                        serv_getln(buf, sizeof buf);
                        if (buf[0] != '2') {
-                               wprintf("<em>%s</em>\n", &buf[4]);
+                               wc_printf("<em>%s</em>\n", &buf[4]);
                        } else {
                                extract_token(er_roomaide, &buf[4], 0, '|', sizeof er_roomaide);
-                               wprintf("<input type=\"text\" NAME=\"er_roomaide\" VALUE=\"%s\" MAXLENGTH=\"25\">\n", er_roomaide);
+                               wc_printf("<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"
+                       wc_printf("</ul><CENTER>\n");
+                       wc_printf("<input type=\"hidden\" NAME=\"tab\" VALUE=\"config\">\n"
                                "<input type=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">"
                                "&nbsp;"
                                "<input type=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">"
@@ -1584,13 +1607,13 @@ void display_editroom(void)
                                _("Cancel")
                                );
                }
-               wprintf("</div>");
+               wc_printf("</div>");
        }
 
 
        /* Sharing the room with other Citadel nodes... */
        if (!strcmp(tab, "sharing")) {
-               wprintf("<div class=\"tabcontent\">");
+               wc_printf("<div class=\"tabcontent\">");
 
                shared_with = strdup("");
                not_shared_with = strdup("");
@@ -1636,99 +1659,99 @@ void display_editroom(void)
                }
 
                /* Display the stuff */
-               wprintf("<CENTER><br />"
+               wc_printf("<CENTER><br />"
                        "<table border=1 cellpadding=5><tr>"
                        "<td><B><I>");
-               wprintf(_("Shared with"));
-               wprintf("</I></B></td>"
+               wc_printf(_("Shared with"));
+               wc_printf("</I></B></td>"
                        "<td><B><I>");
-               wprintf(_("Not shared with"));
-               wprintf("</I></B></td></tr>\n"
+               wc_printf(_("Not shared with"));
+               wc_printf("</I></B></td></tr>\n"
                        "<tr><td VALIGN=TOP>\n");
 
-               wprintf("<table border=0 cellpadding=5><tr class=\"tab_cell\"><td>");
-               wprintf(_("Remote node name"));
-               wprintf("</td><td>");
-               wprintf(_("Remote room name"));
-               wprintf("</td><td>");
-               wprintf(_("Actions"));
-               wprintf("</td></tr>\n");
+               wc_printf("<table border=0 cellpadding=5><tr class=\"tab_cell\"><td>");
+               wc_printf(_("Remote node name"));
+               wc_printf("</td><td>");
+               wc_printf(_("Remote room name"));
+               wc_printf("</td><td>");
+               wc_printf(_("Actions"));
+               wc_printf("</td></tr>\n");
 
                for (i=0; i<num_tokens(shared_with, '\n'); ++i) {
                        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 (!IsEmptyStr(node)) {
-                               wprintf("<form method=\"POST\" action=\"netedit\">");
-                               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-                               wprintf("<tr><td>%s</td>\n", node);
+                               wc_printf("<form method=\"POST\" action=\"netedit\">");
+                               wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+                               wc_printf("<tr><td>%s</td>\n", node);
 
-                               wprintf("<td>");
+                               wc_printf("<td>");
                                if (!IsEmptyStr(remote_room)) {
                                        escputs(remote_room);
                                }
-                               wprintf("</td>");
+                               wc_printf("</td>");
 
-                               wprintf("<td>");
+                               wc_printf("<td>");
                
-                               wprintf("<input type=\"hidden\" NAME=\"line\" "
+                               wc_printf("<input type=\"hidden\" NAME=\"line\" "
                                        "VALUE=\"ignet_push_share|");
                                urlescputs(node);
                                if (!IsEmptyStr(remote_room)) {
-                                       wprintf("|");
+                                       wc_printf("|");
                                        urlescputs(remote_room);
                                }
-                               wprintf("\">");
-                               wprintf("<input type=\"hidden\" NAME=\"tab\" VALUE=\"sharing\">\n");
-                               wprintf("<input type=\"hidden\" NAME=\"cmd\" VALUE=\"remove\">\n");
-                               wprintf("<input type=\"submit\" "
+                               wc_printf("\">");
+                               wc_printf("<input type=\"hidden\" NAME=\"tab\" VALUE=\"sharing\">\n");
+                               wc_printf("<input type=\"hidden\" NAME=\"cmd\" VALUE=\"remove\">\n");
+                               wc_printf("<input type=\"submit\" "
                                        "NAME=\"unshare_button\" VALUE=\"%s\">", _("Unshare"));
-                               wprintf("</td></tr></form>\n");
+                               wc_printf("</td></tr></form>\n");
                        }
                }
 
-               wprintf("</table>\n");
-               wprintf("</td><td VALIGN=TOP>\n");
-               wprintf("<table border=0 cellpadding=5><tr class=\"tab_cell\"><td>");
-               wprintf(_("Remote node name"));
-               wprintf("</td><td>");
-               wprintf(_("Remote room name"));
-               wprintf("</td><td>");
-               wprintf(_("Actions"));
-               wprintf("</td></tr>\n");
+               wc_printf("</table>\n");
+               wc_printf("</td><td VALIGN=TOP>\n");
+               wc_printf("<table border=0 cellpadding=5><tr class=\"tab_cell\"><td>");
+               wc_printf(_("Remote node name"));
+               wc_printf("</td><td>");
+               wc_printf(_("Remote room name"));
+               wc_printf("</td><td>");
+               wc_printf(_("Actions"));
+               wc_printf("</td></tr>\n");
 
                for (i=0; i<num_tokens(not_shared_with, '\n'); ++i) {
                        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=\"%d\">\n", WC->nonce);
-                               wprintf("<tr><td>");
+                               wc_printf("<form method=\"POST\" action=\"netedit\">");
+                               wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+                               wc_printf("<tr><td>");
                                escputs(node);
-                               wprintf("</td><td>"
+                               wc_printf("</td><td>"
                                        "<input type=\"INPUT\" "
                                        "NAME=\"suffix\" "
                                        "MAXLENGTH=128>"
                                        "</td><td>");
-                               wprintf("<input type=\"hidden\" "
+                               wc_printf("<input type=\"hidden\" "
                                        "NAME=\"line\" "
                                        "VALUE=\"ignet_push_share|");
                                urlescputs(node);
-                               wprintf("|\">");
-                               wprintf("<input type=\"hidden\" NAME=\"tab\" "
+                               wc_printf("|\">");
+                               wc_printf("<input type=\"hidden\" NAME=\"tab\" "
                                        "VALUE=\"sharing\">\n");
-                               wprintf("<input type=\"hidden\" NAME=\"cmd\" "
+                               wc_printf("<input type=\"hidden\" NAME=\"cmd\" "
                                        "VALUE=\"add\">\n");
-                               wprintf("<input type=\"submit\" "
+                               wc_printf("<input type=\"submit\" "
                                        "NAME=\"add_button\" VALUE=\"%s\">", _("Share"));
-                               wprintf("</td></tr></form>\n");
+                               wc_printf("</td></tr></form>\n");
                        }
                }
 
-               wprintf("</table>\n");
-               wprintf("</td></tr>"
+               wc_printf("</table>\n");
+               wc_printf("</td></tr>"
                        "</table></CENTER><br />\n"
                        "<I><B>%s</B><ul><li>", _("Notes:"));
-               wprintf(_("When sharing a room, "
+               wc_printf(_("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"
@@ -1740,19 +1763,22 @@ void display_editroom(void)
                          "</ul></I><br />\n"
                                ));
 
-               wprintf("</div>");
+               wc_printf("</div>");
        }
 
+       if (not_shared_with != NULL)
+               free (not_shared_with);
+
        /* Mailing list management */
        if (!strcmp(tab, "listserv")) {
                room_states RoomFlags;
-               wprintf("<div class=\"tabcontent\">");
+               wc_printf("<div class=\"tabcontent\">");
 
-               wprintf("<br /><center>"
+               wc_printf("<br /><center>"
                        "<table BORDER=0 WIDTH=100%% CELLPADDING=5>"
                        "<tr><td VALIGN=TOP>");
 
-               wprintf(_("<i>The contents of this room are being "
+               wc_printf(_("<i>The contents of this room are being "
                          "mailed <b>as individual messages</b> "
                          "to the following list recipients:"
                          "</i><br /><br />\n"));
@@ -1765,24 +1791,24 @@ void display_editroom(void)
                                        extract_token(recp, buf, 1, '|', sizeof recp);
                        
                                        escputs(recp);
-                                       wprintf(" <a href=\"netedit?cmd=remove&tab=listserv&line=listrecp|");
+                                       wc_printf(" <a href=\"netedit?cmd=remove?tab=listserv?line=listrecp|");
                                        urlescputs(recp);
-                                       wprintf("\">");
-                                       wprintf(_("(remove)"));
-                                       wprintf("</A><br />");
+                                       wc_printf("\">");
+                                       wc_printf(_("(remove)"));
+                                       wc_printf("</A><br />");
                                }
                        }
-               wprintf("<br /><form method=\"POST\" action=\"netedit\">\n"
+               wc_printf("<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=\"%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");
+               wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+               wc_printf("<input type=\"text\" id=\"add_as_listrecp\" NAME=\"line\">\n");
+               wc_printf("<input type=\"submit\" NAME=\"add_button\" VALUE=\"%s\">", _("Add"));
+               wc_printf("</form>\n");
 
-               wprintf("</td><td VALIGN=TOP>\n");
+               wc_printf("</td><td VALIGN=TOP>\n");
                
-               wprintf(_("<i>The contents of this room are being "
+               wc_printf(_("<i>The contents of this room are being "
                          "mailed <b>in digest form</b> "
                          "to the following list recipients:"
                          "</i><br /><br />\n"));
@@ -1795,26 +1821,26 @@ void display_editroom(void)
                                        extract_token(recp, buf, 1, '|', sizeof recp);
                        
                                        escputs(recp);
-                                       wprintf(" <a href=\"netedit?cmd=remove&tab=listserv&line="
+                                       wc_printf(" <a href=\"netedit?cmd=remove?tab=listserv?line="
                                                "digestrecp|");
                                        urlescputs(recp);
-                                       wprintf("\">");
-                                       wprintf(_("(remove)"));
-                                       wprintf("</A><br />");
+                                       wc_printf("\">");
+                                       wc_printf(_("(remove)"));
+                                       wc_printf("</A><br />");
                                }
                        }
-               wprintf("<br /><form method=\"POST\" action=\"netedit\">\n"
+               wc_printf("<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=\"%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");
+               wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+               wc_printf("<input type=\"text\" id=\"add_as_digestrecp\" NAME=\"line\">\n");
+               wc_printf("<input type=\"submit\" NAME=\"add_button\" VALUE=\"%s\">", _("Add"));
+               wc_printf("</form>\n");
                
-               wprintf("</td></tr></table>\n");
+               wc_printf("</td></tr></table>\n");
 
                /** Pop open an address book -- begin **/
-               wprintf("<div align=right>"
+               wc_printf("<div align=right>"
                        "<a href=\"javascript:PopOpenAddressBook('add_as_listrecp|%s|add_as_digestrecp|%s');\" "
                        "title=\"%s\">"
                        "<img align=middle border=0 width=24 height=24 src=\"static/viewcontacts_24x.gif\">"
@@ -1827,56 +1853,56 @@ void display_editroom(void)
                        );
                /* Pop open an address book -- end **/
 
-               wprintf("<br />\n<form method=\"GET\" action=\"toggle_self_service\">\n");
+               wc_printf("<br />\n<form method=\"GET\" action=\"toggle_self_service\">\n");
 
                get_roomflags (&RoomFlags);
                
                /* Self Service subscription? */
-               wprintf("<table><tr><td>\n");
-               wprintf(_("Allow self-service subscribe/unsubscribe requests."));
-               wprintf("</td><td><input type=\"checkbox\" name=\"QR2_SelfList\" value=\"yes\" %s></td></tr>\n"
+               wc_printf("<table><tr><td>\n");
+               wc_printf(_("Allow self-service subscribe/unsubscribe requests."));
+               wc_printf("</td><td><input type=\"checkbox\" name=\"QR2_SelfList\" value=\"yes\" %s></td></tr>\n"
                        " <tr><td colspan=\"2\">\n",
                        (is_selflist(&RoomFlags))?"checked":"");
-               wprintf(_("The URL for subscribe/unsubscribe is: "));
-               wprintf("<TT>%s://%s/listsub</TT></td></tr>\n",
+               wc_printf(_("The URL for subscribe/unsubscribe is: "));
+               wc_printf("<TT>%s://%s/listsub</TT></td></tr>\n",
                        (is_https ? "https" : "http"),
                        ChrPtr(WC->Hdr->HR.http_host));
                /* Public posting? */
-               wprintf("<tr><td>");
-               wprintf(_("Allow non-subscribers to mail to this room."));
-               wprintf("</td><td><input type=\"checkbox\" name=\"QR2_SubsOnly\" value=\"yes\" %s></td></tr>\n",
+               wc_printf("<tr><td>");
+               wc_printf(_("Allow non-subscribers to mail to this room."));
+               wc_printf("</td><td><input type=\"checkbox\" name=\"QR2_SubsOnly\" value=\"yes\" %s></td></tr>\n",
                        (is_publiclist(&RoomFlags))?"checked":"");
                
                /* Moderated List? */
-               wprintf("<tr><td>");
-               wprintf(_("Room post publication needs Aide permission."));
-               wprintf("</td><td><input type=\"checkbox\" name=\"QR2_Moderated\" value=\"yes\" %s></td></tr>\n",
+               wc_printf("<tr><td>");
+               wc_printf(_("Room post publication needs Aide permission."));
+               wc_printf("</td><td><input type=\"checkbox\" name=\"QR2_Moderated\" value=\"yes\" %s></td></tr>\n",
                        (is_moderatedlist(&RoomFlags))?"checked":"");
 
 
-               wprintf("<tr><td colspan=\"2\" align=\"center\">"
+               wc_printf("<tr><td colspan=\"2\" align=\"center\">"
                        "<input type=\"submit\" NAME=\"add_button\" VALUE=\"%s\"></td></tr>", _("Save changes"));
-               wprintf("</table></form>");
+               wc_printf("</table></form>");
                        
 
-               wprintf("</CENTER>\n");
-               wprintf("</div>");
+               wc_printf("</CENTER>\n");
+               wc_printf("</div>");
        }
 
 
        /* Configuration of The Dreaded Auto-Purger */
        if (!strcmp(tab, "expire")) {
-               wprintf("<div class=\"tabcontent\">");
+               wc_printf("<div class=\"tabcontent\">");
 
                serv_puts("GPEX room");
                serv_getln(buf, sizeof buf);
                if (!strncmp(buf, "550", 3)) {
-                       wprintf("<br><br><div align=center>%s</div><br><br>\n",
+                       wc_printf("<br><br><div align=center>%s</div><br><br>\n",
                                _("Higher access is required to access this function.")
                                );
                }
                else if (buf[0] != '2') {
-                       wprintf("<br><br><div align=center>%s</div><br><br>\n", &buf[4]);
+                       wc_printf("<br><br><div align=center>%s</div><br><br>\n", &buf[4]);
                }
                else {
                        roompolicy = extract_int(&buf[4], 0);
@@ -1889,105 +1915,105 @@ void display_editroom(void)
                                floorvalue = extract_int(&buf[4], 1);
                        }
                        
-                       wprintf("<br /><form method=\"POST\" action=\"set_room_policy\">\n");
-                       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(ChrPtr(WC->wc_roomname));
-                       wprintf(")</td><td>");
-                       wprintf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"0\" %s>",
+                       wc_printf("<br /><form method=\"POST\" action=\"set_room_policy\">\n");
+                       wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+                       wc_printf("<table border=0 cellspacing=5>\n");
+                       wc_printf("<tr><td>");
+                       wc_printf(_("Message expire policy for this room"));
+                       wc_printf("<br />(");
+                       escputs(ChrPtr(WC->CurRoom.name));
+                       wc_printf(")</td><td>");
+                       wc_printf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"0\" %s>",
                                ((roompolicy == 0) ? "CHECKED" : "") );
-                       wprintf(_("Use the default policy for this floor"));
-                       wprintf("<br />\n");
-                       wprintf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"1\" %s>",
+                       wc_printf(_("Use the default policy for this floor"));
+                       wc_printf("<br />\n");
+                       wc_printf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"1\" %s>",
                                ((roompolicy == 1) ? "CHECKED" : "") );
-                       wprintf(_("Never automatically expire messages"));
-                       wprintf("<br />\n");
-                       wprintf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"2\" %s>",
+                       wc_printf(_("Never automatically expire messages"));
+                       wc_printf("<br />\n");
+                       wc_printf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"2\" %s>",
                                ((roompolicy == 2) ? "CHECKED" : "") );
-                       wprintf(_("Expire by message count"));
-                       wprintf("<br />\n");
-                       wprintf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"3\" %s>",
+                       wc_printf(_("Expire by message count"));
+                       wc_printf("<br />\n");
+                       wc_printf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"3\" %s>",
                                ((roompolicy == 3) ? "CHECKED" : "") );
-                       wprintf(_("Expire by message age"));
-                       wprintf("<br />");
-                       wprintf(_("Number of messages or days: "));
-                       wprintf("<input type=\"text\" NAME=\"roomvalue\" MAXLENGTH=\"5\" VALUE=\"%d\">", roomvalue);
-                       wprintf("</td></tr>\n");
+                       wc_printf(_("Expire by message age"));
+                       wc_printf("<br />");
+                       wc_printf(_("Number of messages or days: "));
+                       wc_printf("<input type=\"text\" NAME=\"roomvalue\" MAXLENGTH=\"5\" VALUE=\"%d\">", roomvalue);
+                       wc_printf("</td></tr>\n");
        
                        if (WC->axlevel >= 6) {
-                               wprintf("<tr><td COLSPAN=2><hr /></td></tr>\n");
-                               wprintf("<tr><td>");
-                               wprintf(_("Message expire policy for this floor"));
-                               wprintf("<br />(");
-                               escputs(floorlist[WC->wc_floor]);
-                               wprintf(")</td><td>");
-                               wprintf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"0\" %s>",
+                               wc_printf("<tr><td COLSPAN=2><hr /></td></tr>\n");
+                               wc_printf("<tr><td>");
+                               wc_printf(_("Message expire policy for this floor"));
+                               wc_printf("<br />(");
+                               escputs(floorlist[WC->CurRoom.floorid]);
+                               wc_printf(")</td><td>");
+                               wc_printf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"0\" %s>",
                                        ((floorpolicy == 0) ? "CHECKED" : "") );
-                               wprintf(_("Use the system default"));
-                               wprintf("<br />\n");
-                               wprintf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"1\" %s>",
+                               wc_printf(_("Use the system default"));
+                               wc_printf("<br />\n");
+                               wc_printf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"1\" %s>",
                                        ((floorpolicy == 1) ? "CHECKED" : "") );
-                               wprintf(_("Never automatically expire messages"));
-                               wprintf("<br />\n");
-                               wprintf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"2\" %s>",
+                               wc_printf(_("Never automatically expire messages"));
+                               wc_printf("<br />\n");
+                               wc_printf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"2\" %s>",
                                        ((floorpolicy == 2) ? "CHECKED" : "") );
-                               wprintf(_("Expire by message count"));
-                               wprintf("<br />\n");
-                               wprintf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"3\" %s>",
+                               wc_printf(_("Expire by message count"));
+                               wc_printf("<br />\n");
+                               wc_printf("<input type=\"radio\" NAME=\"floorpolicy\" VALUE=\"3\" %s>",
                                        ((floorpolicy == 3) ? "CHECKED" : "") );
-                               wprintf(_("Expire by message age"));
-                               wprintf("<br />");
-                               wprintf(_("Number of messages or days: "));
-                               wprintf("<input type=\"text\" NAME=\"floorvalue\" MAXLENGTH=\"5\" VALUE=\"%d\">",
+                               wc_printf(_("Expire by message age"));
+                               wc_printf("<br />");
+                               wc_printf(_("Number of messages or days: "));
+                               wc_printf("<input type=\"text\" NAME=\"floorvalue\" MAXLENGTH=\"5\" VALUE=\"%d\">",
                                        floorvalue);
                        }
        
-                       wprintf("<CENTER>\n");
-                       wprintf("<tr><td COLSPAN=2><hr /><CENTER>\n");
-                       wprintf("<input type=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Save changes"));
-                       wprintf("&nbsp;");
-                       wprintf("<input type=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
-                       wprintf("</CENTER></td><tr>\n");
+                       wc_printf("<CENTER>\n");
+                       wc_printf("<tr><td COLSPAN=2><hr /><CENTER>\n");
+                       wc_printf("<input type=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Save changes"));
+                       wc_printf("&nbsp;");
+                       wc_printf("<input type=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
+                       wc_printf("</CENTER></td><tr>\n");
        
-                       wprintf("</table>\n"
+                       wc_printf("</table>\n"
                                "<input type=\"hidden\" NAME=\"tab\" VALUE=\"expire\">\n"
                                "</form>\n"
                                );
                }
 
-               wprintf("</div>");
+               wc_printf("</div>");
        }
 
        /* Access controls */
        if (!strcmp(tab, "access")) {
-               wprintf("<div class=\"tabcontent\">");
+               wc_printf("<div class=\"tabcontent\">");
                display_whok();
-               wprintf("</div>");
+               wc_printf("</div>");
        }
 
        /* Fetch messages from remote locations */
        if (!strcmp(tab, "feeds")) {
-               wprintf("<div class=\"tabcontent\">");
+               wc_printf("<div class=\"tabcontent\">");
 
-               wprintf("<i>");
-               wprintf(_("Retrieve messages from these remote POP3 accounts and store them in this room:"));
-               wprintf("</i><br />\n");
+               wc_printf("<i>");
+               wc_printf(_("Retrieve messages from these remote POP3 accounts and store them in this room:"));
+               wc_printf("</i><br />\n");
 
-               wprintf("<table class=\"altern\" border=0 cellpadding=5>"
+               wc_printf("<table class=\"altern\" border=0 cellpadding=5>"
                        "<tr class=\"even\"><th>");
-               wprintf(_("Remote host"));
-               wprintf("</th><th>");
-               wprintf(_("User name"));
-               wprintf("</th><th>");
-               wprintf(_("Password"));
-               wprintf("</th><th>");
-               wprintf(_("Keep messages on server?"));
-               wprintf("</th><th>");
-               wprintf(_("Interval"));
-               wprintf("</th><th> </th></tr>");
+               wc_printf(_("Remote host"));
+               wc_printf("</th><th>");
+               wc_printf(_("User name"));
+               wc_printf("</th><th>");
+               wc_printf(_("Password"));
+               wc_printf("</th><th>");
+               wc_printf(_("Keep messages on server?"));
+               wc_printf("</th><th>");
+               wc_printf(_("Interval"));
+               wc_printf("</th><th> </th></tr>");
 
                serv_puts("GNET");
                serv_getln(buf, sizeof buf);
@@ -1998,74 +2024,74 @@ void display_editroom(void)
                                        safestrncpy(recp, &buf[11], sizeof recp);
 
                                        bg = 1 - bg;
-                                       wprintf("<tr class=\"%s\">",
+                                       wc_printf("<tr class=\"%s\">",
                                                (bg ? "even" : "odd")
                                                );
 
-                                       wprintf("<td>");
+                                       wc_printf("<td>");
                                        extract_token(pop3_host, buf, 1, '|', sizeof pop3_host);
                                        escputs(pop3_host);
-                                       wprintf("</td>");
+                                       wc_printf("</td>");
 
-                                       wprintf("<td>");
+                                       wc_printf("<td>");
                                        extract_token(pop3_user, buf, 2, '|', sizeof pop3_user);
                                        escputs(pop3_user);
-                                       wprintf("</td>");
+                                       wc_printf("</td>");
 
-                                       wprintf("<td>*****</td>");              /* Don't show the password */
+                                       wc_printf("<td>*****</td>");            /* Don't show the password */
 
-                                       wprintf("<td>%s</td>", extract_int(buf, 4) ? _("Yes") : _("No"));
+                                       wc_printf("<td>%s</td>", extract_int(buf, 4) ? _("Yes") : _("No"));
 
-                                       wprintf("<td>%ld</td>", extract_long(buf, 5));  /* Fetching interval */
+                                       wc_printf("<td>%ld</td>", extract_long(buf, 5));        /* Fetching interval */
                        
-                                       wprintf("<td class=\"button_link\">");
-                                       wprintf(" <a href=\"netedit?cmd=remove&tab=feeds&line=pop3client|");
+                                       wc_printf("<td class=\"button_link\">");
+                                       wc_printf(" <a href=\"netedit?cmd=remove?tab=feeds?line=pop3client|");
                                        urlescputs(recp);
-                                       wprintf("\">");
-                                       wprintf(_("(remove)"));
-                                       wprintf("</a></td>");
+                                       wc_printf("\">");
+                                       wc_printf(_("(remove)"));
+                                       wc_printf("</a></td>");
                        
-                                       wprintf("</tr>");
+                                       wc_printf("</tr>");
                                }
                        }
 
-               wprintf("<form method=\"POST\" action=\"netedit\">\n"
+               wc_printf("<form method=\"POST\" action=\"netedit\">\n"
                        "<tr>"
                        "<input type=\"hidden\" name=\"tab\" value=\"feeds\">"
                        "<input type=\"hidden\" name=\"prefix\" value=\"pop3client|\">\n");
-               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-               wprintf("<td>");
-               wprintf("<input type=\"text\" id=\"add_as_pop3host\" NAME=\"line_pop3host\">\n");
-               wprintf("</td>");
-               wprintf("<td>");
-               wprintf("<input type=\"text\" id=\"add_as_pop3user\" NAME=\"line_pop3user\">\n");
-               wprintf("</td>");
-               wprintf("<td>");
-               wprintf("<input type=\"password\" id=\"add_as_pop3pass\" NAME=\"line_pop3pass\">\n");
-               wprintf("</td>");
-               wprintf("<td>");
-               wprintf("<input type=\"checkbox\" id=\"add_as_pop3keep\" NAME=\"line_pop3keep\" VALUE=\"1\">");
-               wprintf("</td>");
-               wprintf("<td>");
-               wprintf("<input type=\"text\" id=\"add_as_pop3int\" NAME=\"line_pop3int\" MAXLENGTH=\"5\">");
-               wprintf("</td>");
-               wprintf("<td>");
-               wprintf("<input type=\"submit\" NAME=\"add_button\" VALUE=\"%s\">", _("Add"));
-               wprintf("</td></tr>");
-               wprintf("</form></table>\n");
-
-               wprintf("<hr>\n");
-
-               wprintf("<i>");
-               wprintf(_("Fetch the following RSS feeds and store them in this room:"));
-               wprintf("</i><br />\n");
-
-               wprintf("<table class=\"altern\" border=0 cellpadding=5>"
+               wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+               wc_printf("<td>");
+               wc_printf("<input type=\"text\" id=\"add_as_pop3host\" NAME=\"line_pop3host\">\n");
+               wc_printf("</td>");
+               wc_printf("<td>");
+               wc_printf("<input type=\"text\" id=\"add_as_pop3user\" NAME=\"line_pop3user\">\n");
+               wc_printf("</td>");
+               wc_printf("<td>");
+               wc_printf("<input type=\"password\" id=\"add_as_pop3pass\" NAME=\"line_pop3pass\">\n");
+               wc_printf("</td>");
+               wc_printf("<td>");
+               wc_printf("<input type=\"checkbox\" id=\"add_as_pop3keep\" NAME=\"line_pop3keep\" VALUE=\"1\">");
+               wc_printf("</td>");
+               wc_printf("<td>");
+               wc_printf("<input type=\"text\" id=\"add_as_pop3int\" NAME=\"line_pop3int\" MAXLENGTH=\"5\">");
+               wc_printf("</td>");
+               wc_printf("<td>");
+               wc_printf("<input type=\"submit\" NAME=\"add_button\" VALUE=\"%s\">", _("Add"));
+               wc_printf("</td></tr>");
+               wc_printf("</form></table>\n");
+
+               wc_printf("<hr>\n");
+
+               wc_printf("<i>");
+               wc_printf(_("Fetch the following RSS feeds and store them in this room:"));
+               wc_printf("</i><br />\n");
+
+               wc_printf("<table class=\"altern\" border=0 cellpadding=5>"
                        "<tr class=\"even\"><th>");
-               wprintf("<img src=\"static/rss_16x.png\" width=\"16\" height=\"16\" alt=\" \"> ");
-               wprintf(_("Feed URL"));
-               wprintf("</th><th>");
-               wprintf("</th></tr>");
+               wc_printf("<img src=\"static/rss_16x.png\" width=\"16\" height=\"16\" alt=\" \"> ");
+               wc_printf(_("Feed URL"));
+               wc_printf("</th><th>");
+               wc_printf("</th></tr>");
 
                serv_puts("GNET");
                serv_getln(buf, sizeof buf);
@@ -2076,46 +2102,46 @@ void display_editroom(void)
                                        safestrncpy(recp, &buf[10], sizeof recp);
 
                                        bg = 1 - bg;
-                                       wprintf("<tr class=\"%s\">",
+                                       wc_printf("<tr class=\"%s\">",
                                                (bg ? "even" : "odd")
                                                );
 
-                                       wprintf("<td>");
+                                       wc_printf("<td>");
                                        extract_token(pop3_host, buf, 1, '|', sizeof pop3_host);
                                        escputs(pop3_host);
-                                       wprintf("</td>");
+                                       wc_printf("</td>");
 
-                                       wprintf("<td class=\"button_link\">");
-                                       wprintf(" <a href=\"netedit?cmd=remove&tab=feeds&line=rssclient|");
+                                       wc_printf("<td class=\"button_link\">");
+                                       wc_printf(" <a href=\"netedit?cmd=remove?tab=feeds?line=rssclient|");
                                        urlescputs(recp);
-                                       wprintf("\">");
-                                       wprintf(_("(remove)"));
-                                       wprintf("</a></td>");
+                                       wc_printf("\">");
+                                       wc_printf(_("(remove)"));
+                                       wc_printf("</a></td>");
                        
-                                       wprintf("</tr>");
+                                       wc_printf("</tr>");
                                }
                        }
 
-               wprintf("<form method=\"POST\" action=\"netedit\">\n"
+               wc_printf("<form method=\"POST\" action=\"netedit\">\n"
                        "<tr>"
                        "<input type=\"hidden\" name=\"tab\" value=\"feeds\">"
                        "<input type=\"hidden\" name=\"prefix\" value=\"rssclient|\">\n");
-               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-               wprintf("<td>");
-               wprintf("<input type=\"text\" id=\"add_as_pop3host\" size=\"72\" "
+               wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+               wc_printf("<td>");
+               wc_printf("<input type=\"text\" id=\"add_as_pop3host\" size=\"72\" "
                        "maxlength=\"256\" name=\"line_pop3host\">\n");
-               wprintf("</td>");
-               wprintf("<td>");
-               wprintf("<input type=\"submit\" name=\"add_button\" value=\"%s\">", _("Add"));
-               wprintf("</td></tr>");
-               wprintf("</form></table>\n");
+               wc_printf("</td>");
+               wc_printf("<td>");
+               wc_printf("<input type=\"submit\" name=\"add_button\" value=\"%s\">", _("Add"));
+               wc_printf("</td></tr>");
+               wc_printf("</form></table>\n");
 
-               wprintf("</div>");
+               wc_printf("</div>");
        }
 
 
        /* end content of whatever tab is open now */
-       wprintf("</div>\n");
+       wc_printf("</div>\n");
 
        address_book_popup();
        wDumpContent(1);
@@ -2445,47 +2471,47 @@ void display_whok(void)
         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.  "
+       wc_printf("<table border=0 CELLSPACING=10><tr VALIGN=TOP><td>");
+       wc_printf(_("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'."));
-       wprintf("<br /><br />");
+       wc_printf("<br /><br />");
        
-        wprintf("<CENTER><form method=\"POST\" action=\"do_invt_kick\">\n");
-       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");
+        wc_printf("<CENTER><form method=\"POST\" action=\"do_invt_kick\">\n");
+       wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+       wc_printf("<input type=\"hidden\" NAME=\"tab\" VALUE=\"access\">\n");
+        wc_printf("<select NAME=\"username\" SIZE=\"10\" style=\"width:100%%\">\n");
         serv_puts("WHOK");
         serv_getln(buf, sizeof buf);
         if (buf[0] == '1') {
                 while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
                         extract_token(username, buf, 0, '|', sizeof username);
-                        wprintf("<OPTION>");
+                        wc_printf("<OPTION>");
                         escputs(username);
-                        wprintf("\n");
+                        wc_printf("\n");
                 }
         }
-        wprintf("</select><br />\n");
+        wc_printf("</select><br />\n");
 
-        wprintf("<input type=\"submit\" name=\"kick_button\" value=\"%s\">", _("Kick"));
-        wprintf("</form></CENTER>\n");
+        wc_printf("<input type=\"submit\" name=\"kick_button\" value=\"%s\">", _("Kick"));
+        wc_printf("</form></CENTER>\n");
 
-       wprintf("</td><td>");
-       wprintf(_("To grant another user access to this room, enter the "
+       wc_printf("</td><td>");
+       wc_printf(_("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=\"do_invt_kick\">\n");
-       wprintf("<input type=\"hidden\" NAME=\"tab\" VALUE=\"access\">\n");
-       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"
+       wc_printf("<br /><br />");
+
+        wc_printf("<CENTER><form method=\"POST\" action=\"do_invt_kick\">\n");
+       wc_printf("<input type=\"hidden\" NAME=\"tab\" VALUE=\"access\">\n");
+       wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+        wc_printf(_("Invite:"));
+       wc_printf(" ");
+        wc_printf("<input type=\"text\" name=\"username\" id=\"username_id\" style=\"width:100%%\"><br />\n"
                "<input type=\"hidden\" name=\"invite_button\" value=\"Invite\">"
                "<input type=\"submit\" value=\"%s\">"
                "</form></CENTER>\n", _("Invite"));
        /* Pop open an address book -- begin **/
-       wprintf(
+       wc_printf(
                "<a href=\"javascript:PopOpenAddressBook('username_id|%s');\" "
                "title=\"%s\">"
                "<img align=middle border=0 width=24 height=24 src=\"static/viewcontacts_24x.gif\">"
@@ -2495,7 +2521,7 @@ void display_whok(void)
                );
        /* Pop open an address book -- end **/
 
-       wprintf("</td></tr></table>\n");
+       wc_printf("</td></tr></table>\n");
        address_book_popup();
         wDumpContent(1);
 }
@@ -2527,31 +2553,31 @@ void display_entroom(void)
        svprintf(HKEY("BOXTITLE"), WCS_STRING, _("Create a new room"));
        do_template("beginbox", NULL);
 
-       wprintf("<form name=\"create_room_form\" method=\"POST\" action=\"entroom\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+       wc_printf("<form name=\"create_room_form\" method=\"POST\" action=\"entroom\">\n");
+       wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
 
-       wprintf("<table class=\"altern\"> ");
+       wc_printf("<table class=\"altern\"> ");
 
-       wprintf("<tr class=\"even\"><td>");
-       wprintf(_("Name of room: "));
-       wprintf("</td><td>");
-       wprintf("<input type=\"text\" NAME=\"er_name\" MAXLENGTH=\"127\">\n");
-        wprintf("</td></tr>");
+       wc_printf("<tr class=\"even\"><td>");
+       wc_printf(_("Name of room: "));
+       wc_printf("</td><td>");
+       wc_printf("<input type=\"text\" NAME=\"er_name\" MAXLENGTH=\"127\">\n");
+        wc_printf("</td></tr>");
 
-       wprintf("<tr class=\"odd\"><td>");
-       wprintf(_("Resides on floor: "));
-       wprintf("</td><td>");
+       wc_printf("<tr class=\"odd\"><td>");
+       wc_printf(_("Resides on floor: "));
+       wc_printf("</td><td>");
         load_floorlist(Buf); 
-        wprintf("<select name=\"er_floor\" size=\"1\">\n");
+        wc_printf("<select name=\"er_floor\" size=\"1\">\n");
         for (i = 0; i < 128; ++i)
                 if (!IsEmptyStr(floorlist[i])) {
-                        wprintf("<option ");
-                        wprintf("value=\"%d\">", i);
+                        wc_printf("<option ");
+                        wc_printf("value=\"%d\">", i);
                         escputs(floorlist[i]);
-                        wprintf("</option>\n");
+                        wc_printf("</option>\n");
                 }
-        wprintf("</select>\n");
-        wprintf("</td></tr>");
+        wc_printf("</select>\n");
+        wc_printf("</td></tr>");
 
        /*
         * Our clever little snippet of JavaScript automatically selects
@@ -2559,10 +2585,10 @@ void display_entroom(void)
         * it selects a mailbox room otherwise.  The user can override this,
         * of course.  We also disable the floor selector for mailboxes.
         */
-       wprintf("<tr class=\"even\"><td>");
-       wprintf(_("Default view for room: "));
-       wprintf("</td><td>");
-        wprintf("<select name=\"er_view\" size=\"1\" OnChange=\""
+       wc_printf("<tr class=\"even\"><td>");
+       wc_printf(_("Default view for room: "));
+       wc_printf("</td><td>");
+        wc_printf("<select name=\"er_view\" size=\"1\" OnChange=\""
                "       if ( (this.form.er_view.value == 0)             "
                "          || (this.form.er_view.value == 6) ) {        "
                "               this.form.type[0].checked=true;         "
@@ -2575,72 +2601,72 @@ void display_entroom(void)
                "\">\n");
        for (i=0; i<(sizeof viewdefs / sizeof (char *)); ++i) {
                if (is_view_allowed_as_default(i)) {
-                       wprintf("<option %s value=\"%d\">",
+                       wc_printf("<option %s value=\"%d\">",
                                ((i == 0) ? "selected" : ""), i );
                        escputs(viewdefs[i]);
-                       wprintf("</option>\n");
+                       wc_printf("</option>\n");
                }
        }
-       wprintf("</select>\n");
-       wprintf("</td></tr>");
+       wc_printf("</select>\n");
+       wc_printf("</td></tr>");
 
-       wprintf("<tr class=\"even\"><td>");
-       wprintf(_("Type of room:"));
-       wprintf("</td><td>");
-       wprintf("<ul class=\"adminlist\">\n");
+       wc_printf("<tr class=\"even\"><td>");
+       wc_printf(_("Type of room:"));
+       wc_printf("</td><td>");
+       wc_printf("<ul class=\"adminlist\">\n");
 
-       wprintf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"public\" ");
-       wprintf("CHECKED OnChange=\""
+       wc_printf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"public\" ");
+       wc_printf("CHECKED OnChange=\""
                "       if (this.form.type[0].checked == true) {        "
                "               this.form.er_floor.disabled = false;    "
                "       }                                               "
                "\"> ");
-       wprintf(_("Public (automatically appears to everyone)"));
-       wprintf("</li>");
+       wc_printf(_("Public (automatically appears to everyone)"));
+       wc_printf("</li>");
 
-       wprintf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"hidden\" OnChange=\""
+       wc_printf("\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("</li>");
+       wc_printf(_("Private - hidden (accessible to anyone who knows its name)"));
+       wc_printf("</li>");
 
-       wprintf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"passworded\" OnChange=\""
+       wc_printf("\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>");
+       wc_printf(_("Private - require password: "));
+       wc_printf("<input type=\"text\" NAME=\"er_password\" MAXLENGTH=\"9\">\n");
+       wc_printf("</li>");
 
-       wprintf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"invonly\" OnChange=\""
+       wc_printf("<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("</li>");
+       wc_printf(_("Private - invitation only"));
+       wc_printf("</li>");
 
-       wprintf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"personal\" "
+       wc_printf("\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("</li>");
-
-       wprintf("\n</ul>\n");
-       wprintf("</td></tr></table>\n");
-
-       wprintf("<div class=\"buttons\">\n");
-       wprintf("<input type=\"submit\" name=\"ok_button\" value=\"%s\">", _("Create new room"));
-       wprintf("&nbsp;");
-       wprintf("<input type=\"submit\" name=\"cancel_button\" value=\"%s\">", _("Cancel"));
-       wprintf("</div>\n");
-       wprintf("</form>\n<hr />");
+       wc_printf(_("Personal (mailbox for you only)"));
+       wc_printf("</li>");
+
+       wc_printf("\n</ul>\n");
+       wc_printf("</td></tr></table>\n");
+
+       wc_printf("<div class=\"buttons\">\n");
+       wc_printf("<input type=\"submit\" name=\"ok_button\" value=\"%s\">", _("Create new room"));
+       wc_printf("&nbsp;");
+       wc_printf("<input type=\"submit\" name=\"cancel_button\" value=\"%s\">", _("Cancel"));
+       wc_printf("</div>\n");
+       wc_printf("</form>\n<hr />");
        serv_printf("MESG roomaccess");
        serv_getln(buf, sizeof buf);
        if (buf[0] == '1') {
@@ -2704,6 +2730,7 @@ void entroom(void)
        int er_floor;
        int er_num_type;
        int er_view;
+       wcsession *WCC = WC;
 
        if (!havebstr("ok_button")) {
                strcpy(WC->ImportantMessage,
@@ -2737,16 +2764,25 @@ void entroom(void)
 
        serv_getln(buf, sizeof buf);
        if (buf[0] != '2') {
-               strcpy(WC->ImportantMessage, &buf[4]);
+               strcpy(WCC->ImportantMessage, &buf[4]);
                display_main_menu();
                return;
        }
-       /** TODO: Room created, now udate the left hand icon bar for this user */
+       /** TODO: Room created, now update the left hand icon bar for this user */
        burn_folder_cache(0);   /* burn the old folder cache */
        
-       
        gotoroom(er_name);
-       do_change_view(er_view);                /* Now go there */
+
+       serv_printf("VIEW %d", er_view);
+       serv_getln(buf, sizeof buf);
+       WCC->CurRoom.view = er_view;
+
+       if ( (WCC != NULL) && ( (WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) )  {
+               display_editroom ();
+       } else {
+               do_change_view(er_view);                /* Now go there */
+       }
+
 }
 
 
@@ -2767,40 +2803,40 @@ void display_private(char *rname, int req_pass)
 
        FreeStrBuf(&Buf);
 
-       wprintf("<p>");
-       wprintf(_("If you know the name of a hidden (guess-name) or "
+       wc_printf("<p>");
+       wc_printf(_("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("</p>");
+       wc_printf("</p>");
 
-       wprintf("<form method=\"post\" action=\"goto_private\">\n");
-       wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+       wc_printf("<form method=\"post\" action=\"goto_private\">\n");
+       wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
 
-       wprintf("<table class=\"altern\"> "
+       wc_printf("<table class=\"altern\"> "
                "<tr class=\"even\"><td>");
-       wprintf(_("Enter room name:"));
-       wprintf("</td><td>"
+       wc_printf(_("Enter room name:"));
+       wc_printf("</td><td>"
                "<input type=\"text\" name=\"gr_name\" "
                "value=\"%s\" maxlength=\"128\">\n", rname);
 
        if (req_pass) {
-               wprintf("</td></tr><tr class=\"odd\"><td>");
-               wprintf(_("Enter room password:"));
-               wprintf("</td><td>");
-               wprintf("<input type=\"password\" name=\"gr_pass\" maxlength=\"9\">\n");
+               wc_printf("</td></tr><tr class=\"odd\"><td>");
+               wc_printf(_("Enter room password:"));
+               wc_printf("</td><td>");
+               wc_printf("<input type=\"password\" name=\"gr_pass\" maxlength=\"9\">\n");
        }
-       wprintf("</td></tr></table>\n");
+       wc_printf("</td></tr></table>\n");
 
-       wprintf("<div class=\"buttons\">\n");
-       wprintf("<input type=\"submit\" name=\"ok_button\" value=\"%s\">"
+       wc_printf("<div class=\"buttons\">\n");
+       wc_printf("<input type=\"submit\" name=\"ok_button\" value=\"%s\">"
                "&nbsp;"
                "<input type=\"submit\" name=\"cancel_button\" value=\"%s\">",
                _("Go there"),
                _("Cancel")
                );
-       wprintf("</div></form>\n");
+       wc_printf("</div></form>\n");
 
        do_template("endbox", NULL);
 
@@ -2819,7 +2855,7 @@ void goto_private(void)
                display_main_menu();
                return;
        }
-       strcpy(hold_rm, ChrPtr(WC->wc_roomname));
+       strcpy(hold_rm, ChrPtr(WC->CurRoom.name));
        serv_printf("GOTO %s|%s",
                    bstr("gr_name"),
                    bstr("gr_pass"));
@@ -2834,7 +2870,7 @@ void goto_private(void)
                return;
        }
        output_headers(1, 1, 1, 0, 0, 0);
-       wprintf("%s\n", &buf[4]);
+       wc_printf("%s\n", &buf[4]);
        wDumpContent(1);
        return;
 }
@@ -2847,24 +2883,24 @@ void display_zap(void)
 {
        output_headers(1, 1, 2, 0, 0, 0);
 
-       wprintf("<div id=\"banner\">\n");
-       wprintf("<h1>");
-       wprintf(_("Zap (forget/unsubscribe) the current room"));
-       wprintf("</h1>\n");
-       wprintf("</div>\n");
+       wc_printf("<div id=\"banner\">\n");
+       wc_printf("<h1>");
+       wc_printf(_("Zap (forget/unsubscribe) the current room"));
+       wc_printf("</h1>\n");
+       wc_printf("</div>\n");
 
-       wprintf("<div id=\"content\" class=\"service\">\n");
+       wc_printf("<div id=\"content\" class=\"service\">\n");
 
-       wprintf(_("If you select this option, <em>%s</em> will "
+       wc_printf(_("If you select this option, <em>%s</em> will "
                  "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=\"%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"));
-       wprintf("</form>\n");
+                 "to do?<br />\n"), ChrPtr(WC->CurRoom.name));
+
+       wc_printf("<form method=\"POST\" action=\"zap\">\n");
+       wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
+       wc_printf("<input type=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Zap this room"));
+       wc_printf("&nbsp;");
+       wc_printf("<input type=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
+       wc_printf("</form>\n");
        wDumpContent(1);
 }
 
@@ -2881,10 +2917,10 @@ void zap(void)
         * If the forget-room routine fails for any reason, we fall back
         * to the current room; otherwise, we go to the Lobby
         */
-       final_destination = NewStrBufDup(WC->wc_roomname);
+       final_destination = NewStrBufDup(WC->CurRoom.name);
 
        if (havebstr("ok_button")) {
-               serv_printf("GOTO %s", ChrPtr(WC->wc_roomname));
+               serv_printf("GOTO %s", ChrPtr(WC->CurRoom.name));
                serv_getln(buf, sizeof buf);
                if (buf[0] == '2') {
                        serv_puts("FORG");
@@ -3082,8 +3118,8 @@ void do_change_view(int newview) {
 
        serv_printf("VIEW %d", newview);
        serv_getln(buf, sizeof buf);
-       WC->wc_view = newview;
-       smart_goto(WC->wc_roomname);
+       WC->CurRoom.view = newview;
+       smart_goto(WC->CurRoom.name);
 }
 
 
@@ -3098,363 +3134,6 @@ void change_view(void) {
        do_change_view(view);
 }
 
-
-/**
- * \brief One big expanded tree list view --- like a folder list
- * \param fold the folder to view
- * \param max_folders how many folders???
- * \param num_floors hom many floors???
- */
-void do_folder_view(struct folder *fold, int max_folders, int num_floors) {
-       char buf[SIZ];
-       int levels;
-       int i;
-       int has_subfolders = 0;
-       int *parents;
-
-       parents = malloc(max_folders * sizeof(int));
-
-       /** BEGIN TREE MENU */
-       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;
-               if ((i+1) < max_folders) {
-                       int len;
-                       len = strlen(fold[i].name);
-                       if ( (!strncasecmp(fold[i].name, fold[i+1].name, len))
-                            && (fold[i+1].name[len] == '|') ) {
-                               has_subfolders = 1;
-                       }
-               }
-
-               levels = num_tokens(fold[i].name, '|');
-               parents[levels] = i;
-
-               wprintf("var node%d = new TreeNode(%d, '", i, i);
-
-               if (fold[i].selectable) {
-                       wprintf("<a href=\"dotgoto?room=");
-                       urlescputs(fold[i].room);
-                       wprintf("\">");
-               }
-
-               if (levels == 1) {
-                       wprintf("<span class=\"roomlist_floor\">");
-               }
-               else if (fold[i].hasnewmsgs) {
-                       wprintf("<span class=\"roomlist_new\">");
-               }
-               else {
-                       wprintf("<span class=\"roomlist_old\">");
-               }
-               extract_token(buf, fold[i].name, levels-1, '|', sizeof buf);
-               escputs(buf);
-               wprintf("</span>");
-
-               wprintf("</a>', ");
-               if (has_subfolders) {
-                       wprintf("new Array(closedGif, openGif)");
-               }
-               else if (fold[i].view == VIEW_ADDRESSBOOK) {
-                       wprintf("'static/viewcontacts_16x.gif'");
-               }
-               else if (fold[i].view == VIEW_CALENDAR) {
-                       wprintf("'static/calarea_16x.gif'");
-               }
-               else if (fold[i].view == VIEW_CALBRIEF) {
-                       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");
-
-               if (levels < 2) {
-                       wprintf("rootNode.addChild(node%d);\n", i);
-               }
-               else {
-                       wprintf("node%d.addChild(node%d);\n", parents[levels-1], i);
-               }
-       }
-
-       wprintf("container = document.getElementById('roomlist_div');   \n"
-               "showTree('');  \n"
-               "</script>\n"
-               );
-
-       free(parents);
-       /** END TREE MENU */
-}
-
-/**
- * \brief Boxes and rooms and lists ... oh my!
- * \param fold the folder to view
- * \param max_folders how many folders???
- * \param num_floors hom many floors???
- */
-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];
-       int levels, oldlevels;
-       int i, t;
-       int num_boxes = 0;
-       static int columns = 3;
-       int boxes_per_column = 0;
-       int current_column = 0;
-       int nf;
-
-       strcpy(floor_name, "");
-       strcpy(old_floor_name, "");
-
-       nf = num_floors;
-       while (nf % columns != 0) ++nf;
-       boxes_per_column = (nf / columns);
-       if (boxes_per_column < 1) boxes_per_column = 1;
-
-       /** Outer table (for columnization) */
-       wprintf("<table BORDER=0 WIDTH=96%% CELLPADDING=5>"
-               "<tr><td valign=top>");
-
-       levels = 0;
-       oldlevels = 0;
-       for (i=0; i<max_folders; ++i) {
-
-               levels = num_tokens(fold[i].name, '|');
-               extract_token(floor_name, fold[i].name, 0,
-                             '|', sizeof floor_name);
-
-               if ( (strcasecmp(floor_name, old_floor_name))
-                    && (!IsEmptyStr(old_floor_name)) ) {
-                       /* End inner box */
-                       do_template("endbox", NULL);
-                       wprintf("<br>");
-
-                       ++num_boxes;
-                       if ((num_boxes % boxes_per_column) == 0) {
-                               ++current_column;
-                               if (current_column < columns) {
-                                       wprintf("</td><td valign=top>\n");
-                               }
-                       }
-               }
-               strcpy(old_floor_name, floor_name);
-
-               if (levels == 1) {
-                       StrBuf *Buf;
-                       WCTemplputParams SubTP;
-
-                       Buf = NewStrBufPlain(floor_name, -1);
-                       memset(&SubTP, 0, sizeof(WCTemplputParams));
-                       SubTP.Filter.ContextType = CTX_STRBUF;
-                       SubTP.Context = Buf;
-                       DoTemplate(HKEY("beginbox"), NULL, &SubTP);
-                       
-                       FreeStrBuf(&Buf);
-               }
-
-               oldlevels = levels;
-
-               if (levels > 1) {
-                       wprintf("&nbsp;");
-                       if (levels>2) for (t=0; t<(levels-2); ++t) wprintf("&nbsp;&nbsp;&nbsp;");
-                       if (fold[i].selectable) {
-                               wprintf("<a href=\"dotgoto?room=");
-                               urlescputs(fold[i].room);
-                               wprintf("\">");
-                       }
-                       else {
-                               wprintf("<i>");
-                       }
-                       if (fold[i].hasnewmsgs) {
-                               wprintf("<span class=\"roomlist_new\">");
-                       }
-                       else {
-                               wprintf("<span class=\"roomlist_old\">");
-                       }
-                       extract_token(buf, fold[i].name, levels-1, '|', sizeof buf);
-                       escputs(buf);
-                       wprintf("</span>");
-                       if (fold[i].selectable) {
-                               wprintf("</A>");
-                       }
-                       else {
-                               wprintf("</i>");
-                       }
-                       if (!strcasecmp(fold[i].name, "My Folders|Mail")) {
-                               wprintf(" (INBOX)");
-                       }
-                       wprintf("<br />\n");
-               }
-       }
-       /** End the final inner box */
-       do_template("endbox", NULL);
-
-       wprintf("</td></tr></table>\n");
-}
-
-/**
- * \brief print a floor div???
- * \param which_floordiv name of the floordiv???
- */
-void set_floordiv_expanded(void) {
-       wcsession *WCC = WC;
-       StrBuf *FloorDiv;
-       
-       FloorDiv = NewStrBuf();
-       StrBufExtract_token(FloorDiv, WCC->Hdr->HR.ReqLine, 0, '/');
-       set_preference("floordiv_expanded", FloorDiv, 1);
-       WCC->floordiv_expanded = FloorDiv;
-}
-
-/**
- * \brief view the iconbar
- * \param fold the folder to view
- * \param max_folders how many folders???
- * \param num_floors hom many floors???
- */
-void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
-       char buf[256];
-       char floor_name[256];
-       char old_floor_name[256];
-       char floordivtitle[256];
-       char floordiv_id[32];
-       int levels, oldlevels;
-       int i, t;
-       char *icon = NULL;
-
-       strcpy(floor_name, "");
-       strcpy(old_floor_name, "");
-
-       levels = 0;
-       oldlevels = 0;
-       for (i=0; i<max_folders; ++i) {
-
-               levels = num_tokens(fold[i].name, '|');
-               extract_token(floor_name, fold[i].name, 0,
-                             '|', sizeof floor_name);
-
-               if ( (strcasecmp(floor_name, old_floor_name))
-                    && (!IsEmptyStr(old_floor_name)) ) {
-                       /** End inner box */
-                       wprintf("<br>\n");
-                       wprintf("</div>\n");    /** floordiv */
-               }
-               strcpy(old_floor_name, floor_name);
-
-               if (levels == 1) {
-                       /** Begin floor */
-                       stresc(floordivtitle, 256, floor_name, 0, 0);
-                       sprintf(floordiv_id, "floordiv%d", i);
-                       wprintf("<span class=\"ib_roomlist_floor\" "
-                               "onClick=\"expand_floor('%s')\">"
-                               "%s</span><br>\n", floordiv_id, floordivtitle);
-                       wprintf("<div id=\"%s\" style=\"display:%s\">",
-                               floordiv_id,
-                               (!strcasecmp(floordiv_id, ChrPtr(WC->floordiv_expanded)) ? "block" : "none")
-                               );
-               }
-
-               oldlevels = levels;
-
-               if (levels > 1) {
-                       wprintf("<div id=\"roomdiv%d\">", i);
-                       wprintf("&nbsp;");
-                       if (levels>2) for (t=0; t<(levels-2); ++t) wprintf("&nbsp;");
-
-                       /** choose the icon */
-                       if (fold[i].view == VIEW_ADDRESSBOOK) {
-                               icon = "viewcontacts_16x.gif" ;
-                       }
-                       else if (fold[i].view == VIEW_CALENDAR) {
-                               icon = "calarea_16x.gif" ;
-                       }
-                       else if (fold[i].view == VIEW_CALBRIEF) {
-                               icon = "calarea_16x.gif" ;
-                       }
-                       else if (fold[i].view == VIEW_TASKS) {
-                               icon = "taskmanag_16x.gif" ;
-                       }
-                       else if (fold[i].view == VIEW_NOTES) {
-                               icon = "storenotes_16x.gif" ;
-                       }
-                       else if (fold[i].view == VIEW_MAILBOX) {
-                               icon = "privatemess_16x.gif" ;
-                       }
-                       else {
-                               icon = "chatrooms_16x.gif" ;
-                       }
-
-                       if (fold[i].selectable) {
-                               wprintf("<a href=\"dotgoto?room=");
-                               urlescputs(fold[i].room);
-                               wprintf("\">");
-                               wprintf("<img  border=0 src=\"static/%s\" alt=\"\"> ", icon);
-                       }
-                       else {
-                               wprintf("<i>");
-                       }
-                       if (fold[i].hasnewmsgs) {
-                               wprintf("<span class=\"ib_roomlist_new\">");
-                       }
-                       else {
-                               wprintf("<span class=\"ib_roomlist_old\">");
-                       }
-                       extract_token(buf, fold[i].name, levels-1, '|', sizeof buf);
-                       escputs(buf);
-                       if (!strcasecmp(fold[i].name, "My Folders|Mail")) {
-                               wprintf(" (INBOX)");
-                       }
-                       wprintf("</span>");
-                       if (fold[i].selectable) {
-                               wprintf("</A>");
-                       }
-                       else {
-                               wprintf("</i>");
-                       }
-                       wprintf("<br />");
-                       wprintf("</div>\n");    /** roomdiv */
-               }
-       }
-       wprintf("</div>\n");    /** floordiv */
-
-
-}
-
-
-
 /**
  * \brief Burn the cached folder list.  
  * \param age How old the cahce needs to be before we burn it.
@@ -3473,189 +3152,6 @@ void burn_folder_cache(time_t age)
 
 
 
-
-/**
- * \brief Show the room list.  
- * (only should get called by
- * knrooms() because that's where output_headers() is called from)
- * \param viewpref the view preferences???
- */
-
-void list_all_rooms_by_floor(const char *viewpref) {
-       StrBuf *Buf;
-       char buf[SIZ];
-       int swap = 0;
-       struct folder *fold = NULL;
-       struct folder ftmp;
-       int max_folders = 0;
-       int alloc_folders = 0;
-       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 buf3[SIZ];
-       
-       /** If our cached folder list is very old, burn it. */
-       burn_folder_cache(300);
-       
-       /** Can we do the iconbar roomlist from cache? */
-       if ((WC->cache_fold != NULL) && (!strcasecmp(viewpref, "iconbar"))) {
-               do_iconbar_view(WC->cache_fold, WC->cache_max_folders, WC->cache_num_floors);
-               return;
-       }
-       Buf = NewStrBuf();
-
-       /** Grab the floor table so we know how to build the list... */
-       load_floorlist(Buf);
-       FreeStrBuf(&Buf);
-       /** Start with the mailboxes */
-       max_folders = 1;
-       alloc_folders = 1;
-       fold = malloc(sizeof(struct folder));
-       memset(fold, 0, sizeof(struct folder));
-       strcpy(fold[0].name, "My folders");
-       fold[0].is_mailbox = 1;
-
-       /** Then add floors */
-       serv_puts("LFLR");
-       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_token(fold[max_folders].name, buf, 1, '|', sizeof fold[max_folders].name);
-                       extract_token(buf3, buf, 0, '|', SIZ);
-                       fold[max_folders].floor = atol (buf3);
-                       ++max_folders;
-                       ++num_floors;
-               }
-       IDMax = 0;
-       for (i=0; i<num_floors; i++)
-               if (IDMax < fold[i].floor)
-                       IDMax = fold[i].floor;
-       floor_mapping = malloc (sizeof (int) * (IDMax + 1));
-       memset (floor_mapping, 0, sizeof (int) * (IDMax + 1));
-       for (i=0; i<num_floors; i++)
-               floor_mapping[fold[i].floor]=i;
-       
-       /** refresh the messages index for this room */
-/* TODO        serv_puts("GOTO ");
-   while (serv_getln(buf, sizeof buf), strcmp(buf, "000")); */
-       /** Now add rooms */
-       serv_puts("LKRA");
-       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_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);
-                       fold[max_folders].hasnewmsgs =
-                               ((ra_flags & UA_HASNEWMSGS) ? 1 : 0 );
-                       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,
-                                      fold[max_folders].is_mailbox);
-                       fold[max_folders].selectable = 1;
-                       /* Increase the room count for the associtaed floor */
-                       if (fold[max_folders].is_mailbox) {
-                               fold[0].num_rooms++;
-                       }
-                       else {
-                               i = floor_mapping[fold[max_folders].floor];
-                               fold[i].num_rooms++;
-                       }
-                       ++max_folders;
-               }
-       
-       /*
-        * Remove any floors that don't have rooms
-        */
-       get_pref_yesno("emptyfloors", &ShowEmptyFloors, 0);
-       if (ShowEmptyFloors)
-       {
-               for (i=0; i<num_floors; i++)
-               {
-                       if (fold[i].num_rooms == 0) {
-                               for (j=i; j<max_folders; j++) {
-                                       memcpy(&fold[j], &fold[j+1], sizeof(struct folder));
-                               }
-                               max_folders--;
-                               num_floors--;
-                               i--;
-                       }
-               }
-       }
-       
-       /** Bubble-sort the folder list */
-       for (i=0; i<max_folders; ++i) {
-               for (j=0; j<(max_folders-1)-i; ++j) {
-                       if (fold[j].is_mailbox == fold[j+1].is_mailbox) {
-                               swap = strcasecmp(fold[j].name, fold[j+1].name);
-                       }
-                       else {
-                               if ( (fold[j+1].is_mailbox)
-                                    && (!fold[j].is_mailbox)) {
-                                       swap = 1;
-                               }
-                               else {
-                                       swap = 0;
-                               }
-                       }
-                       if (swap > 0) {
-                               memcpy(&ftmp, &fold[j], sizeof(struct folder));
-                               memcpy(&fold[j], &fold[j+1],
-                                      sizeof(struct folder));
-                               memcpy(&fold[j+1], &ftmp,
-                                      sizeof(struct folder));
-                       }
-               }
-       }
-
-
-       if (!strcasecmp(viewpref, "folders")) {
-               do_folder_view(fold, max_folders, num_floors);
-       }
-       else if (!strcasecmp(viewpref, "hackish_view")) {
-               for (i=0; i<max_folders; ++i) {
-                       escputs(fold[i].name);
-                       wprintf("<br />\n");
-               }
-       }
-       else if (!strcasecmp(viewpref, "iconbar")) {
-               do_iconbar_view(fold, max_folders, num_floors);
-       }
-       else {
-               do_rooms_view(fold, max_folders, num_floors);
-       }
-
-       /* Don't free the folder list ... cache it for future use! */
-       if (WC->cache_fold != NULL) {
-               free(WC->cache_fold);
-       }
-       WC->cache_fold = fold;
-       WC->cache_max_folders = max_folders;
-       WC->cache_num_floors = num_floors;
-       WC->cache_timestamp = time(NULL);
-       free(floor_mapping);
-}
-
-
 /**
  * \brief Do either a known rooms list or a folders list, depending on the
  * user's preference
@@ -3664,75 +3160,29 @@ void knrooms(void)
 {
        StrBuf *ListView = NULL;
 
-       output_headers(1, 1, 2, 0, 0, 0);
-
        /** Determine whether the user is trying to change views */
        if (havebstr("view")) {
-               ListView = NewStrBufPlain(bstr("view"), -1);
+               ListView = NewStrBufDup(SBSTR("view"));
                set_preference("roomlistview", ListView, 1);
        }
        /** Sanitize the input so its safe */
-       if(!get_preference("roomlistview", &ListView) ||
+       if((get_preference("roomlistview", &ListView) != 0)||
           ((strcasecmp(ChrPtr(ListView), "folders") != 0) &&
            (strcasecmp(ChrPtr(ListView), "table") != 0))) 
        {
                if (ListView == NULL) {
-                       ListView = NewStrBufPlain("rooms", sizeof("rooms") - 1);
+                       ListView = NewStrBufPlain(HKEY("rooms"));
                        set_preference("roomlistview", ListView, 0);
+                       ListView = NULL;
                }
                else {
-                       StrBufPrintf(ListView, "rooms");
-                       save_preferences();
+                       ListView = NewStrBufPlain(HKEY("rooms"));
+                       set_preference("roomlistview", ListView, 0);
+                       ListView = NULL;
                }
        }
-
-       /** title bar */
-       wprintf("<div id=\"banner\">\n");
-       wprintf("<div class=\"room_banner\" id=\"room_banner\">");
-       wprintf("<h1>");
-       if (!strcasecmp(ChrPtr(ListView), "rooms")) {
-               wprintf(_("Room list"));
-       }
-       else if (!strcasecmp(ChrPtr(ListView), "folders")) {
-               wprintf(_("Folder list"));
-       }
-       else if (!strcasecmp(ChrPtr(ListView), "table")) {
-               wprintf(_("Room list"));
-       }
-       wprintf("</h1></div>\n");
-       
-       /** offer the ability to switch views */
-       wprintf("<div id=\"actiondiv\">");
-       wprintf("<ul class=\"room_actions\">\n");
-       wprintf("<li class=\"start_page\">");
-       offer_start_page(NULL, &NoCtx);
-       wprintf("</li>");
-       wprintf("<li><form name=\"roomlistomatic\">\n"
-               "<select name=\"newview\" size=\"1\" "
-               "OnChange=\"location.href=roomlistomatic.newview.options"
-               "[selectedIndex].value\">\n");
-
-       wprintf("<option %s value=\"knrooms?view=rooms\">"
-               "View as room list"
-               "</option>\n",
-               ( !strcasecmp(ChrPtr(ListView), "rooms") ? "SELECTED" : "" )
-               );
-
-       wprintf("<option %s value=\"knrooms?view=folders\">"
-               "View as folder list"
-               "</option>\n",
-               ( !strcasecmp(ChrPtr(ListView), "folders") ? "SELECTED" : "" )
-               );
-
-       wprintf("</select>");
-       wprintf("</form></li>");
-       wprintf("</ul></div></div>\n");
-
-       wprintf("<div id=\"content\" class=\"service\">\n");
-
-       /** Display the room list in the user's preferred format */
-       list_all_rooms_by_floor(ChrPtr(ListView));
-       wDumpContent(1);
+       FreeStrBuf(&ListView);
+       url_do_template();
 }
 
 
@@ -3764,136 +3214,11 @@ void set_room_policy(void) {
        display_editroom();
 }
 
-HashList *GetFloorListHash(StrBuf *Target, WCTemplputParams *TP) {
-       /* todo: check context */
-       const char *Err;
-       StrBuf *Buf;
-       StrBuf *Buf2;
-       HashList *floors;
-       HashList *floor;
-       floors = NewHash(1, NULL);
-       Buf = NewStrBuf();
-       serv_puts("LFLR"); /* get floors */
-       StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err); /* '100', we hope */
-       if (GetServerStatus(Buf, NULL) == 1) 
-               while(StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err), strcmp(ChrPtr(Buf), "000")) {
-                       int a;
-                       const StrBuf *floorNum = NULL;
-                       floor = NewHash(1, NULL);
-                       for(a=0; a<FLOOR_PARAM_LEN; a++) {
-                               Buf2 = NewStrBuf();
-                               StrBufExtract_token(Buf2, Buf, a, '|');
-                               if (a==0) {
-                                       floorNum = Buf2; /* hmm, should we copy Buf2 first? */
-                                       
-                               }
-                               Put(floor, CKEY(FLOOR_PARAM_NAMES[a]), Buf2, HFreeStrBuf);
-                       }
-                       Put(floors, SKEY(floorNum), floor, HDeleteHash);
-               }
-       FreeStrBuf(&Buf);
-       return floors;
-}
-
-void tmplput_FLOOR_Value(StrBuf *TemplBuffer, WCTemplputParams *TP) 
-{
-       StrBuf *val;
-       HashList *floor = (HashList *)(TP->Context);
-       void *value;
-       GetHash(floor, TKEY(0), &value);
-       val = (StrBuf *)value;
-       StrECMAEscAppend(TemplBuffer, val, 0);
-}
-HashList *GetRoomListHashLKRA(StrBuf *Target, WCTemplputParams *TP) 
-{
-       serv_puts("LKRA");
-       return GetRoomListHash(Target, TP);
-}
-HashList *GetRoomListHash(StrBuf *Target, WCTemplputParams *TP) 
-{
-       /* TODO: Check context */
-       HashList *rooms;
-       HashList *room;
-       StrBuf *buf;
-       StrBuf *buf2;
-       const char *Err;
-       buf = NewStrBuf();
-       rooms = NewHash(1, NULL);
-       StrBufTCP_read_line(buf, &WC->serv_sock, 0, &Err);
-       if (GetServerStatus(buf, NULL) == 1) 
-               while(StrBufTCP_read_line(buf, &WC->serv_sock, 0, &Err), strcmp(ChrPtr(buf), "000")) {
-                       int i;
-                       StrBuf *rmName = NULL;
-                       room = NewHash(1, NULL);
-                       for(i=0; i<ROOM_PARAM_LEN; i++) {
-                               buf2 = NewStrBuf();
-                               StrBufExtract_token(buf2, buf, i, '|');
-                               if (i==0) {
-                                       rmName = buf2;
-                               }
-                               Put(room, CKEY(ROOM_PARAM_NAMES[i]), buf2, HFreeStrBuf);
-                       }
-                       Put(rooms, SKEY(rmName), room, HDeleteHash);
-               }
-       SortByHashKey(rooms, 1);
-       /*SortByPayload(rooms, SortRoomsByListOrder);  */
-       FreeStrBuf(&buf);
-       return rooms;
-}
-/** Unused function that orders rooms by the listorder flag */
-int SortRoomsByListOrder(const void *room1, const void *room2) 
-{
-       int l1;
-       int l2;
-       HashList *r1 = (HashList *)GetSearchPayload(room1);
-       HashList *r2 = (HashList *)GetSearchPayload(room2);
-       StrBuf *listOrderBuf1;
-       StrBuf *listOrderBuf2;
-  
-       GetHash(r1, CKEY(ROOM_PARAM_NAMES[3]), (void *)&listOrderBuf1);
-       GetHash(r2, CKEY(ROOM_PARAM_NAMES[3]), (void *)&listOrderBuf2);
-       l1 = atoi(ChrPtr(listOrderBuf1));
-       l2 = atoi(ChrPtr(listOrderBuf2));
-       if (l1 < l2) return -1;
-       else if (l1 > l2) return +1;
-       else return 0;
-}
-void tmplput_ROOM_Value(StrBuf *TemplBuffer, WCTemplputParams *TP) 
-{
-       void *value;
-       StrBuf *val;
-       HashList *room = (HashList *)(TP->Context);
-
-       GetHash(room, TKEY(0), &value);
-       val = (StrBuf *)value;
-       StrECMAEscAppend(TemplBuffer, val, 0);
-}
-void jsonRoomFlr(void) 
-{
-       /* Send as our own (application/json) content type */
-       hprintf("HTTP/1.1 200 OK\r\n");
-       hprintf("Content-type: application/json; charset=utf-8\r\n");
-       hprintf("Server: %s / %s\r\n", PACKAGE_STRING, ChrPtr(WC->serv_info->serv_software));
-       hprintf("Connection: close\r\n");
-       hprintf("Pragma: no-cache\r\nCache-Control: no-store\r\nExpires:-1\r\n");
-       begin_burst();
-       DoTemplate(HKEY("json_roomflr"),NULL,&NoCtx);
-       end_burst(); 
-}
-
 void tmplput_RoomName(StrBuf *Target, WCTemplputParams *TP)
 {
-       StrBufAppendTemplate(Target, TP, WC->wc_roomname, 0);
+       StrBufAppendTemplate(Target, TP, WC->CurRoom.name, 0);
 }
 
-void _gotonext(void) {
-       slrp_highest();
-       gotonext();
-}
-
-void dotskip(void) {
-       smart_goto(sbstr("room"));
-}
 
 void _display_private(void) {
        display_private("", 0);
@@ -3901,160 +3226,120 @@ void _display_private(void) {
 
 void dotgoto(void) {
        if (!havebstr("room")) {
-               readloop(readnew);
+               readloop(readnew, eUseDefault);
                return;
        }
-       if (WC->wc_view != VIEW_MAILBOX) {      /* dotgoto acts like dotskip when we're in a mailbox view */
+       if (WC->CurRoom.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)
+void tmplput_current_room(StrBuf *Target, WCTemplputParams *TP)
 {
        wcsession *WCC = WC;
 
-       if ((WCC!=NULL) && 
-           (!IsEmptyStr(WCC->ugname)))
-               StrBufAppendBufPlain(Target, WCC->ugname, -1, 0);
+       if (WCC != NULL)
+               StrBufAppendTemplate(Target, TP, 
+                                    WCC->CurRoom.name, 
+                                    0); 
 }
 
-
-int ConditionalHaveUngoto(StrBuf *Target, WCTemplputParams *TP)
+void tmplput_roombanner(StrBuf *Target, WCTemplputParams *TP)
 {
-       wcsession *WCC = WC;
-       
-       return ((WCC!=NULL) && 
-               (!IsEmptyStr(WCC->ugname)) && 
-               (strcasecmp(WCC->ugname, ChrPtr(WCC->wc_roomname)) == 0));
+       wc_printf("<div id=\"banner\">\n");
+       embed_room_banner(NULL, navbar_default);
+       wc_printf("</div>\n");
 }
 
-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)
+void tmplput_ungoto(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));
+       if ((WCC!=NULL) && 
+           (!IsEmptyStr(WCC->ugname)))
+               StrBufAppendBufPlain(Target, WCC->ugname, -1, 0);
 }
 
-int ConditionalRoomHas_QR_PASSWORDED(StrBuf *Target, WCTemplputParams *TP)
+int ConditionalRoomAide(StrBuf *Target, WCTemplputParams *TP)
 {
        wcsession *WCC = WC;
-       
-       return ((WCC!=NULL) &&
-               ((WCC->room_flags & QR_PASSWORDED) != 0));
+       return (WCC != NULL)? 
+               ((WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) : 0;
 }
 
-int ConditionalRoomHas_QR_GUESSNAME(StrBuf *Target, WCTemplputParams *TP)
+int ConditionalRoomAcessDelete(StrBuf *Target, WCTemplputParams *TP)
 {
        wcsession *WCC = WC;
-       
-       return ((WCC!=NULL) &&
-               ((WCC->room_flags & QR_GUESSNAME) != 0));
+       return (WCC == NULL)? 0 : 
+               ( ((WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) ||
+                  (WCC->CurRoom.is_inbox) || 
+                  (WCC->CurRoom.QRFlags2 & QR2_COLLABDEL) );
 }
 
-int ConditionalRoomHas_QR_DIRECTORY(StrBuf *Target, WCTemplputParams *TP)
+int ConditionalHaveUngoto(StrBuf *Target, WCTemplputParams *TP)
 {
        wcsession *WCC = WC;
        
-       return ((WCC!=NULL) &&
-               ((WCC->room_flags & QR_DIRECTORY) != 0));
+       return ((WCC!=NULL) && 
+               (!IsEmptyStr(WCC->ugname)) && 
+               (strcasecmp(WCC->ugname, ChrPtr(WCC->CurRoom.name)) == 0));
 }
 
-int ConditionalRoomHas_QR_UPLOAD(StrBuf *Target, WCTemplputParams *TP)
+int ConditionalCurrentRoomHas_QRFlag(StrBuf *Target, WCTemplputParams *TP)
 {
+       long QR_CheckFlag;
        wcsession *WCC = WC;
        
-       return ((WCC!=NULL) &&
-               ((WCC->room_flags & QR_UPLOAD) != 0));
-}
+       QR_CheckFlag = GetTemplateTokenNumber(Target, TP, 2, 0);
+       if (QR_CheckFlag == 0)
+               LogTemplateError(Target, "Conditional", ERR_PARM1, TP,
+                                "requires one of the #\"QR*\"- defines or an integer flag 0 is invalid!");
 
-int ConditionalRoomHas_QR_DOWNLOAD(StrBuf *Target, WCTemplputParams *TP)
-{
-       wcsession *WCC = WC;
-       
        return ((WCC!=NULL) &&
-               ((WCC->room_flags & QR_DOWNLOAD) != 0));
+               ((WCC->CurRoom.QRFlags & QR_CheckFlag) != 0));
 }
 
-int ConditionalRoomHas_QR_VISDIR(StrBuf *Target, WCTemplputParams *TP)
+int ConditionalRoomHas_QRFlag(StrBuf *Target, WCTemplputParams *TP)
 {
-       wcsession *WCC = WC;
-       
-       return ((WCC!=NULL) &&
-               ((WCC->room_flags & QR_VISDIR) != 0));
-}
+       long QR_CheckFlag;
+       folder *Folder = (folder *)(TP->Context);
 
-int ConditionalRoomHas_QR_ANONONLY(StrBuf *Target, WCTemplputParams *TP)
-{
-       wcsession *WCC = WC;
-       
-       return ((WCC!=NULL) &&
-               ((WCC->room_flags & QR_ANONONLY) != 0));
+       QR_CheckFlag = GetTemplateTokenNumber(Target, TP, 2, 0);
+       if (QR_CheckFlag == 0)
+               LogTemplateError(Target, "Conditional", ERR_PARM1, TP,
+                                "requires one of the #\"QR*\"- defines or an integer flag 0 is invalid!");
+       return ((Folder->QRFlags & QR_CheckFlag) != 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)
+int ConditionalCurrentRoomHas_QRFlag2(StrBuf *Target, WCTemplputParams *TP)
 {
+       long QR2_CheckFlag;
        wcsession *WCC = WC;
        
-       return ((WCC!=NULL) &&
-               ((WCC->room_flags & QR_NETWORK) != 0));
-}
+       QR2_CheckFlag = GetTemplateTokenNumber(Target, TP, 2, 0);
+       if (QR2_CheckFlag == 0)
+               LogTemplateError(Target, "Conditional", ERR_PARM1, TP,
+                                "requires one of the #\"QR2*\"- defines or an integer flag 0 is invalid!");
 
-int ConditionalRoomHas_QR_PREFONLY(StrBuf *Target, WCTemplputParams *TP)
-{
-       wcsession *WCC = WC;
-       
        return ((WCC!=NULL) &&
-               ((WCC->room_flags & QR_PREFONLY) != 0));
+               ((WCC->CurRoom.QRFlags2 & QR2_CheckFlag) != 0));
 }
 
-int ConditionalRoomHas_QR_READONLY(StrBuf *Target, WCTemplputParams *TP)
+int ConditionalRoomHas_QRFlag2(StrBuf *Target, WCTemplputParams *TP)
 {
-       wcsession *WCC = WC;
-       
-       return ((WCC!=NULL) &&
-               ((WCC->room_flags & QR_READONLY) != 0));
-}
+       long QR2_CheckFlag;
+       folder *Folder = (folder *)(TP->Context);
 
-int ConditionalRoomHas_QR_MAILBOX(StrBuf *Target, WCTemplputParams *TP)
-{
-       wcsession *WCC = WC;
-       
-       return ((WCC!=NULL) &&
-               ((WCC->room_flags & QR_MAILBOX) != 0));
+       QR2_CheckFlag = GetTemplateTokenNumber(Target, TP, 2, 0);
+       if (QR2_CheckFlag == 0)
+               LogTemplateError(Target, "Conditional", ERR_PARM1, TP,
+                                "requires one of the #\"QR2*\"- defines or an integer flag 0 is invalid!");
+       return ((Folder->QRFlags2 & QR2_CheckFlag) != 0);
 }
 
 
@@ -4064,8 +3349,8 @@ int ConditionalHaveRoomeditRights(StrBuf *Target, WCTemplputParams *TP)
 
        return ( (WCC!= NULL) && 
                 ((WCC->axlevel >= 6) || 
-                 (WCC->is_room_aide) || 
-                 (WCC->is_mailbox) ));
+                 ((WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) ||
+                 (WCC->CurRoom.is_inbox) ));
 }
 
 int ConditionalIsRoomtype(StrBuf *Target, WCTemplputParams *TP)
@@ -4073,33 +3358,9 @@ int ConditionalIsRoomtype(StrBuf *Target, WCTemplputParams *TP)
        wcsession *WCC = WC;
 
        if ((WCC == NULL) ||
-           (TP->Tokens->nParameters < 3) ||
-           (TP->Tokens->Params[2]->Type != TYPE_STR)||
-           (TP->Tokens->Params[2]->len < 7))
-               return 0;
-
-       switch(WCC->wc_view) {
-       case VIEW_BBS:
-               return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_BBS"));
-       case VIEW_MAILBOX:
-               return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_MAILBOX"));
-       case VIEW_ADDRESSBOOK:
-               return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_ADDRESSBOOK"));
-       case VIEW_TASKS:
-               return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_TASKS"));
-       case VIEW_NOTES:
-               return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_NOTES"));
-       case VIEW_WIKI:
-               return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_WIKI"));
-       case VIEW_JOURNAL:
-               return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_JOURNAL"));
-       case VIEW_CALENDAR:
-               return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_CALENDAR"));
-       case VIEW_CALBRIEF:
-               return (!strcasecmp(TP->Tokens->Params[2]->Start, "VIEW_CALBRIEF"));
-       default:
+           (TP->Tokens->nParameters < 3))
                return 0;
-       }
+       return WCC->CurRoom.view == GetTemplateTokenNumber(Target, TP, 2, VIEW_BBS);
 }
 
 void 
@@ -4112,71 +3373,136 @@ InitModule_ROOMOPS
                            NULL);
         RegisterPreference("emptyfloors", _("Show empty floors"), PRF_YESNO, NULL);
 
-       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);
-       WebcitAddUrlHandler(HKEY("json_roomflr"), jsonRoomFlr, 0);
-       RegisterNamespace("ROOMBANNER", 0, 1, tmplput_roombanner, 0);
+       RegisterNamespace("ROOMNAME", 0, 1, tmplput_RoomName, NULL, CTX_NONE);
+
+       WebcitAddUrlHandler(HKEY("knrooms"), "", 0, knrooms, 0);
+       WebcitAddUrlHandler(HKEY("dotgoto"), "", 0, dotgoto, NEED_URL);
+       WebcitAddUrlHandler(HKEY("dotskip"), "", 0, dotskip, NEED_URL);
+       WebcitAddUrlHandler(HKEY("display_private"), "", 0, _display_private, 0);
+       WebcitAddUrlHandler(HKEY("goto_private"), "", 0, goto_private, NEED_URL);
+       WebcitAddUrlHandler(HKEY("zapped_list"), "", 0, zapped_list, 0);
+       WebcitAddUrlHandler(HKEY("display_zap"), "", 0, display_zap, 0);
+       WebcitAddUrlHandler(HKEY("zap"), "", 0, zap, 0);
+       WebcitAddUrlHandler(HKEY("display_entroom"), "", 0, display_entroom, 0);
+       WebcitAddUrlHandler(HKEY("entroom"), "", 0, entroom, 0);
+       WebcitAddUrlHandler(HKEY("display_whok"), "", 0, display_whok, 0);
+       WebcitAddUrlHandler(HKEY("do_invt_kick"), "", 0, do_invt_kick, 0);
+       WebcitAddUrlHandler(HKEY("display_editroom"), "", 0, display_editroom, 0);
+       WebcitAddUrlHandler(HKEY("netedit"), "", 0, netedit, 0);
+       WebcitAddUrlHandler(HKEY("editroom"), "", 0, editroom, 0);
+       WebcitAddUrlHandler(HKEY("delete_room"), "", 0, delete_room, 0);
+       WebcitAddUrlHandler(HKEY("set_room_policy"), "", 0, set_room_policy, 0);
+       WebcitAddUrlHandler(HKEY("changeview"), "", 0, change_view, 0);
+       WebcitAddUrlHandler(HKEY("toggle_self_service"), "", 0, toggle_self_service, 0);
+       RegisterNamespace("ROOMBANNER", 0, 1, tmplput_roombanner, NULL, CTX_NONE);
 
        RegisterConditional(HKEY("COND:ROOM:TYPE_IS"), 0, ConditionalIsRoomtype, CTX_NONE);
-       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:THISROOM:FLAG:QR"), 0, ConditionalCurrentRoomHas_QRFlag, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAG:QR"), 0, ConditionalRoomHas_QRFlag, CTX_ROOMS);
+
+       RegisterConditional(HKEY("COND:THISROOM:FLAG:QR2"), 0, ConditionalCurrentRoomHas_QRFlag2, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAG:QR2"), 0, ConditionalRoomHas_QRFlag2, CTX_ROOMS);
+
+       RegisterNamespace("THISROOM:AIDE", 0, 1, tmplput_CurrentRoomAide, NULL, CTX_NONE);
+
+
+       RegisterNamespace("THISROOM:PASS", 0, 1, tmplput_CurrentRoomPass, NULL, CTX_NONE);
+       RegisterNamespace("THISROOM:DIRECTORY", 0, 1, tmplput_CurrentRoomDirectory, NULL, CTX_NONE);
+       RegisterNamespace("THISROOM:ORDER", 0, 0, tmplput_CurrentRoomOrder, NULL, CTX_NONE);
+       RegisterNamespace("THISROOM:DEFAULT_VIEW", 0, 0, tmplput_CurrentRoomDefView, NULL, CTX_NONE);
+       RegisterConditional(HKEY("COND:THISROOM:ORDER"), 0, ConditionalThisRoomOrder, CTX_NONE);
+       RegisterConditional(HKEY("COND:THISROOM:DEFAULT_VIEW"), 0, ConditionalThisRoomDefView, CTX_NONE);
+
+
+       REGISTERTokenParamDefine(QR_PERMANENT);
+       REGISTERTokenParamDefine(QR_INUSE);
+       REGISTERTokenParamDefine(QR_PRIVATE);
+       REGISTERTokenParamDefine(QR_PASSWORDED);
+       REGISTERTokenParamDefine(QR_GUESSNAME);
+       REGISTERTokenParamDefine(QR_DIRECTORY);
+       REGISTERTokenParamDefine(QR_UPLOAD);
+       REGISTERTokenParamDefine(QR_DOWNLOAD);
+       REGISTERTokenParamDefine(QR_VISDIR);
+       REGISTERTokenParamDefine(QR_ANONONLY);
+       REGISTERTokenParamDefine(QR_ANONOPT);
+       REGISTERTokenParamDefine(QR_NETWORK);
+       REGISTERTokenParamDefine(QR_PREFONLY);
+       REGISTERTokenParamDefine(QR_READONLY);
+       REGISTERTokenParamDefine(QR_MAILBOX);
+       REGISTERTokenParamDefine(QR2_SYSTEM);
+       REGISTERTokenParamDefine(QR2_SELFLIST);
+       REGISTERTokenParamDefine(QR2_COLLABDEL);
+       REGISTERTokenParamDefine(QR2_SUBJECTREQ);
+       REGISTERTokenParamDefine(QR2_SMTP_PUBLIC);
+       REGISTERTokenParamDefine(QR2_MODERATED);
+
+       REGISTERTokenParamDefine(UA_KNOWN);
+       REGISTERTokenParamDefine(UA_GOTOALLOWED);
+       REGISTERTokenParamDefine(UA_HASNEWMSGS);
+       REGISTERTokenParamDefine(UA_ZAPPED);
+       REGISTERTokenParamDefine(UA_POSTALLOWED);
+       REGISTERTokenParamDefine(UA_ADMINALLOWED);
+       REGISTERTokenParamDefine(UA_DELETEALLOWED);
+       REGISTERTokenParamDefine(UA_ISTRASH);
+
+       REGISTERTokenParamDefine(US_NEEDVALID);
+       REGISTERTokenParamDefine(US_PERM);
+       REGISTERTokenParamDefine(US_LASTOLD);
+       REGISTERTokenParamDefine(US_EXPERT);
+       REGISTERTokenParamDefine(US_UNLISTED);
+       REGISTERTokenParamDefine(US_NOPROMPT);
+       REGISTERTokenParamDefine(US_PROMPTCTL);
+       REGISTERTokenParamDefine(US_DISAPPEAR);
+       REGISTERTokenParamDefine(US_REGIS);
+       REGISTERTokenParamDefine(US_PAGINATOR);
+       REGISTERTokenParamDefine(US_INTERNET);
+       REGISTERTokenParamDefine(US_FLOORS);
+       REGISTERTokenParamDefine(US_COLOR);
+       REGISTERTokenParamDefine(US_USER_SET);
+
+       REGISTERTokenParamDefine(VIEW_BBS);
+       REGISTERTokenParamDefine(VIEW_MAILBOX); 
+       REGISTERTokenParamDefine(VIEW_ADDRESSBOOK);
+       REGISTERTokenParamDefine(VIEW_CALENDAR);        
+       REGISTERTokenParamDefine(VIEW_TASKS);   
+       REGISTERTokenParamDefine(VIEW_NOTES);           
+       REGISTERTokenParamDefine(VIEW_WIKI);            
+       REGISTERTokenParamDefine(VIEW_CALBRIEF);
+       REGISTERTokenParamDefine(VIEW_JOURNAL);
+       REGISTERTokenParamDefine(VIEW_BLOG);
+
+
+       REGISTERTokenParamDefine(ignet_push_share);
+       REGISTERTokenParamDefine(listrecp);
+       REGISTERTokenParamDefine(digestrecp);
+       REGISTERTokenParamDefine(pop3client);
+       REGISTERTokenParamDefine(rssclient);
+       REGISTERTokenParamDefine(participate);
+
+       RegisterConditional(HKEY("COND:ROOMAIDE"), 2, ConditionalRoomAide, CTX_NONE);
+       RegisterConditional(HKEY("COND:ACCESS:DELETE"), 2, ConditionalRoomAcessDelete, 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);
-       RegisterIterator("FLOORS", 0, NULL, GetFloorListHash, NULL, DeleteHash, CTX_FLOORS, CTX_NONE, IT_NOFLAG);
-       RegisterNamespace("FLOOR:INFO", 1, 2, tmplput_FLOOR_Value, CTX_FLOORS);
-       RegisterIterator("LKRA", 0, NULL, GetRoomListHashLKRA, NULL, DeleteHash, CTX_ROOMS, CTX_NONE, IT_NOFLAG);
-       RegisterNamespace("ROOM:INFO", 1, 2, tmplput_ROOM_Value, CTX_ROOMS);
-}
+       RegisterNamespace("CURRENT_ROOM", 0, 1, tmplput_current_room, NULL, CTX_NONE);
+       RegisterNamespace("ROOM:UNGOTO", 0, 0, tmplput_ungoto, NULL, CTX_NONE);
+       RegisterIterator("FLOORS", 0, NULL, GetFloorListHash, NULL, NULL, CTX_FLOORS, CTX_NONE, IT_NOFLAG);
+
 
+}
 
 
 void 
 SessionDestroyModule_ROOMOPS
 (wcsession *sess)
 {
+       FlushFolder(&sess->CurRoom);
        if (sess->cache_fold != NULL) {
                free(sess->cache_fold);
        }
        
        free_march_list(sess);
+       DeleteHash(&sess->Floors);
 }
 /*@}*/