* move serv_info into the session, here we can control its de/allocation the right...
[citadel.git] / webcit / roomops.c
index 4ade41486bfe07a7a3586abbc7b09577f2c0b6f6..b1fce7f15e7b062ba65ed9025788de974306c529 100644 (file)
@@ -10,6 +10,24 @@ char floorlist[MAX_FLOORS][SIZ]; /**< list of our floor names */
 
 char *viewdefs[9]; /**< the different kinds of available views */
 
+/** See GetFloorListHash and GetRoomListHash for info on these. Basically we pull LFLR/LKRA etc. and set up a room HashList with these keys. */
+const char FLOOR_PARAM_NAMES[(FLOOR_PARAM_LEN + 1)][15] = {"ID",
+                                                          "NAME", 
+                                                          "ROOMS"};
+const char ROOM_PARAM_NAMES[(ROOM_PARAM_LEN + 1)][20] = {"NAME",
+                                                        "FLAG",
+                                                        "FLOOR",
+                                                        "LISTORDER",
+                                                        "ACL",
+                                                        "CURVIEW",
+                                                        "DEFVIEW",
+                                                        "LASTCHANGE"};
+/* Because avoiding strlen at run time is a Good Thing(TM) */
+const int FLOOR_PARAM_NAMELEN[(FLOOR_PARAM_LEN +1)] = {2, 4, 5};
+const int ROOM_PARAM_NAMELEN[(ROOM_PARAM_LEN +1)] = {4, 4, 5, 9, 3, 7, 7, 8};
+
+void display_whok(void);
+
 /*
  * Initialize the viewdefs with localized strings
  */
@@ -31,22 +49,22 @@ 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);
+       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);
+       case VIEW_WIKI:         return(1);
 #else /* TECH_PREVIEW */
-               case VIEW_WIKI:         return(0);      /* because it isn't finished yet */
+       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_CALBRIEF:     return(0);
+       case VIEW_JOURNAL:      return(0);
+       default:                return(0);      /* should never get here */
        }
 }
 
@@ -77,7 +95,7 @@ void load_floorlist(void)
 /*
  * Free a session's march list
  */
-void free_march_list(struct wcsession *wcf)
+void free_march_list(wcsession *wcf)
 {
        struct march *mptr;
 
@@ -94,14 +112,14 @@ void free_march_list(struct wcsession *wcf)
 /*
  * remove a room from the march list
  */
-void remove_march(char *aaa)
+void remove_march(const StrBuf *aaa)
 {
        struct march *mptr, *mptr2;
 
        if (WC->march == NULL)
                return;
 
-       if (!strcasecmp(WC->march->march_name, aaa)) {
+       if (!strcasecmp(WC->march->march_name, ChrPtr(aaa))) {
                mptr = WC->march->next;
                free(WC->march);
                WC->march = mptr;
@@ -109,7 +127,7 @@ void remove_march(char *aaa)
        }
        mptr2 = WC->march;
        for (mptr = WC->march; mptr != NULL; mptr = mptr->next) {
-               if (!strcasecmp(mptr->march_name, aaa)) {
+               if (!strcasecmp(mptr->march_name, ChrPtr(aaa))) {
                        mptr2->next = mptr->next;
                        free(mptr);
                        mptr = mptr2;
@@ -254,16 +272,23 @@ void listrms(char *variety)
  */
 void zapped_list(void)
 {
+       WCTemplputParams SubTP;
+       StrBuf *Buf;
+
        output_headers(1, 1, 1, 0, 0, 0);
+       memset(&SubTP, 0, sizeof(WCTemplputParams));
+       Buf = NewStrBufPlain(_("Zapped (forgotten) rooms"), -1);
+       SubTP.Filter.ContextType = CTX_STRBUF;
+       SubTP.Context = Buf;
+       DoTemplate(HKEY("beginbox"), NULL, &SubTP);
 
-       svput("BOXTITLE", WCS_STRING, _("Zapped (forgotten) rooms"));
-       do_template("beginbox");
+       FreeStrBuf(&Buf);
 
        listrms("LZRM -1");
 
        wprintf("<br /><br />\n");
        wprintf(_("Click on any room to un-zap it and goto that room.\n"));
-       do_template("endbox");
+       do_template("endbox", NULL);
        wDumpContent(1);
 }
 
@@ -271,7 +296,7 @@ void zapped_list(void)
 /**
  * \brief read this room's info file (set v to 1 for verbose mode)
  */
-void readinfo(void)
+void readinfo(StrBuf *Target, WCTemplputParams *TP)
 {
        char buf[256];
        char briefinfo[128];
@@ -293,15 +318,15 @@ void readinfo(void)
                strcpy(&briefinfo[50], "...");
 
                 wprintf("<div class=\"infos\" "
-                "onclick=\"javascript:Effect.Appear('room_infos', { duration: 0.5 });\" "
-                ">");
+                       "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\" "
                        "onclick=\"javascript:Effect.Fade('room_infos', { duration: 0.5 });\" "
                        "src=\"static/closewindow.gif\" alt=\"%s\">",
                        _("Close window")
-               );
+                       );
                escputs(fullinfo);
                 wprintf("</div>");
        }
@@ -320,14 +345,15 @@ void readinfo(void)
  * keep the browser from using a cached icon from 
  * another room.
  */
-void embed_room_graphic(void) {
+void embed_room_graphic(StrBuf *Target, WCTemplputParams *TP)
+{
        char buf[SIZ];
 
        serv_puts("OIMG _roompic_");
        serv_getln(buf, sizeof buf);
        if (buf[0] == '2') {
                wprintf("<img height=\"64px\" src=\"image&name=_roompic_&room=");
-               urlescputs(WC->wc_roomname);
+               urlescputs(ChrPtr(WC->wc_roomname));
                wprintf("\">");
                serv_puts("CLOS");
                serv_getln(buf, sizeof buf);
@@ -336,37 +362,37 @@ void embed_room_graphic(void) {
                wprintf("<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=\""
                        "static/calarea_48x.gif"
                        "\">"
-               );
+                       );
        }
        else if (WC->wc_view == VIEW_TASKS) {
                wprintf("<img class=\"roompic\" alt=\"\" src=\""
                        "static/taskmanag_48x.gif"
                        "\">"
-               );
+                       );
        }
        else if (WC->wc_view == VIEW_NOTES) {
                wprintf("<img class=\"roompic\" alt=\"\" src=\""
                        "static/storenotes_48x.gif"
                        "\">"
-               );
+                       );
        }
        else if (WC->wc_view == VIEW_MAILBOX) {
                wprintf("<img class=\"roompic\" alt=\"\" src=\""
                        "static/privatemess_48x.gif"
                        "\">"
-               );
+                       );
        }
        else {
                wprintf("<img class=\"roompic\" alt=\"\" src=\""
                        "static/chatrooms_48x.gif"
                        "\">"
-               );
+                       );
        }
 
 }
@@ -376,7 +402,8 @@ void embed_room_graphic(void) {
 /**
  * \brief Display the current view and offer an option to change it
  */
-void embed_view_o_matic(void) {
+void embed_view_o_matic(StrBuf *Target, WCTemplputParams *TP)
+{
        int i;
 
        wprintf("<form name=\"viewomatic\" action=\"changeview\">\n");
@@ -401,7 +428,7 @@ void embed_view_o_matic(void) {
                        ||      ( (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) */
-               ) {
+                       ) {
 
                        wprintf("<option %s value=\"changeview?view=%d\">",
                                ((i == WC->wc_view) ? "selected" : ""),
@@ -417,16 +444,16 @@ void embed_view_o_matic(void) {
 /**
  * \brief Display a search box
  */
-void embed_search_o_matic(void) {
+void embed_search_o_matic(StrBuf *Target, WCTemplputParams *TP)
+{
        wprintf("<form name=\"searchomatic\" action=\"do_search\">\n");
        wprintf("<div style=\"display: inline;\"><input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-       wprintf("<label for=\"search_name\">");
+       wprintf("<label for=\"srchquery\">");
        wprintf(_("Search: "));
        wprintf("</label><input ");
-       wprintf("%s", serv_info.serv_fulltext_enabled ? "" : "disabled ");
-       wprintf("type=\"text\" name=\"query\" size=\"15\" maxlength=\"128\" "
-               "id=\"search_name\" class=\"inputbox\">\n"
-       );
+       wprintf("%s", WC->serv_info->serv_fulltext_enabled ? "" : "disabled ");
+       wprintf("type=\"text\" name=\"query\" id=\"srchquery\" size=\"15\" maxlength=\"128\" class=\"inputbox\">\n"
+               );
        wprintf("</div></form>\n");
 }
 
@@ -442,7 +469,6 @@ void embed_search_o_matic(void) {
 void embed_room_banner(char *got, int navbar_style) {
        char buf[256];
        char buf2[1024];
-       char sanitized_roomname[256];
        char with_files[256];
        int file_count=0;
        
@@ -451,7 +477,9 @@ void embed_room_banner(char *got, int navbar_style) {
         * If it isn't supplied, we fake it by issuing our own GOTO.
         */
        if (got == NULL) {
-               serv_printf("GOTO %s", WC->wc_roomname);
+               memset(buf, '0', 20);
+               buf[20] = '\0';
+               serv_printf("GOTO %s", ChrPtr(WC->wc_roomname));
                serv_getln(buf, sizeof buf);
                got = buf;
        }
@@ -461,15 +489,18 @@ void embed_room_banner(char *got, int navbar_style) {
                "       room_is_trash = %d;             \n"
                "</script>\n",
                WC->wc_is_trash
-       );
+               );
 
        /**
         * If the user happens to select the "make this my start page" link,
         * we want it to remember the URL as a "/dotskip" one instead of
         * a "skip" or "gotonext" or something like that.
         */
-       snprintf(WC->this_page, sizeof(WC->this_page), "dotskip&room=%s",
-               WC->wc_roomname);
+       if (WC->this_page == NULL)
+               WC->this_page = NewStrBuf();
+       StrBufPrintf(WC->this_page, 
+                    "dotskip&room=%s",
+                    ChrPtr(WC->wc_roomname));
 
        /** Check for new mail. */
        WC->new_mail = extract_int(&got[4], 9);
@@ -481,31 +512,30 @@ void embed_room_banner(char *got, int navbar_style) {
                serv_puts("RDIR");
                serv_getln(buf2, sizeof buf2);
                if (buf2[0] == '1') while (serv_getln(buf2, sizeof buf2), strcmp(buf2, "000"))
-                       file_count++;
+                                           file_count++;
                snprintf (with_files, sizeof with_files, 
-                         "; <a href=\"display_room_directory\"> %d %s </a>", 
+                         "; <a href=\"do_template?template=files\"> %d %s </a>", 
                          file_count, 
                          ((file_count>1) || (file_count == 0)  ? _("files") : _("file")));
        }
        else
                strcpy (with_files, "");
-               
-       stresc(sanitized_roomname, 256, WC->wc_roomname, 1, 1);
-       svprintf(HKEY("ROOMNAME"), WCS_STRING, "%s", sanitized_roomname);
+       
        svprintf(HKEY("NUMMSGS"), WCS_STRING,
-               _("%d new of %d messages%s"),
-               extract_int(&got[4], 1),
-               extract_int(&got[4], 2),
-               with_files
-       );
+                _("%d new of %d messages%s"),
+                extract_int(&got[4], 1),
+                extract_int(&got[4], 2),
+                with_files
+               );
        svcallback("ROOMPIC", embed_room_graphic);
        svcallback("ROOMINFO", readinfo);
-       svcallback("VIEWOMATIC", embed_view_o_matic);
+       svcallback("VIEWOMATIC", embed_view_o_matic); 
        svcallback("SEARCHOMATIC", embed_search_o_matic);
-       svcallback("START", offer_start_page);
-
-       do_template("roombanner");
-       if (navbar_style != navbar_none) {
+       svcallback("START", offer_start_page); 
+       do_template("roombanner", NULL);
+       /* roombanner contains this for mobile */
+       if (navbar_style != navbar_none && !WC->is_mobile) { 
 
                wprintf("<div id=\"navbar\"><ul>");
 
@@ -515,7 +545,7 @@ void embed_room_banner(char *got, int navbar_style) {
                        "<img src=\"static/ungoto2_24x.gif\" alt=\"\">"
                        "<span class=\"navbar_link\">%s</span></A>"
                        "</li>\n", _("Ungoto")
-               );
+                       );
 
                if ( (navbar_style == navbar_default) && (WC->wc_view == VIEW_BBS) ) {
                        wprintf(
@@ -524,188 +554,188 @@ void embed_room_banner(char *got, int navbar_style) {
                                "<img src=\"static/newmess2_24x.gif\" alt=\"\">"
                                "<span class=\"navbar_link\">%s</span></A>"
                                "</li>\n", _("Read new messages")
-                       );
+                               );
                }
 
                if (navbar_style == navbar_default) {
                        switch(WC->wc_view) {
-                               case VIEW_ADDRESSBOOK:
-                                       wprintf(
-                                               "<li class=\"viewcontacts\">"
-                                               "<a href=\"readfwd\">"
-                                               "<img src=\"static/viewcontacts_24x.gif\" "
-                                               "alt=\"\">"
-                                               "<span class=\"navbar_link\">"
-                                               "%s"
-                                               "</span></a></li>\n", _("View contacts")
+                       case VIEW_ADDRESSBOOK:
+                               wprintf(
+                                       "<li class=\"viewcontacts\">"
+                                       "<a href=\"readfwd\">"
+                                       "<img src=\"static/viewcontacts_24x.gif\" "
+                                       "alt=\"\">"
+                                       "<span class=\"navbar_link\">"
+                                       "%s"
+                                       "</span></a></li>\n", _("View contacts")
                                        );
-                                       break;
-                               case VIEW_CALENDAR:
-                                       wprintf(
-                                               "<li class=\"staskday\">"
-                                               "<a href=\"readfwd?calview=day\">"
-                                               "<img src=\"static/taskday2_24x.gif\" "
-                                               "alt=\"\">"
-                                               "<span class=\"navbar_link\">"
-                                               "%s"
-                                               "</span></a></li>\n", _("Day view")
+                               break;
+                       case VIEW_CALENDAR:
+                               wprintf(
+                                       "<li class=\"staskday\">"
+                                       "<a href=\"readfwd?calview=day\">"
+                                       "<img src=\"static/taskday2_24x.gif\" "
+                                       "alt=\"\">"
+                                       "<span class=\"navbar_link\">"
+                                       "%s"
+                                       "</span></a></li>\n", _("Day view")
                                        );
-                                       wprintf(
-                                               "<li class=\"monthview\">"
-                                               "<a href=\"readfwd?calview=month\">"
-                                               "<img src=\"static/monthview2_24x.gif\" "
-                                               "alt=\"\">"
-                                               "<span class=\"navbar_link\">"
-                                               "%s"
-                                               "</span></a></li>\n", _("Month view")
+                               wprintf(
+                                       "<li class=\"monthview\">"
+                                       "<a href=\"readfwd?calview=month\">"
+                                       "<img src=\"static/monthview2_24x.gif\" "
+                                       "alt=\"\">"
+                                       "<span class=\"navbar_link\">"
+                                       "%s"
+                                       "</span></a></li>\n", _("Month view")
                                        );
-                                       break;
-                               case VIEW_CALBRIEF:
-                                       wprintf(
-                                               "<li class=\"monthview\">"
-                                               "<a href=\"readfwd?calview=month\">"
-                                               "<img src=\"static/monthview2_24x.gif\" "
-                                               "alt=\"\">"
-                                               "<span class=\"navbar_link\">"
-                                               "%s"
-                                               "</span></a></li>\n", _("Calendar list")
+                               break;
+                       case VIEW_CALBRIEF:
+                               wprintf(
+                                       "<li class=\"monthview\">"
+                                       "<a href=\"readfwd?calview=month\">"
+                                       "<img src=\"static/monthview2_24x.gif\" "
+                                       "alt=\"\">"
+                                       "<span class=\"navbar_link\">"
+                                       "%s"
+                                       "</span></a></li>\n", _("Calendar list")
                                        );
-                                       break;
-                               case VIEW_TASKS:
-                                       wprintf(
-                                               "<li class=\"taskmanag\">"
-                                               "<a href=\"readfwd\">"
-                                               "<img src=\"static/taskmanag_24x.gif\" "
-                                               "alt=\"\">"
-                                               "<span class=\"navbar_link\">"
-                                               "%s"
-                                               "</span></a></li>\n", _("View tasks")
+                               break;
+                       case VIEW_TASKS:
+                               wprintf(
+                                       "<li class=\"taskmanag\">"
+                                       "<a href=\"readfwd\">"
+                                       "<img src=\"static/taskmanag_24x.gif\" "
+                                       "alt=\"\">"
+                                       "<span class=\"navbar_link\">"
+                                       "%s"
+                                       "</span></a></li>\n", _("View tasks")
                                        );
-                                       break;
-                               case VIEW_NOTES:
-                                       wprintf(
-                                               "<li class=\"viewnotes\">"
-                                               "<a href=\"readfwd\">"
-                                               "<img src=\"static/viewnotes_24x.gif\" "
-                                               "alt=\"\">"
-                                               "<span class=\"navbar_link\">"
-                                               "%s"
-                                               "</span></a></li>\n", _("View notes")
+                               break;
+                       case VIEW_NOTES:
+                               wprintf(
+                                       "<li class=\"viewnotes\">"
+                                       "<a href=\"readfwd\">"
+                                       "<img src=\"static/viewnotes_24x.gif\" "
+                                       "alt=\"\">"
+                                       "<span class=\"navbar_link\">"
+                                       "%s"
+                                       "</span></a></li>\n", _("View notes")
                                        );
-                                       break;
-                               case VIEW_MAILBOX:
-                                       wprintf(
-                                               "<li class=\"readallmess\">"
-                                               "<a href=\"readfwd\">"
-                                               "<img src=\"static/readallmess3_24x.gif\" "
-                                               "alt=\"\">"
-                                               "<span class=\"navbar_link\">"
-                                               "%s"
-                                               "</span></a></li>\n", _("View message list")
+                               break;
+                       case VIEW_MAILBOX:
+                               wprintf(
+                                       "<li class=\"readallmess\">"
+                                       "<a id=\"m_refresh\" href=\"readfwd\">"
+                                       "<img src=\"static/readallmess3_24x.gif\" "
+                                       "alt=\"\">"
+                                       "<span class=\"navbar_link\">"
+                                       "%s"
+                                       "</span></a></li>\n", _("Refresh message list")
                                        );
-                                       break;
-                               case VIEW_WIKI:
-                                       wprintf(
-                                               "<li class=\"readallmess\">"
-                                               "<a href=\"readfwd\">"
-                                               "<img src=\"static/readallmess3_24x.gif\" "
-                                               "alt=\"\">"
-                                               "<span class=\"navbar_link\">"
-                                               "%s"
-                                               "</span></a></li>\n", _("Wiki home")
+                               break;
+                       case VIEW_WIKI:
+                               wprintf(
+                                       "<li class=\"readallmess\">"
+                                       "<a href=\"readfwd\">"
+                                       "<img src=\"static/readallmess3_24x.gif\" "
+                                       "alt=\"\">"
+                                       "<span class=\"navbar_link\">"
+                                       "%s"
+                                       "</span></a></li>\n", _("Wiki home")
                                        );
-                                       break;
-                               default:
-                                       wprintf(
-                                               "<li class=\"readallmess\">"
-                                               "<a href=\"readfwd\">"
-                                               "<img src=\"static/readallmess3_24x.gif\" "
-                                               "alt=\"\">"
-                                               "<span class=\"navbar_link\">"
-                                               "%s"
-                                               "</span></a></li>\n", _("Read all messages")
+                               break;
+                       default:
+                               wprintf(
+                                       "<li class=\"readallmess\">"
+                                       "<a href=\"readfwd\">"
+                                       "<img src=\"static/readallmess3_24x.gif\" "
+                                       "alt=\"\">"
+                                       "<span class=\"navbar_link\">"
+                                       "%s"
+                                       "</span></a></li>\n", _("Read all messages")
                                        );
-                                       break;
+                               break;
                        }
                }
 
                if (navbar_style == navbar_default) {
                        switch(WC->wc_view) {
-                               case VIEW_ADDRESSBOOK:
-                                       wprintf(
-                                               "<li class=\"addnewcontact\">"
-                                               "<a href=\"display_enter\">"
-                                               "<img src=\"static/addnewcontact_24x.gif\" "
-                                               "alt=\"\"><span class=\"navbar_link\">"
-                                               "%s"
-                                               "</span></a></li>\n", _("Add new contact")
+                       case VIEW_ADDRESSBOOK:
+                               wprintf(
+                                       "<li class=\"addnewcontact\">"
+                                       "<a href=\"display_enter\">"
+                                       "<img src=\"static/addnewcontact_24x.gif\" "
+                                       "alt=\"\"><span class=\"navbar_link\">"
+                                       "%s"
+                                       "</span></a></li>\n", _("Add new contact")
                                        );
-                                       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("\">"
-                                               "<img  src=\"static/addevent_24x.gif\" "
-                                               "alt=\"\"><span class=\"navbar_link\">"
-                                               "%s"
-                                               "</span></a></li>\n", _("Add new event")
+                               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("\">"
+                                       "<img  src=\"static/addevent_24x.gif\" "
+                                       "alt=\"\"><span class=\"navbar_link\">"
+                                       "%s"
+                                       "</span></a></li>\n", _("Add new event")
                                        );
-                                       break;
-                               case VIEW_TASKS:
-                                       wprintf(
-                                               "<li class=\"newmess\">"
-                                               "<a href=\"display_enter\">"
-                                               "<img  src=\"static/newmess3_24x.gif\" "
-                                               "alt=\"\"><span class=\"navbar_link\">"
-                                               "%s"
-                                               "</span></a></li>\n", _("Add new task")
+                               break;
+                       case VIEW_TASKS:
+                               wprintf(
+                                       "<li class=\"newmess\">"
+                                       "<a href=\"display_enter\">"
+                                       "<img  src=\"static/newmess3_24x.gif\" "
+                                       "alt=\"\"><span class=\"navbar_link\">"
+                                       "%s"
+                                       "</span></a></li>\n", _("Add new task")
                                        );
-                                       break;
-                               case VIEW_NOTES:
-                                       wprintf(
-                                               "<li class=\"enternewnote\">"
-                                               "<a href=\"add_new_note\">"
-                                               "<img  src=\"static/enternewnote_24x.gif\" "
-                                               "alt=\"\"><span class=\"navbar_link\">"
-                                               "%s"
-                                               "</span></a></li>\n", _("Add new note")
+                               break;
+                       case VIEW_NOTES:
+                               wprintf(
+                                       "<li class=\"enternewnote\">"
+                                       "<a href=\"add_new_note\">"
+                                       "<img  src=\"static/enternewnote_24x.gif\" "
+                                       "alt=\"\"><span class=\"navbar_link\">"
+                                       "%s"
+                                       "</span></a></li>\n", _("Add new note")
                                        );
-                                       break;
-                               case VIEW_WIKI:
-                                       safestrncpy(buf, bstr("page"), sizeof buf);
-                                       str_wiki_index(buf);
-                                       wprintf(
-                                               "<li class=\"newmess\">"
-                                               "<a href=\"display_enter?wikipage=%s\">"
-                                               "<img  src=\"static/newmess3_24x.gif\" "
-                                               "alt=\"\"><span class=\"navbar_link\">"
-                                               "%s"
-                                               "</span></a></li>\n", buf, _("Edit this page")
+                               break;
+                       case VIEW_WIKI:
+                               safestrncpy(buf, bstr("page"), sizeof buf);
+                               str_wiki_index(buf);
+                               wprintf(
+                                       "<li class=\"newmess\">"
+                                       "<a href=\"display_enter?wikipage=%s\">"
+                                       "<img  src=\"static/newmess3_24x.gif\" "
+                                       "alt=\"\"><span class=\"navbar_link\">"
+                                       "%s"
+                                       "</span></a></li>\n", buf, _("Edit this page")
                                        );
-                                       break;
-                               case VIEW_MAILBOX:
-                                       wprintf(
-                                               "<li class=\"newmess\">"
-                                               "<a href=\"display_enter\">"
-                                               "<img  src=\"static/newmess3_24x.gif\" "
-                                               "alt=\"\"><span class=\"navbar_link\">"
-                                               "%s"
-                                               "</span></a></li>\n", _("Write mail")
+                               break;
+                       case VIEW_MAILBOX:
+                               wprintf(
+                                       "<li class=\"newmess\">"
+                                       "<a href=\"display_enter\">"
+                                       "<img  src=\"static/newmess3_24x.gif\" "
+                                       "alt=\"\"><span class=\"navbar_link\">"
+                                       "%s"
+                                       "</span></a></li>\n", _("Write mail")
                                        );
-                                       break;
-                               default:
-                                       wprintf(
-                                               "<li class=\"newmess\">"
-                                               "<a href=\"display_enter\">"
-                                               "<img  src=\"static/newmess3_24x.gif\" "
-                                               "alt=\"\"><span class=\"navbar_link\">"
-                                               "%s"
-                                               "</span></a></li>\n", _("Enter a message")
+                               break;
+                       default:
+                               wprintf(
+                                       "<li class=\"newmess\">"
+                                       "<a href=\"display_enter\">"
+                                       "<img  src=\"static/newmess3_24x.gif\" "
+                                       "alt=\"\"><span class=\"navbar_link\">"
+                                       "%s"
+                                       "</span></a></li>\n", _("Enter a message")
                                        );
-                                       break;
+                               break;
                        }
                }
 
@@ -718,7 +748,7 @@ void embed_room_banner(char *got, int navbar_style) {
                        "</li>\n",
                        _("Leave all messages marked as unread, go to next room with unread messages"),
                        _("Skip this room")
-               );
+                       );
 
                if (navbar_style == navbar_default) wprintf(
                        "<li class=\"markngo\">"
@@ -729,7 +759,7 @@ void embed_room_banner(char *got, int navbar_style) {
                        "</li>\n",
                        _("Mark all messages as read, go to next room with unread messages"),
                        _("Goto next room")
-               );
+                       );
 
                wprintf("</ul></div>\n");
        }
@@ -740,51 +770,56 @@ void embed_room_banner(char *got, int navbar_style) {
 /*
  * back end routine to take the session to a new room
  */
-int gotoroom(char *gname)
+long gotoroom(const StrBuf *gname)
 {
-       char buf[SIZ];
+       StrBuf *Buf;
        static long ls = (-1L);
-       int err = 0;
+       long err = 0;
 
        /* store ungoto information */
-       strcpy(WC->ugname, WC->wc_roomname);
+       strcpy(WC->ugname, ChrPtr(WC->wc_roomname));
        WC->uglsn = ls;
-
+       Buf = NewStrBuf();
        /** move to the new room */
-       serv_printf("GOTO %s", gname);
-       serv_getln(buf, sizeof buf);
-       if (buf[0] != '2') {
-               buf[3] = 0;
-               err = atoi(buf);
+       serv_printf("GOTO %s", ChrPtr(gname));
+       StrBuf_ServGetln(Buf);
+       if  (GetServerStatus(Buf, &err) != 2) {
                serv_puts("GOTO _BASEROOM_");
-               serv_getln(buf, sizeof buf);
-       }
-       if (buf[0] != '2') {
-               buf[3] = 0;
-               err = atoi(buf);
-               return err;
+               StrBuf_ServGetln(Buf);
+               if (GetServerStatus(Buf, &err) != 2) {
+                       FreeStrBuf(&Buf);
+                       return err;
+               }
        }
-       extract_token(WC->wc_roomname, &buf[4], 0, '|', sizeof WC->wc_roomname);
-       WC->room_flags = extract_int(&buf[4], 4);
+
+       if (WC->wc_roomname == NULL)
+               WC->wc_roomname = NewStrBuf();
+       else
+               FlushStrBuf(WC->wc_roomname);
+
+       StrBufExtract_token(WC->wc_roomname, Buf, 0, '|');
+       StrBufCutLeft(WC->wc_roomname, 4);
+       WC->room_flags = StrBufExtract_int(Buf, 4, '|');
        /* highest_msg_read = extract_int(&buf[4],6);
           maxmsgnum = extract_int(&buf[4],5);
-        */
-       WC->is_mailbox = extract_int(&buf[4],7);
-       ls = extract_long(&buf[4], 6);
-       WC->wc_floor = extract_int(&buf[4], 10);
-       WC->wc_view = extract_int(&buf[4], 11);
-       WC->wc_default_view = extract_int(&buf[4], 12);
-       WC->wc_is_trash = extract_int(&buf[4], 13);
-       WC->room_flags2 = extract_int(&buf[4], 14);
+       */
+       WC->is_mailbox = StrBufExtract_int(Buf, 7, '|');   
+       ls = StrBufExtract_long(Buf, 6, '|');
+       WC->wc_floor = StrBufExtract_int(Buf, 10, '|');
+       WC->wc_view = StrBufExtract_int(Buf, 11, '|');
+       WC->wc_default_view = StrBufExtract_int(Buf, 12, '|');
+       WC->wc_is_trash = StrBufExtract_int(Buf, 13, '|');
+       WC->room_flags2 = StrBufExtract_int(Buf, 14, '|');
 
        if (WC->is_aide)
                WC->is_room_aide = WC->is_aide;
        else
-               WC->is_room_aide = (char) extract_int(&buf[4], 8);
+               WC->is_room_aide = (char) StrBufExtract_int(Buf, 8, '|');
 
        remove_march(WC->wc_roomname);
-       if (!strcasecmp(gname, "_BASEROOM_"))
+       if (!strcasecmp(ChrPtr(gname), "_BASEROOM_"))
                remove_march(gname);
+       FreeStrBuf(&Buf);
 
        return err;
 }
@@ -847,7 +882,7 @@ void gotonext(void)
        struct march *mptr = NULL;
        struct march *mptr2 = NULL;
        char room_name[128];
-       char next_room[128];
+       StrBuf *next_room;
        int ELoop = 0;
 
        /*
@@ -869,7 +904,7 @@ void gotonext(void)
                                        continue;                                       
                                }
                                extract_token(room_name, buf, 0, '|', sizeof room_name);
-                               if (strcasecmp(room_name, WC->wc_roomname)) {
+                               if (strcasecmp(room_name, ChrPtr(WC->wc_roomname))) {
                                        mptr = (struct march *) malloc(sizeof(struct march));
                                        mptr->next = NULL;
                                        safestrncpy(mptr->march_name, room_name, sizeof mptr->march_name);
@@ -907,22 +942,23 @@ void gotonext(void)
                remove_march(WC->wc_roomname);
        }
        if (WC->march != NULL) {
-               strcpy(next_room, pop_march(-1));
+               next_room = NewStrBufPlain(pop_march(-1), -1);/*TODO: migrate march to strbuf */
        } else {
-               strcpy(next_room, "_BASEROOM_");
+               next_room = NewStrBufPlain(HKEY("_BASEROOM_"));
        }
 
 
        smart_goto(next_room);
+       FreeStrBuf(&next_room);
 }
 
 
 /*
  * goto next room
  */
-void smart_goto(char *next_room) {
+void smart_goto(const StrBuf *next_room) {
        gotoroom(next_room);
-       readloop("readnew");
+       readloop(readnew);
 }
 
 
@@ -944,25 +980,29 @@ void slrp_highest(void)
  */
 void ungoto(void)
 {
-       char buf[SIZ];
+       StrBuf *Buf;
 
        if (!strcmp(WC->ugname, "")) {
                smart_goto(WC->wc_roomname);
                return;
        }
        serv_printf("GOTO %s", WC->ugname);
-       serv_getln(buf, sizeof buf);
-       if (buf[0] != '2') {
+       Buf = NewStrBuf();
+       StrBuf_ServGetln(Buf);
+       if (GetServerStatus(Buf, NULL) != 2) {
                smart_goto(WC->wc_roomname);
+               FreeStrBuf(&Buf);
                return;
        }
        if (WC->uglsn >= 0L) {
                serv_printf("SLRP %ld", WC->uglsn);
-               serv_getln(buf, sizeof buf);
+               StrBuf_ServGetln(Buf);
        }
-       strcpy(buf, WC->ugname);
+       FlushStrBuf(Buf);
+       StrBufAppendBufPlain(Buf, WC->ugname, -1, 0);
        strcpy(WC->ugname, "");
-       smart_goto(buf);
+       smart_goto(Buf);
+       FreeStrBuf(&Buf);
 }
 
 typedef struct __room_states {
@@ -1027,8 +1067,8 @@ int self_service(int newval) {
 
        if (newval != current_value) {
                serv_printf("SETR %s|%s|%s|%d|0|%d|%d|%d|%d",
-                       name, password, dirname, flags,
-                       floor, order, view, flags2);
+                           name, password, dirname, flags,
+                           floor, order, view, flags2);
                serv_getln(buf, sizeof buf);
        }
 
@@ -1246,7 +1286,7 @@ void display_editroom(void)
        wprintf("<script type=\"text/javascript\">"
                " Nifty(\"table#AdminTabs td\", \"small transparent top\");"
                "</script>"
-       );
+               );
 
        /* begin content of whatever tab is open now */
 
@@ -1277,7 +1317,7 @@ void display_editroom(void)
                if (!strncmp(buf, "550", 3)) {
                        wprintf("<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]);
@@ -1298,7 +1338,7 @@ void display_editroom(void)
                        wprintf("<input type=\"text\" NAME=\"er_name\" VALUE=\"%s\" MAXLENGTH=\"%d\">\n",
                                er_name,
                                (sizeof(er_name)-1)
-                       );
+                               );
                
                        wprintf("<li>");
                        wprintf(_("Resides on floor: "));
@@ -1333,7 +1373,7 @@ void display_editroom(void)
        
                        wprintf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"hidden\" ");
                        if ((er_flags & QR_PRIVATE) &&
-                       (er_flags & QR_GUESSNAME))
+                           (er_flags & QR_GUESSNAME))
                                wprintf("CHECKED ");
                        wprintf(" OnChange=\""
                                "       if (this.form.type[1].checked == true) {        "
@@ -1344,7 +1384,7 @@ void display_editroom(void)
                
                        wprintf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"passworded\" ");
                        if ((er_flags & QR_PRIVATE) &&
-                       (er_flags & QR_PASSWORDED))
+                           (er_flags & QR_PASSWORDED))
                                wprintf("CHECKED ");
                        wprintf(" OnChange=\""
                                "       if (this.form.type[2].checked == true) {        "
@@ -1357,8 +1397,8 @@ void display_editroom(void)
                
                        wprintf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"invonly\" ");
                        if ((er_flags & QR_PRIVATE)
-                       && ((er_flags & QR_GUESSNAME) == 0)
-                       && ((er_flags & QR_PASSWORDED) == 0))
+                           && ((er_flags & QR_GUESSNAME) == 0)
+                           && ((er_flags & QR_PASSWORDED) == 0))
                                wprintf("CHECKED ");
                        wprintf(" OnChange=\""
                                "       if (this.form.type[3].checked == true) {        "
@@ -1371,10 +1411,10 @@ void display_editroom(void)
                        if (er_flags & QR_MAILBOX)
                                wprintf("CHECKED ");
                        wprintf (" OnChange=\""
-                                     if (this.form.type[4].checked == true) {        "
-                                             this.form.er_floor.disabled = true;     "
-                                     }                                               "
-                               "\"> ");
+                                "      if (this.form.type[4].checked == true) {        "
+                                "              this.form.er_floor.disabled = true;     "
+                                "      }                                               "
+                                "\"> ");
                        wprintf(_("Personal (mailbox for you only)"));
                        
                        wprintf("\n<li><input type=\"checkbox\" NAME=\"bump\" VALUE=\"yes\" ");
@@ -1415,7 +1455,7 @@ void display_editroom(void)
        
                        wprintf("<li><input type=\"checkbox\" NAME=\"ulallowed\" VALUE=\"yes\" ");
                        if (er_flags & QR_UPLOAD)
-                       wprintf("CHECKED ");
+                               wprintf("CHECKED ");
                        wprintf("> ");
                        wprintf(_("Uploading allowed"));
                
@@ -1460,7 +1500,7 @@ void display_editroom(void)
                
                        wprintf("<li><input type=\"radio\" NAME=\"anon\" VALUE=\"no\" ");
                        if (((er_flags & QR_ANONONLY) == 0)
-                       && ((er_flags & QR_ANONOPT) == 0))
+                           && ((er_flags & QR_ANONOPT) == 0))
                                wprintf("CHECKED ");
                        wprintf("> ");
                        wprintf(_("No anonymous messages"));
@@ -1478,7 +1518,7 @@ void display_editroom(void)
                        wprintf(_("Prompt user when entering messages"));
                        wprintf("</ul>\n");
                
-               /* end of anon options */
+                       /* end of anon options */
                
                        wprintf("<li>");
                        wprintf(_("Room aide: "));
@@ -1499,7 +1539,7 @@ void display_editroom(void)
                                "</CENTER>\n",
                                _("Save changes"),
                                _("Cancel")
-                       );
+                               );
                }
                wprintf("</div>");
        }
@@ -1516,30 +1556,30 @@ void display_editroom(void)
                serv_puts("CONF getsys|application/x-citadel-ignet-config");
                serv_getln(buf, sizeof buf);
                if (buf[0]=='1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-                       extract_token(node, buf, 0, '|', sizeof node);
-                       not_shared_with = realloc(not_shared_with,
-                                       strlen(not_shared_with) + 32);
-                       strcat(not_shared_with, node);
-                       strcat(not_shared_with, "\n");
-               }
+                               extract_token(node, buf, 0, '|', sizeof node);
+                               not_shared_with = realloc(not_shared_with,
+                                                         strlen(not_shared_with) + 32);
+                               strcat(not_shared_with, node);
+                               strcat(not_shared_with, "\n");
+                       }
 
                serv_puts("GNET");
                serv_getln(buf, sizeof buf);
                if (buf[0]=='1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-                       extract_token(cmd, buf, 0, '|', sizeof cmd);
-                       extract_token(node, buf, 1, '|', sizeof node);
-                       extract_token(remote_room, buf, 2, '|', sizeof remote_room);
-                       if (!strcasecmp(cmd, "ignet_push_share")) {
-                               shared_with = realloc(shared_with,
-                                               strlen(shared_with) + 32);
-                               strcat(shared_with, node);
-                               if (!IsEmptyStr(remote_room)) {
-                                       strcat(shared_with, "|");
-                                       strcat(shared_with, remote_room);
+                               extract_token(cmd, buf, 0, '|', sizeof cmd);
+                               extract_token(node, buf, 1, '|', sizeof node);
+                               extract_token(remote_room, buf, 2, '|', sizeof remote_room);
+                               if (!strcasecmp(cmd, "ignet_push_share")) {
+                                       shared_with = realloc(shared_with,
+                                                             strlen(shared_with) + 32);
+                                       strcat(shared_with, node);
+                                       if (!IsEmptyStr(remote_room)) {
+                                               strcat(shared_with, "|");
+                                               strcat(shared_with, remote_room);
+                                       }
+                                       strcat(shared_with, "\n");
                                }
-                               strcat(shared_with, "\n");
                        }
-               }
 
                for (i=0; i<num_tokens(shared_with, '\n'); ++i) {
                        extract_token(buf, shared_with, i, '\n', sizeof buf);
@@ -1646,16 +1686,16 @@ void display_editroom(void)
                        "</table></CENTER><br />\n"
                        "<I><B>%s</B><ul><li>", _("Notes:"));
                wprintf(_("When sharing a room, "
-                       "it must be shared from both ends.  Adding a node to "
-                       "the 'shared' list sends messages out, but in order to"
-                       " receive messages, the other nodes must be configured"
-                       " to send messages out to your system as well. "
-                       "<li>If the remote room name is blank, it is assumed "
-                       "that the room name is identical on the remote node."
-                       "<li>If the remote room name is different, the remote "
-                       "node must also configure the name of the room here."
-                       "</ul></I><br />\n"
-               ));
+                         "it must be shared from both ends.  Adding a node to "
+                         "the 'shared' list sends messages out, but in order to"
+                         " receive messages, the other nodes must be configured"
+                         " to send messages out to your system as well. "
+                         "<li>If the remote room name is blank, it is assumed "
+                         "that the room name is identical on the remote node."
+                         "<li>If the remote room name is different, the remote "
+                         "node must also configure the name of the room here."
+                         "</ul></I><br />\n"
+                               ));
 
                wprintf("</div>");
        }
@@ -1670,25 +1710,25 @@ void display_editroom(void)
                        "<tr><td VALIGN=TOP>");
 
                wprintf(_("<i>The contents of this room are being "
-                       "mailed <b>as individual messages</b> "
-                       "to the following list recipients:"
-                       "</i><br /><br />\n"));
+                         "mailed <b>as individual messages</b> "
+                         "to the following list recipients:"
+                         "</i><br /><br />\n"));
 
                serv_puts("GNET");
                serv_getln(buf, sizeof buf);
                if (buf[0]=='1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-                       extract_token(cmd, buf, 0, '|', sizeof cmd);
-                       if (!strcasecmp(cmd, "listrecp")) {
-                               extract_token(recp, buf, 1, '|', sizeof recp);
+                               extract_token(cmd, buf, 0, '|', sizeof cmd);
+                               if (!strcasecmp(cmd, "listrecp")) {
+                                       extract_token(recp, buf, 1, '|', sizeof recp);
                        
-                               escputs(recp);
-                               wprintf(" <a href=\"netedit&cmd=remove&tab=listserv&line=listrecp|");
-                               urlescputs(recp);
-                               wprintf("\">");
-                               wprintf(_("(remove)"));
-                               wprintf("</A><br />");
+                                       escputs(recp);
+                                       wprintf(" <a href=\"netedit&cmd=remove&tab=listserv&line=listrecp|");
+                                       urlescputs(recp);
+                                       wprintf("\">");
+                                       wprintf(_("(remove)"));
+                                       wprintf("</A><br />");
+                               }
                        }
-               }
                wprintf("<br /><form method=\"POST\" action=\"netedit\">\n"
                        "<input type=\"hidden\" NAME=\"tab\" VALUE=\"listserv\">\n"
                        "<input type=\"hidden\" NAME=\"prefix\" VALUE=\"listrecp|\">\n");
@@ -1700,26 +1740,26 @@ void display_editroom(void)
                wprintf("</td><td VALIGN=TOP>\n");
                
                wprintf(_("<i>The contents of this room are being "
-                       "mailed <b>in digest form</b> "
-                       "to the following list recipients:"
-                       "</i><br /><br />\n"));
+                         "mailed <b>in digest form</b> "
+                         "to the following list recipients:"
+                         "</i><br /><br />\n"));
 
                serv_puts("GNET");
                serv_getln(buf, sizeof buf);
                if (buf[0]=='1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-                       extract_token(cmd, buf, 0, '|', sizeof cmd);
-                       if (!strcasecmp(cmd, "digestrecp")) {
-                               extract_token(recp, buf, 1, '|', sizeof recp);
+                               extract_token(cmd, buf, 0, '|', sizeof cmd);
+                               if (!strcasecmp(cmd, "digestrecp")) {
+                                       extract_token(recp, buf, 1, '|', sizeof recp);
                        
-                               escputs(recp);
-                               wprintf(" <a href=\"netedit&cmd=remove&tab=listserv&line="
-                                       "digestrecp|");
-                               urlescputs(recp);
-                               wprintf("\">");
-                               wprintf(_("(remove)"));
-                               wprintf("</A><br />");
+                                       escputs(recp);
+                                       wprintf(" <a href=\"netedit&cmd=remove&tab=listserv&line="
+                                               "digestrecp|");
+                                       urlescputs(recp);
+                                       wprintf("\">");
+                                       wprintf(_("(remove)"));
+                                       wprintf("</A><br />");
+                               }
                        }
-               }
                wprintf("<br /><form method=\"POST\" action=\"netedit\">\n"
                        "<input type=\"hidden\" NAME=\"tab\" VALUE=\"listserv\">\n"
                        "<input type=\"hidden\" NAME=\"prefix\" VALUE=\"digestrecp|\">\n");
@@ -1741,7 +1781,7 @@ void display_editroom(void)
                        _("Digest"),
                        _("Add recipients from Contacts or other address books"),
                        _("Add recipients from Contacts or other address books")
-               );
+                       );
                /* Pop open an address book -- end **/
 
                wprintf("<br />\n<form method=\"GET\" action=\"toggle_self_service\">\n");
@@ -1757,7 +1797,7 @@ void display_editroom(void)
                wprintf(_("The URL for subscribe/unsubscribe is: "));
                wprintf("<TT>%s://%s/listsub</TT></td></tr>\n",
                        (is_https ? "https" : "http"),
-                       WC->http_host);
+                       ChrPtr(WC->http_host));
                /* Public posting? */
                wprintf("<tr><td>");
                wprintf(_("Allow non-subscribers to mail to this room."));
@@ -1790,7 +1830,7 @@ void display_editroom(void)
                if (!strncmp(buf, "550", 3)) {
                        wprintf("<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]);
@@ -1812,7 +1852,7 @@ void display_editroom(void)
                        wprintf("<tr><td>");
                        wprintf(_("Message expire policy for this room"));
                        wprintf("<br />(");
-                       escputs(WC->wc_roomname);
+                       escputs(ChrPtr(WC->wc_roomname));
                        wprintf(")</td><td>");
                        wprintf("<input type=\"radio\" NAME=\"roompolicy\" VALUE=\"0\" %s>",
                                ((roompolicy == 0) ? "CHECKED" : "") );
@@ -1872,7 +1912,7 @@ void display_editroom(void)
                        wprintf("</table>\n"
                                "<input type=\"hidden\" NAME=\"tab\" VALUE=\"expire\">\n"
                                "</form>\n"
-                       );
+                               );
                }
 
                wprintf("</div>");
@@ -1910,41 +1950,41 @@ void display_editroom(void)
                serv_getln(buf, sizeof buf);
                bg = 1;
                if (buf[0]=='1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-                       extract_token(cmd, buf, 0, '|', sizeof cmd);
-                       if (!strcasecmp(cmd, "pop3client")) {
-                               safestrncpy(recp, &buf[11], sizeof recp);
+                               extract_token(cmd, buf, 0, '|', sizeof cmd);
+                               if (!strcasecmp(cmd, "pop3client")) {
+                                       safestrncpy(recp, &buf[11], sizeof recp);
 
-                                bg = 1 - bg;
-                                wprintf("<tr class=\"%s\">",
-                                        (bg ? "even" : "odd")
-                                );
+                                       bg = 1 - bg;
+                                       wprintf("<tr class=\"%s\">",
+                                               (bg ? "even" : "odd")
+                                               );
 
-                               wprintf("<td>");
-                               extract_token(pop3_host, buf, 1, '|', sizeof pop3_host);
-                               escputs(pop3_host);
-                               wprintf("</td>");
+                                       wprintf("<td>");
+                                       extract_token(pop3_host, buf, 1, '|', sizeof pop3_host);
+                                       escputs(pop3_host);
+                                       wprintf("</td>");
 
-                               wprintf("<td>");
-                               extract_token(pop3_user, buf, 2, '|', sizeof pop3_user);
-                               escputs(pop3_user);
-                               wprintf("</td>");
+                                       wprintf("<td>");
+                                       extract_token(pop3_user, buf, 2, '|', sizeof pop3_user);
+                                       escputs(pop3_user);
+                                       wprintf("</td>");
 
-                               wprintf("<td>*****</td>");              /* Don't show the password */
+                                       wprintf("<td>*****</td>");              /* Don't show the password */
 
-                               wprintf("<td>%s</td>", extract_int(buf, 4) ? _("Yes") : _("No"));
+                                       wprintf("<td>%s</td>", extract_int(buf, 4) ? _("Yes") : _("No"));
 
-                               wprintf("<td>%ld</td>", extract_long(buf, 5));  // Fetching interval
+                                       wprintf("<td>%ld</td>", extract_long(buf, 5));  /* Fetching interval */
                        
-                               wprintf("<td class=\"button_link\">");
-                               wprintf(" <a href=\"netedit&cmd=remove&tab=feeds&line=pop3client|");
-                               urlescputs(recp);
-                               wprintf("\">");
-                               wprintf(_("(remove)"));
-                               wprintf("</a></td>");
+                                       wprintf("<td class=\"button_link\">");
+                                       wprintf(" <a href=\"netedit&cmd=remove&tab=feeds&line=pop3client|");
+                                       urlescputs(recp);
+                                       wprintf("\">");
+                                       wprintf(_("(remove)"));
+                                       wprintf("</a></td>");
                        
-                               wprintf("</tr>");
+                                       wprintf("</tr>");
+                               }
                        }
-               }
 
                wprintf("<form method=\"POST\" action=\"netedit\">\n"
                        "<tr>"
@@ -1988,30 +2028,30 @@ void display_editroom(void)
                serv_getln(buf, sizeof buf);
                bg = 1;
                if (buf[0]=='1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-                       extract_token(cmd, buf, 0, '|', sizeof cmd);
-                       if (!strcasecmp(cmd, "rssclient")) {
-                               safestrncpy(recp, &buf[10], sizeof recp);
-
-                                bg = 1 - bg;
-                                wprintf("<tr class=\"%s\">",
-                                        (bg ? "even" : "odd")
-                                );
-
-                               wprintf("<td>");
-                               extract_token(pop3_host, buf, 1, '|', sizeof pop3_host);
-                               escputs(pop3_host);
-                               wprintf("</td>");
-
-                               wprintf("<td class=\"button_link\">");
-                               wprintf(" <a href=\"netedit&cmd=remove&tab=feeds&line=rssclient|");
-                               urlescputs(recp);
-                               wprintf("\">");
-                               wprintf(_("(remove)"));
-                               wprintf("</a></td>");
+                               extract_token(cmd, buf, 0, '|', sizeof cmd);
+                               if (!strcasecmp(cmd, "rssclient")) {
+                                       safestrncpy(recp, &buf[10], sizeof recp);
+
+                                       bg = 1 - bg;
+                                       wprintf("<tr class=\"%s\">",
+                                               (bg ? "even" : "odd")
+                                               );
+
+                                       wprintf("<td>");
+                                       extract_token(pop3_host, buf, 1, '|', sizeof pop3_host);
+                                       escputs(pop3_host);
+                                       wprintf("</td>");
+
+                                       wprintf("<td class=\"button_link\">");
+                                       wprintf(" <a href=\"netedit&cmd=remove&tab=feeds&line=rssclient|");
+                                       urlescputs(recp);
+                                       wprintf("\">");
+                                       wprintf(_("(remove)"));
+                                       wprintf("</a></td>");
                        
-                               wprintf("</tr>");
+                                       wprintf("</tr>");
+                               }
                        }
-               }
 
                wprintf("<form method=\"POST\" action=\"netedit\">\n"
                        "<tr>"
@@ -2078,11 +2118,12 @@ void toggle_self_service(void) {
  */
 void editroom(void)
 {
-       char buf[SIZ];
-       char er_name[128];
-       char er_password[10];
-       char er_dirname[15];
-       char er_roomaide[26];
+       const StrBuf *Ptr;
+       StrBuf *Buf;
+       StrBuf *er_name;
+       StrBuf *er_password;
+       StrBuf *er_dirname;
+       StrBuf *er_roomaide;
        int er_floor;
        unsigned er_flags;
        int er_listingorder;
@@ -2093,65 +2134,79 @@ void editroom(void)
 
        if (!havebstr("ok_button")) {
                strcpy(WC->ImportantMessage,
-                       _("Cancelled.  Changes were not saved."));
+                      _("Cancelled.  Changes were not saved."));
                display_editroom();
                return;
        }
        serv_puts("GETR");
-       serv_getln(buf, sizeof buf);
-
-       if (buf[0] != '2') {
-               strcpy(WC->ImportantMessage, &buf[4]);
+       Buf = NewStrBuf();
+       StrBuf_ServGetln(Buf);
+       if (GetServerStatus(Buf, NULL) != 2) {
+               StrBufCutLeft(Buf, 4);
+               strcpy(WC->ImportantMessage, ChrPtr(Buf));
                display_editroom();
+               FreeStrBuf(&Buf);
                return;
        }
-       extract_token(er_name, &buf[4], 0, '|', sizeof er_name);
-       extract_token(er_password, &buf[4], 1, '|', sizeof er_password);
-       extract_token(er_dirname, &buf[4], 2, '|', sizeof er_dirname);
-       er_flags = extract_int(&buf[4], 3);
-       er_listingorder = extract_int(&buf[4], 5);
-       er_defaultview = extract_int(&buf[4], 6);
-       er_flags2 = extract_int(&buf[4], 7);
 
-       strcpy(er_roomaide, bstr("er_roomaide"));
-       if (IsEmptyStr(er_roomaide)) {
+       er_name = NewStrBuf();
+       er_password = NewStrBuf();
+       er_dirname = NewStrBuf();
+       er_roomaide = NewStrBuf();
+
+       StrBufCutLeft(Buf, 4);
+       StrBufExtract_token(er_name, Buf, 0, '|');
+       StrBufExtract_token(er_password, Buf, 1, '|');
+       StrBufExtract_token(er_dirname, Buf, 2, '|');
+       er_flags = StrBufExtract_int(Buf, 3, '|');
+       er_listingorder = StrBufExtract_int(Buf, 5, '|');
+       er_defaultview = StrBufExtract_int(Buf, 6, '|');
+       er_flags2 = StrBufExtract_int(Buf, 7, '|');
+
+       er_roomaide = NewStrBufDup(sbstr("er_roomaide"));
+       if (StrLength(er_roomaide) == 0) {
                serv_puts("GETA");
-               serv_getln(buf, sizeof buf);
-               if (buf[0] != '2') {
-                       strcpy(er_roomaide, "");
+               StrBuf_ServGetln(Buf);
+               if (GetServerStatus(Buf, NULL) != 2) {
+                       FlushStrBuf(er_roomaide);
                } else {
-                       extract_token(er_roomaide, &buf[4], 0, '|', sizeof er_roomaide);
+                       StrBufCutLeft(Buf, 4);
+                       StrBufExtract_token(er_roomaide, Buf, 0, '|');
                }
        }
-       strcpy(buf, bstr("er_name"));
-       buf[128] = 0;
-       if (!IsEmptyStr(buf)) {
-               strcpy(er_name, buf);
+       Ptr = sbstr("er_name");
+       if (StrLength(Ptr) > 0) {
+               FlushStrBuf(er_name);
+               StrBufAppendBuf(er_name, Ptr, 0);
+       }
+
+       Ptr = sbstr("er_password");
+       if (StrLength(Ptr) > 0) {
+               FlushStrBuf(er_password);
+               StrBufAppendBuf(er_password, Ptr, 0);
        }
+               
 
-       strcpy(buf, bstr("er_password"));
-       buf[10] = 0;
-       if (!IsEmptyStr(buf))
-               strcpy(er_password, buf);
+       Ptr = sbstr("er_dirname");
+       if (StrLength(Ptr) > 0) { /* todo: cut 15 */
+               FlushStrBuf(er_dirname);
+               StrBufAppendBuf(er_dirname, Ptr, 0);
+       }
 
-       strcpy(buf, bstr("er_dirname"));
-       buf[15] = 0;
-       if (!IsEmptyStr(buf))
-               strcpy(er_dirname, buf);
 
-       strcpy(buf, bstr("type"));
+       Ptr = sbstr("type");
        er_flags &= !(QR_PRIVATE | QR_PASSWORDED | QR_GUESSNAME);
 
-       if (!strcmp(buf, "invonly")) {
+       if (!strcmp(ChrPtr(Ptr), "invonly")) {
                er_flags |= (QR_PRIVATE);
        }
-       if (!strcmp(buf, "hidden")) {
+       if (!strcmp(ChrPtr(Ptr), "hidden")) {
                er_flags |= (QR_PRIVATE | QR_GUESSNAME);
        }
-       if (!strcmp(buf, "passworded")) {
+       if (!strcmp(ChrPtr(Ptr), "passworded")) {
                er_flags |= (QR_PRIVATE | QR_PASSWORDED);
        }
-       if (!strcmp(buf, "personal")) {
+       if (!strcmp(ChrPtr(Ptr), "personal")) {
                er_flags |= QR_MAILBOX;
        } else {
                er_flags &= ~QR_MAILBOX;
@@ -2218,45 +2273,64 @@ void editroom(void)
                er_flags &= ~QR_VISDIR;
        }
 
-       strcpy(buf, bstr("anon"));
+       Ptr = sbstr("anon");
 
        er_flags &= ~(QR_ANONONLY | QR_ANONOPT);
-       if (!strcmp(buf, "anononly"))
+       if (!strcmp(ChrPtr(Ptr), "anononly"))
                er_flags |= QR_ANONONLY;
-       if (!strcmp(buf, "anon2"))
+       if (!strcmp(ChrPtr(Ptr), "anon2"))
                er_flags |= QR_ANONOPT;
 
-       bump = 0;
-       if (!strcmp(bstr("bump"), "yes"))
-               bump = 1;
+       bump = yesbstr("bump");
 
        er_floor = ibstr("er_floor");
 
-       sprintf(buf, "SETR %s|%s|%s|%u|%d|%d|%d|%d|%u",
-               er_name, er_password, er_dirname, er_flags, bump, er_floor,
-               er_listingorder, er_defaultview, er_flags2);
-       serv_puts(buf);
-       serv_getln(buf, sizeof buf);
-       if (buf[0] != '2') {
-               strcpy(WC->ImportantMessage, &buf[4]);
+       StrBufPrintf(Buf, "SETR %s|%s|%s|%u|%d|%d|%d|%d|%u",
+                    ChrPtr(er_name), 
+                    ChrPtr(er_password), 
+                    ChrPtr(er_dirname), 
+                    er_flags, 
+                    bump, 
+                    er_floor,
+                    er_listingorder, 
+                    er_defaultview, 
+                    er_flags2);
+       serv_putbuf(Buf);
+       StrBuf_ServGetln(Buf);
+       if (GetServerStatus(Buf, NULL) != 2) {
+               strcpy(WC->ImportantMessage, &ChrPtr(Buf)[4]);
                display_editroom();
+               FreeStrBuf(&Buf);
+               FreeStrBuf(&er_name);
+               FreeStrBuf(&er_password);
+               FreeStrBuf(&er_dirname);
+               FreeStrBuf(&er_roomaide);
                return;
        }
        gotoroom(er_name);
 
-       if (!IsEmptyStr(er_roomaide)) {
-               sprintf(buf, "SETA %s", er_roomaide);
-               serv_puts(buf);
-               serv_getln(buf, sizeof buf);
-               if (buf[0] != '2') {
-                       strcpy(WC->ImportantMessage, &buf[4]);
+       if (StrLength(er_roomaide) > 0) {
+               serv_printf("SETA %s", ChrPtr(er_roomaide));
+               StrBuf_ServGetln(Buf);
+               if (GetServerStatus(Buf, NULL) != 2) {
+                       strcpy(WC->ImportantMessage, &ChrPtr(Buf)[4]);
                        display_main_menu();
+                       FreeStrBuf(&Buf);
+                       FreeStrBuf(&er_name);
+                       FreeStrBuf(&er_password);
+                       FreeStrBuf(&er_dirname);
+                       FreeStrBuf(&er_roomaide);
                        return;
                }
        }
        gotoroom(er_name);
        strcpy(WC->ImportantMessage, _("Your changes have been saved."));
        display_editroom();
+       FreeStrBuf(&Buf);
+       FreeStrBuf(&er_name);
+       FreeStrBuf(&er_password);
+       FreeStrBuf(&er_dirname);
+       FreeStrBuf(&er_roomaide);
        return;
 }
 
@@ -2330,8 +2404,8 @@ void display_whok(void)
         
        wprintf("<table border=0 CELLSPACING=10><tr VALIGN=TOP><td>");
        wprintf(_("The users listed below have access to this room.  "
-               "To remove a user from the access list, select the user "
-               "name from the list and click 'Kick'."));
+                 "To remove a user from the access list, select the user "
+                 "name from the list and click 'Kick'."));
        wprintf("<br /><br />");
        
         wprintf("<CENTER><form method=\"POST\" action=\"do_invt_kick\">\n");
@@ -2355,7 +2429,7 @@ void display_whok(void)
 
        wprintf("</td><td>");
        wprintf(_("To grant another user access to this room, enter the "
-               "user name in the box below and click 'Invite'."));
+                 "user name in the box below and click 'Invite'."));
        wprintf("<br /><br />");
 
         wprintf("<CENTER><form method=\"POST\" action=\"do_invt_kick\">\n");
@@ -2367,16 +2441,16 @@ void display_whok(void)
                "<input type=\"hidden\" name=\"invite_button\" value=\"Invite\">"
                "<input type=\"submit\" value=\"%s\">"
                "</form></CENTER>\n", _("Invite"));
-               /* Pop open an address book -- begin **/
-               wprintf(
-                       "<a href=\"javascript:PopOpenAddressBook('username_id|%s');\" "
-                       "title=\"%s\">"
-                       "<img align=middle border=0 width=24 height=24 src=\"static/viewcontacts_24x.gif\">"
-                       "&nbsp;%s</a>",
-                       _("User"), 
-                       _("Users"), _("Users")
+       /* Pop open an address book -- begin **/
+       wprintf(
+               "<a href=\"javascript:PopOpenAddressBook('username_id|%s');\" "
+               "title=\"%s\">"
+               "<img align=middle border=0 width=24 height=24 src=\"static/viewcontacts_24x.gif\">"
+               "&nbsp;%s</a>",
+               _("User"), 
+               _("Users"), _("Users")
                );
-               /* Pop open an address book -- end **/
+       /* Pop open an address book -- end **/
 
        wprintf("</td></tr></table>\n");
        address_book_popup();
@@ -2405,7 +2479,7 @@ void display_entroom(void)
        output_headers(1, 1, 1, 0, 0, 0);
 
        svprintf(HKEY("BOXTITLE"), WCS_STRING, _("Create a new room"));
-       do_template("beginbox");
+       do_template("beginbox", NULL);
 
        wprintf("<form name=\"create_room_form\" method=\"POST\" action=\"entroom\">\n");
        wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
@@ -2433,12 +2507,12 @@ void display_entroom(void)
         wprintf("</select>\n");
         wprintf("</td></tr>");
 
-               /*
-                * Our clever little snippet of JavaScript automatically selects
-                * a public room if the view is set to Bulletin Board or wiki, and
-                * it selects a mailbox room otherwise.  The user can override this,
-                * of course.  We also disable the floor selector for mailboxes.
-                */
+       /*
+        * Our clever little snippet of JavaScript automatically selects
+        * a public room if the view is set to Bulletin Board or wiki, and
+        * 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>");
@@ -2527,7 +2601,7 @@ void display_entroom(void)
                fmout("LEFT");
        }
 
-       do_template("endbox");
+       do_template("endbox", NULL);
 
        wDumpContent(1);
 }
@@ -2563,9 +2637,9 @@ void er_set_default_view(int newview) {
        rm_bits2 = extract_int(&buf[4], 7);
 
        serv_printf("SETR %s|%s|%s|%d|0|%d|%d|%d|%d",
-               rm_name, rm_pass, rm_dir, rm_bits1, rm_floor,
-               rm_listorder, newview, rm_bits2
-       );
+                   rm_name, rm_pass, rm_dir, rm_bits1, rm_floor,
+                   rm_listorder, newview, rm_bits2
+               );
        serv_getln(buf, sizeof buf);
 }
 
@@ -2577,38 +2651,43 @@ void er_set_default_view(int newview) {
 void entroom(void)
 {
        char buf[SIZ];
-       char er_name[SIZ];
-       char er_type[SIZ];
-       char er_password[SIZ];
+       const StrBuf *er_name;
+       const StrBuf *er_type;
+       const StrBuf *er_password;
        int er_floor;
        int er_num_type;
        int er_view;
 
        if (!havebstr("ok_button")) {
                strcpy(WC->ImportantMessage,
-                       _("Cancelled.  No new room was created."));
+                      _("Cancelled.  No new room was created."));
                display_main_menu();
                return;
        }
-       strcpy(er_name, bstr("er_name"));
-       strcpy(er_type, bstr("type"));
-       strcpy(er_password, bstr("er_password"));
+       er_name = sbstr("er_name");
+       er_type = sbstr("type");
+       er_password = sbstr("er_password");
        er_floor = ibstr("er_floor");
        er_view = ibstr("er_view");
 
        er_num_type = 0;
-       if (!strcmp(er_type, "hidden"))
+       if (!strcmp(ChrPtr(er_type), "hidden"))
                er_num_type = 1;
-       if (!strcmp(er_type, "passworded"))
+       else if (!strcmp(ChrPtr(er_type), "passworded"))
                er_num_type = 2;
-       if (!strcmp(er_type, "invonly"))
+       else if (!strcmp(ChrPtr(er_type), "invonly"))
                er_num_type = 3;
-       if (!strcmp(er_type, "personal"))
+       else if (!strcmp(ChrPtr(er_type), "personal"))
                er_num_type = 4;
 
-       sprintf(buf, "CRE8 1|%s|%d|%s|%d|%d|%d", 
-               er_name, er_num_type, er_password, er_floor, 0, er_view);
-       serv_puts(buf);
+       serv_printf("CRE8 1|%s|%d|%s|%d|%d|%d", 
+                   ChrPtr(er_name), 
+                   er_num_type, 
+                   ChrPtr(er_password), 
+                   er_floor, 
+                   0, 
+                   er_view);
+
        serv_getln(buf, sizeof buf);
        if (buf[0] != '2') {
                strcpy(WC->ImportantMessage, &buf[4]);
@@ -2629,17 +2708,24 @@ void entroom(void)
  */
 void display_private(char *rname, int req_pass)
 {
+       WCTemplputParams SubTP;
+       StrBuf *Buf;
        output_headers(1, 1, 1, 0, 0, 0);
 
-       svprintf(HKEY("BOXTITLE"), WCS_STRING, _("Go to a hidden room"));
-       do_template("beginbox");
+       Buf = NewStrBufPlain(_("Go to a hidden room"), -1);
+       memset(&SubTP, 0, sizeof(WCTemplputParams));
+       SubTP.Filter.ContextType = CTX_STRBUF;
+       SubTP.Context = Buf;
+       DoTemplate(HKEY("beginbox"), NULL, &SubTP);
+
+       FreeStrBuf(&Buf);
 
        wprintf("<p>");
        wprintf(_("If you know the name of a hidden (guess-name) or "
-               "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."));
+                 "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>");
 
        wprintf("<form method=\"post\" action=\"goto_private\">\n");
@@ -2666,10 +2752,10 @@ void display_private(char *rname, int req_pass)
                "<input type=\"submit\" name=\"cancel_button\" value=\"%s\">",
                _("Go there"),
                _("Cancel")
-       );
+               );
        wprintf("</div></form>\n");
 
-       do_template("endbox");
+       do_template("endbox", NULL);
 
        wDumpContent(1);
 }
@@ -2686,16 +2772,14 @@ void goto_private(void)
                display_main_menu();
                return;
        }
-       strcpy(hold_rm, WC->wc_roomname);
-       strcpy(buf, "GOTO ");
-       strcat(buf, bstr("gr_name"));
-       strcat(buf, "|");
-       strcat(buf, bstr("gr_pass"));
-       serv_puts(buf);
+       strcpy(hold_rm, ChrPtr(WC->wc_roomname));
+       serv_printf("GOTO %s|%s",
+                   bstr("gr_name"),
+                   bstr("gr_pass"));
        serv_getln(buf, sizeof buf);
 
        if (buf[0] == '2') {
-               smart_goto(bstr("gr_name"));
+               smart_goto(sbstr("gr_name"));
                return;
        }
        if (!strncmp(buf, "540", 3)) {
@@ -2725,8 +2809,8 @@ void display_zap(void)
        wprintf("<div id=\"content\" class=\"service\">\n");
 
        wprintf(_("If you select this option, <em>%s</em> will "
-               "disappear from your room list.  Is this what you wish "
-               "to do?<br />\n"), WC->wc_roomname);
+                 "disappear from your room list.  Is this what you wish "
+                 "to do?<br />\n"), ChrPtr(WC->wc_roomname));
 
        wprintf("<form method=\"POST\" action=\"zap\">\n");
        wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
@@ -2744,26 +2828,28 @@ void display_zap(void)
 void zap(void)
 {
        char buf[SIZ];
-       char final_destination[SIZ];
+       StrBuf *final_destination;
 
        /**
         * If the forget-room routine fails for any reason, we fall back
         * to the current room; otherwise, we go to the Lobby
         */
-       strcpy(final_destination, WC->wc_roomname);
+       final_destination = NewStrBufDup(WC->wc_roomname);
 
        if (havebstr("ok_button")) {
-               serv_printf("GOTO %s", WC->wc_roomname);
+               serv_printf("GOTO %s", ChrPtr(WC->wc_roomname));
                serv_getln(buf, sizeof buf);
                if (buf[0] == '2') {
                        serv_puts("FORG");
                        serv_getln(buf, sizeof buf);
                        if (buf[0] == '2') {
-                               strcpy(final_destination, "_BASEROOM_");
+                               FlushStrBuf(final_destination);
+                               StrBufAppendBufPlain(final_destination, HKEY("_BASEROOM_"), 0);
                        }
                }
        }
        smart_goto(final_destination);
+       FreeStrBuf(&final_destination);
 }
 
 
@@ -2784,7 +2870,11 @@ void delete_room(void)
                display_main_menu();
                return;
        } else {
-               smart_goto("_BASEROOM_");
+               StrBuf *Buf;
+               
+               Buf = NewStrBufPlain(HKEY("_BASEROOM_"));
+               smart_goto(Buf);
+               FreeStrBuf(&Buf);
        }
 }
 
@@ -2802,7 +2892,7 @@ void netedit(void) {
        char cmpb0[SIZ];
        char cmpb1[SIZ];
        int i, num_addrs;
-       // TODO: do line dynamic!
+       /*/ TODO: do line dynamic! */
        if (havebstr("line_pop3host")) {
                strcpy(line, bstr("prefix"));
                strcat(line, bstr("line_pop3host"));
@@ -2848,7 +2938,7 @@ void netedit(void) {
                extract_token(cmpb0, line, 0, '|', sizeof cmpb0);
                extract_token(cmpb1, line, 1, '|', sizeof cmpb1);
                if ( (strcasecmp(cmpa0, cmpb0)) 
-                  || (strcasecmp(cmpa1, cmpb1)) ) {
+                    || (strcasecmp(cmpa1, cmpb1)) ) {
                        fprintf(fp, "%s\n", buf);
                }
        }
@@ -2996,7 +3086,7 @@ void do_folder_view(struct folder *fold, int max_folders, int num_floors) {
                "       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) {
@@ -3006,7 +3096,7 @@ void do_folder_view(struct folder *fold, int max_folders, int num_floors) {
                        int len;
                        len = strlen(fold[i].name);
                        if ( (!strncasecmp(fold[i].name, fold[i+1].name, len))
-                          && (fold[i+1].name[len] == '|') ) {
+                            && (fold[i+1].name[len] == '|') ) {
                                has_subfolders = 1;
                        }
                }
@@ -3075,7 +3165,7 @@ void do_folder_view(struct folder *fold, int max_folders, int num_floors) {
        wprintf("container = document.getElementById('roomlist_div');   \n"
                "showTree('');  \n"
                "</script>\n"
-       );
+               );
 
        free(parents);
        /** END TREE MENU */
@@ -3091,7 +3181,6 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
        char buf[256];
        char floor_name[256];
        char old_floor_name[256];
-       char boxtitle[256];
        int levels, oldlevels;
        int i, t;
        int num_boxes = 0;
@@ -3118,12 +3207,12 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
 
                levels = num_tokens(fold[i].name, '|');
                extract_token(floor_name, fold[i].name, 0,
-                       '|', sizeof floor_name);
+                             '|', sizeof floor_name);
 
                if ( (strcasecmp(floor_name, old_floor_name))
-                  && (!IsEmptyStr(old_floor_name)) ) {
+                    && (!IsEmptyStr(old_floor_name)) ) {
                        /* End inner box */
-                       do_template("endbox");
+                       do_template("endbox", NULL);
                        wprintf("<br>");
 
                        ++num_boxes;
@@ -3137,10 +3226,16 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
                strcpy(old_floor_name, floor_name);
 
                if (levels == 1) {
-                       /** Begin inner box */
-                       stresc(boxtitle, 256, floor_name, 1, 0);
-                       svprintf(HKEY("BOXTITLE"), WCS_STRING, boxtitle);
-                       do_template("beginbox");
+                       StrBuf *Buf;
+                       WCTemplputParams SubTP;
+
+                       Buf = NewStrBufPlain(floor_name, -1);
+                       memset(&SubTP, 0, sizeof(WCTemplputParams));
+                       SubTP.Filter.ContextType = CTX_STRBUF;
+                       SubTP.Context = Buf;
+                       DoTemplate(HKEY("beginbox"), NULL, &SubTP);
+                       
+                       FreeStrBuf(&Buf);
                }
 
                oldlevels = levels;
@@ -3178,7 +3273,7 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
                }
        }
        /** End the final inner box */
-       do_template("endbox");
+       do_template("endbox", NULL);
 
        wprintf("</td></tr></table>\n");
 }
@@ -3187,10 +3282,14 @@ void do_rooms_view(struct folder *fold, int max_folders, int num_floors) {
  * \brief print a floor div???
  * \param which_floordiv name of the floordiv???
  */
-void set_floordiv_expanded(char *which_floordiv) {
-       begin_ajax_response();
-       StrBufPrintf(WC->floordiv_expanded, "%s", which_floordiv);
-       end_ajax_response();
+void set_floordiv_expanded(void) {
+       wcsession *WCC = WC;
+       StrBuf *FloorDiv;
+       
+       FloorDiv = NewStrBuf();
+       StrBufAppendBuf(FloorDiv, WCC->UrlFragment2, 0);
+       set_preference("floordiv_expanded", FloorDiv, 1);
+       WCC->floordiv_expanded = FloorDiv;
 }
 
 /**
@@ -3207,7 +3306,6 @@ void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
        char floordiv_id[32];
        int levels, oldlevels;
        int i, t;
-       int num_drop_targets = 0;
        char *icon = NULL;
 
        strcpy(floor_name, "");
@@ -3219,10 +3317,10 @@ void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
 
                levels = num_tokens(fold[i].name, '|');
                extract_token(floor_name, fold[i].name, 0,
-                       '|', sizeof floor_name);
+                             '|', sizeof floor_name);
 
                if ( (strcasecmp(floor_name, old_floor_name))
-                  && (!IsEmptyStr(old_floor_name)) ) {
+                    && (!IsEmptyStr(old_floor_name)) ) {
                        /** End inner box */
                        wprintf("<br>\n");
                        wprintf("</div>\n");    /** floordiv */
@@ -3239,7 +3337,7 @@ void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
                        wprintf("<div id=\"%s\" style=\"display:%s\">",
                                floordiv_id,
                                (!strcasecmp(floordiv_id, ChrPtr(WC->floordiv_expanded)) ? "block" : "none")
-                       );
+                               );
                }
 
                oldlevels = levels;
@@ -3306,30 +3404,6 @@ void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) {
        wprintf("</div>\n");    /** floordiv */
 
 
-       /** BEGIN: The old invisible pixel trick, to get our JavaScript to initialize */
-       wprintf("<img src=\"static/blank.gif\" onLoad=\"\n");
-
-       num_drop_targets = 0;
-
-       for (i=0; i<max_folders; ++i) {
-               levels = num_tokens(fold[i].name, '|');
-               if (levels > 1) {
-                       wprintf("drop_targets_elements[%d]=$('roomdiv%d');\n", num_drop_targets, i);
-                       wprintf("drop_targets_roomnames[%d]='", num_drop_targets);
-                       jsescputs(fold[i].room);
-                       wprintf("';\n");
-                       ++num_drop_targets;
-               }
-       }
-
-       wprintf("num_drop_targets = %d;\n", num_drop_targets);
-       if ((ChrPtr(WC->floordiv_expanded)[0] != '\0')&&
-           (ChrPtr(WC->floordiv_expanded)[1] != '\0')){
-               wprintf("which_div_expanded = '%s';\n", ChrPtr(WC->floordiv_expanded));
-       }
-
-       wprintf("\">\n");
-       /** END: The old invisible pixel trick, to get our JavaScript to initialize */
 }
 
 
@@ -3400,18 +3474,18 @@ void list_all_rooms_by_floor(const char *viewpref) {
        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;
-       }
+                       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)
@@ -3422,43 +3496,43 @@ void list_all_rooms_by_floor(const char *viewpref) {
                floor_mapping[fold[i].floor]=i;
        
        /** refresh the messages index for this room */
-//     serv_puts("GOTO ");
-//     while (serv_getln(buf, sizeof buf), strcmp(buf, "000"));
+/* TODO        serv_puts("GOTO ");
+   while (serv_getln(buf, sizeof buf), strcmp(buf, "000")); */
        /** Now add rooms */
        serv_puts("LKRA");
        serv_getln(buf, sizeof buf);
        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++;
+                       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;
                }
-               ++max_folders;
-       }
        
        /*
         * Remove any floors that don't have rooms
@@ -3487,7 +3561,7 @@ void list_all_rooms_by_floor(const char *viewpref) {
                        }
                        else {
                                if ( (fold[j+1].is_mailbox)
-                                  && (!fold[j].is_mailbox)) {
+                                    && (!fold[j].is_mailbox)) {
                                        swap = 1;
                                }
                                else {
@@ -3497,9 +3571,9 @@ void list_all_rooms_by_floor(const char *viewpref) {
                        if (swap > 0) {
                                memcpy(&ftmp, &fold[j], sizeof(struct folder));
                                memcpy(&fold[j], &fold[j+1],
-                                                       sizeof(struct folder));
+                                      sizeof(struct folder));
                                memcpy(&fold[j+1], &ftmp,
-                                                       sizeof(struct folder));
+                                      sizeof(struct folder));
                        }
                }
        }
@@ -3539,29 +3613,33 @@ void list_all_rooms_by_floor(const char *viewpref) {
  */
 void knrooms(void)
 {
-       StrBuf *ListView;
+       StrBuf *ListView = NULL;
 
        output_headers(1, 1, 2, 0, 0, 0);
 
        /** Determine whether the user is trying to change views */
-       if (bstr("view") != NULL) {
-               if (havebstr("view")) {
-                       set_preference("roomlistview", NewStrBufPlain(bstr("view"), -1), 1);
-               }
+       if (havebstr("view")) {
+               ListView = NewStrBufPlain(bstr("view"), -1);
+               set_preference("roomlistview", ListView, 1);
        }
-
+       /** Sanitize the input so its safe */
        if(!get_preference("roomlistview", &ListView) ||
-          ((strcasecmp(ChrPtr(ListView), "folders"))
-           && (strcasecmp(ChrPtr(ListView), "table")))) {
-               if (ListView == NULL)
-                       ListView = NewStrBuf();
-               StrBufPrintf(ListView, "%s", "rooms");
-               set_preference("roomlistview", ListView, 0);
+          ((strcasecmp(ChrPtr(ListView), "folders") != 0) &&
+           (strcasecmp(ChrPtr(ListView), "table") != 0))) 
+       {
+               if (ListView == NULL) {
+                       ListView = NewStrBufPlain("rooms", sizeof("rooms") - 1);
+                       set_preference("roomlistview", ListView, 0);
+               }
+               else {
+                       StrBufPrintf(ListView, "rooms");
+                       save_preferences();
+               }
        }
 
        /** title bar */
        wprintf("<div id=\"banner\">\n");
-       wprintf("<div class=\"room_banner\">");
+       wprintf("<div class=\"room_banner\" id=\"room_banner\">");
        wprintf("<h1>");
        if (!strcasecmp(ChrPtr(ListView), "rooms")) {
                wprintf(_("Room list"));
@@ -3573,11 +3651,12 @@ void knrooms(void)
                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();
+       offer_start_page(NULL, &NoCtx);
        wprintf("</li>");
        wprintf("<li><form name=\"roomlistomatic\">\n"
                "<select name=\"newview\" size=\"1\" "
@@ -3588,17 +3667,17 @@ void knrooms(void)
                "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>\n");
+       wprintf("</ul></div></div>\n");
 
        wprintf("<div id=\"content\" class=\"service\">\n");
 
@@ -3617,7 +3696,7 @@ void set_room_policy(void) {
 
        if (!havebstr("ok_button")) {
                strcpy(WC->ImportantMessage,
-                       _("Cancelled.  Changes were not saved."));
+                      _("Cancelled.  Changes were not saved."));
                display_editroom();
                return;
        }
@@ -3628,7 +3707,7 @@ void set_room_policy(void) {
 
        if (WC->axlevel >= 6) {
                strcat(WC->ImportantMessage, "<br />\n");
-               serv_printf("SPEX floor|%d|%d", ibstr("floorpolicy"), bstr("floorvalue"));
+               serv_printf("SPEX floor|%d|%d", ibstr("floorpolicy"), ibstr("floorvalue"));
                serv_getln(buf, sizeof buf);
                strcat(WC->ImportantMessage, &buf[4]);
        }
@@ -3636,4 +3715,353 @@ 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 (ChrPtr(Buf)[0] == '1') while(StrBufTCP_read_line(Buf, &WC->serv_sock, 0, &Err), strcmp(ChrPtr(Buf), "000")) {
+                       int a;
+                       const char *floorNum;
+                       floor = NewHash(1, NULL);
+                       for(a=0; a<FLOOR_PARAM_LEN; a++) {
+                               Buf2 = NewStrBuf();
+                               StrBufExtract_token(Buf2, Buf, a, '|');
+                               if (a==0) {
+                                       floorNum = ChrPtr(Buf2); /* hmm, should we copy Buf2 first? */
+                               }
+                               Put(floor, FPKEY(a), Buf2, NULL);
+                       }
+                       Put(floors, HKEY(floorNum), floor, NULL);
+               }
+       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 (ChrPtr(buf)[0] == '1') while(StrBufTCP_read_line(buf, &WC->serv_sock, 0, &Err), strcmp(ChrPtr(buf), "000")) {
+                       int i;
+                       const char *rmName;
+                       room = NewHash(1, NULL);
+                       for(i=0; i<ROOM_PARAM_LEN; i++) {
+                               buf2 = NewStrBuf();
+                               StrBufExtract_token(buf2, buf, i, '|');
+                               if (i==0) {
+                                       rmName = ChrPtr(buf2);
+                               }
+                               Put(room, RPKEY(i), buf2, NULL);
+                       }
+                       Put(rooms, rmName, strlen(rmName), room, NULL);
+               }
+       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, RPKEY(3), (void *)&listOrderBuf1);
+       GetHash(r2, RPKEY(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);
+}
+
+void _gotonext(void) { slrp_highest(); gotonext(); }
+void dotskip(void) {smart_goto(sbstr("room"));}
+void _display_private(void) { display_private("", 0); }
+void dotgoto(void) {
+       if (WC->wc_view != VIEW_MAILBOX) {      /* dotgoto acts like dotskip when we're in a mailbox view */
+               slrp_highest();
+       }
+       smart_goto(sbstr("room"));
+}
+
+void tmplput_roombanner(StrBuf *Target, WCTemplputParams *TP)
+{
+       wprintf("<div id=\"banner\">\n");
+       embed_room_banner(NULL, navbar_default);
+       wprintf("</div>\n");
+}
+
+
+void tmplput_ungoto(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+
+       if ((WCC!=NULL) && 
+           (!IsEmptyStr(WCC->ugname)))
+               StrBufAppendBufPlain(Target, WCC->ugname, -1, 0);
+}
+
+
+int ConditionalHaveUngoto(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) && 
+               (!IsEmptyStr(WCC->ugname)) && 
+               (strcasecmp(WCC->ugname, ChrPtr(WCC->wc_roomname)) == 0));
+}
+
+int ConditionalRoomHas_QR_PERMANENT(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_PERMANENT) != 0));
+}
+
+int ConditionalRoomHas_QR_INUSE(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_INUSE) != 0));
+}
+
+int ConditionalRoomHas_QR_PRIVATE(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_PRIVATE) != 0));
+}
+
+int ConditionalRoomHas_QR_PASSWORDED(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_PASSWORDED) != 0));
+}
+
+int ConditionalRoomHas_QR_GUESSNAME(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_GUESSNAME) != 0));
+}
+
+int ConditionalRoomHas_QR_DIRECTORY(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_DIRECTORY) != 0));
+}
+
+int ConditionalRoomHas_QR_UPLOAD(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_UPLOAD) != 0));
+}
+
+int ConditionalRoomHas_QR_DOWNLOAD(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_DOWNLOAD) != 0));
+}
+
+int ConditionalRoomHas_QR_VISDIR(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_VISDIR) != 0));
+}
+
+int ConditionalRoomHas_QR_ANONONLY(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_ANONONLY) != 0));
+}
+
+int ConditionalRoomHas_QR_ANONOPT(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_ANONOPT) != 0));
+}
+
+int ConditionalRoomHas_QR_NETWORK(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_NETWORK) != 0));
+}
+
+int ConditionalRoomHas_QR_PREFONLY(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_PREFONLY) != 0));
+}
+
+int ConditionalRoomHas_QR_READONLY(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_READONLY) != 0));
+}
+
+int ConditionalRoomHas_QR_MAILBOX(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       
+       return ((WCC!=NULL) &&
+               ((WCC->room_flags & QR_MAILBOX) != 0));
+}
+
+
+int ConditionalHaveRoomeditRights(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+
+       return ( (WCC!= NULL) && 
+                ((WCC->axlevel >= 6) || 
+                 (WCC->is_room_aide) || 
+                 (WCC->is_mailbox) ));
+}
+
+void 
+InitModule_ROOMOPS
+(void)
+{
+       RegisterPreference(HKEY("roomlistview"),
+                           _("Room list view"),
+                           PRF_STRING,
+                           NULL);
+        RegisterPreference(HKEY("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);
+
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_PERMANENT"), 0, ConditionalRoomHas_QR_PERMANENT, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_INUSE"), 0, ConditionalRoomHas_QR_INUSE, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_PRIVATE"), 0, ConditionalRoomHas_QR_PRIVATE, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_PASSWORDED"), 0, ConditionalRoomHas_QR_PASSWORDED, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_GUESSNAME"), 0, ConditionalRoomHas_QR_GUESSNAME, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_DIRECTORY"), 0, ConditionalRoomHas_QR_DIRECTORY, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_UPLOAD"), 0, ConditionalRoomHas_QR_UPLOAD, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_DOWNLOAD"), 0, ConditionalRoomHas_QR_DOWNLOAD, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_VISIDIR"), 0, ConditionalRoomHas_QR_VISDIR, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_ANONONLY"), 0, ConditionalRoomHas_QR_ANONONLY, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_ANONOPT"), 0, ConditionalRoomHas_QR_ANONOPT, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_NETWORK"), 0, ConditionalRoomHas_QR_NETWORK, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_PREFONLY"), 0, ConditionalRoomHas_QR_PREFONLY, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_READONLY"), 0, ConditionalRoomHas_QR_READONLY, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:FLAGS:QR_MAILBOX"), 0, ConditionalRoomHas_QR_MAILBOX, CTX_NONE);
+
+       RegisterConditional(HKEY("COND:UNGOTO"), 0, ConditionalHaveUngoto, CTX_NONE);
+       RegisterConditional(HKEY("COND:ROOM:EDITACCESS"), 0, ConditionalHaveRoomeditRights, CTX_NONE);
+
+       RegisterNamespace("ROOM:UNGOTO", 0, 0, tmplput_ungoto, 0);
+       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, NULL, CTX_ROOMS, CTX_NONE, IT_NOFLAG);
+       RegisterNamespace("ROOM:INFO", 1, 2, tmplput_ROOM_Value, CTX_ROOMS);
+}
+
 /*@}*/