* burn our folder cache when zapping/deleting
[citadel.git] / webcit / roomops.c
index ea6acbef220b7fd8a56312b73b6c1c73028ce7f5..319b80f4e7136f43bafc5147e6a6ff39ab7ac63e 100644 (file)
@@ -9,8 +9,6 @@
 
 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.
  */
@@ -18,19 +16,37 @@ char *viewdefs[9];                  /* the different kinds of available views */
 void display_whok(void);
 int ConditionalHaveRoomeditRights(StrBuf *Target, WCTemplputParams *TP);
 
+
+char *viewdefs[VIEW_MAX];                      /* the different kinds of available views */
+
+ROOM_VIEWS exchangeable_views[VIEW_MAX][VIEW_MAX] = {  /* the different kinds of available views for a view */
+{VIEW_BBS, VIEW_MAILBOX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX }, 
+{VIEW_BBS, VIEW_MAILBOX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX }, 
+{VIEW_MAX, VIEW_MAX, VIEW_ADDRESSBOOK, VIEW_CALENDAR, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX }, 
+{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_CALENDAR, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX /*VIEW_CALBRIEF*/, VIEW_MAX, VIEW_MAX }, 
+{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_TASKS, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, },
+{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_NOTES, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, },
+{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_WIKI, VIEW_MAX, VIEW_MAX, VIEW_MAX}, 
+{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_CALENDAR, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX/*VIEW_CALBRIEF*/, VIEW_MAX, VIEW_MAX},
+{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_JOURNAL, VIEW_MAX }, 
+{VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_MAX, VIEW_BLOG }, 
+       };
+/* the brief calendar view is disabled: VIEW_CALBRIEF */
+
 /*
  * Initialize the viewdefs with localized strings
  */
 void initialize_viewdefs(void) {
-       viewdefs[0] = _("Bulletin Board");
-       viewdefs[1] = _("Mail Folder");
-       viewdefs[2] = _("Address Book");
-       viewdefs[3] = _("Calendar");
-       viewdefs[4] = _("Task List");
-       viewdefs[5] = _("Notes List");
-       viewdefs[6] = _("Wiki");
-       viewdefs[7] = _("Calendar List");
-       viewdefs[8] = _("Journal");
+       viewdefs[VIEW_BBS] = _("Bulletin Board");
+       viewdefs[VIEW_MAILBOX] = _("Mail Folder");
+       viewdefs[VIEW_ADDRESSBOOK] = _("Address Book");
+       viewdefs[VIEW_CALENDAR] = _("Calendar");
+       viewdefs[VIEW_TASKS] = _("Task List");
+       viewdefs[VIEW_NOTES] = _("Notes List");
+       viewdefs[VIEW_WIKI] = _("Wiki");
+       viewdefs[VIEW_CALBRIEF] = _("Calendar List");
+       viewdefs[VIEW_JOURNAL] = _("Journal");
+       viewdefs[VIEW_BLOG] = _("Blog");
 }
 
 /*
@@ -206,73 +222,6 @@ void listrms(char *variety)
 }
 
 
-/*
- * list all forgotten rooms
- */
-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);
-
-       FreeStrBuf(&Buf);
-
-       listrms("LZRM -1");
-
-       wc_printf("<br /><br />\n");
-       wc_printf(_("Click on any room to un-zap it and goto that room.\n"));
-       do_template("endbox", NULL);
-       wDumpContent(1);
-}
-
-/*
- * Display the current view and offer an option to change it
- */
-void embed_view_o_matic(StrBuf *Target, WCTemplputParams *TP)
-{
-       int i;
-
-       wc_printf("<form name=\"viewomatic\" action=\"changeview\">\n");
-       wc_printf("\t<div style=\"display: inline;\">\n\t<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-       wc_printf("<label for=\"view_name\">");
-       wc_printf(_("View as:"));
-       wc_printf("</label> "
-               "<select name=\"newview\" size=\"1\" "
-               "id=\"view_name\" class=\"selectbox\" "
-               "OnChange=\"location.href=viewomatic.newview.options"
-               "[selectedIndex].value\">\n");
-
-       for (i=0; i<(sizeof viewdefs / sizeof (char *)); ++i) {
-               /*
-                * Only offer the views that make sense, given the default
-                * view for the room.  For example, don't offer a Calendar
-                * view in a non-Calendar room.
-                */
-               if (
-                       (i == WC->CurRoom.view)
-                       ||      (i == WC->CurRoom.defview)                      /* default */
-                       ||      ( (i == 0) && (WC->CurRoom.defview == 1) )      /* mail or bulletin */
-                       ||      ( (i == 1) && (WC->CurRoom.defview == 0) )      /* mail or bulletin */
-                       /* ||   ( (i == 7) && (WC->CurRoom.defview == 3) )      (calendar list temporarily disabled) */
-                       ) {
-
-                       wc_printf("<option %s value=\"changeview?view=%d\">",
-                               ((i == WC->CurRoom.view) ? "selected" : ""),
-                               i );
-                       escputs(viewdefs[i]);
-                       wc_printf("</option>\n");
-               }
-       }
-       wc_printf("</select></div></form>\n");
-}
-
-
 
 /*
  * Embed the room banner
@@ -282,31 +231,20 @@ void embed_view_o_matic(StrBuf *Target, WCTemplputParams *TP)
  *
  */
 
-void embed_room_banner(char *got, int navbar_style) {
+void embed_room_banner(void) 
+{
        wcsession *WCC = WC;
        char buf[256];
-       char buf2[1024];
-       char with_files[256];
-       int file_count=0;
-       
-       /*
-        * We need to have the information returned by a GOTO server command.
-        * If it isn't supplied, we fake it by issuing our own GOTO.
-        */
-       if (got == NULL) {
-               memset(buf, '0', 20);
-               buf[20] = '\0';
-               serv_printf("GOTO %s", ChrPtr(WC->CurRoom.name));
-               serv_getln(buf, sizeof buf);
-               got = buf;
-       }
+
+       /* refresh current room states... */
+       /* dosen't work??? gotoroom(NULL); */
 
        /* The browser needs some information for its own use */
        wc_printf("<script type=\"text/javascript\">    \n"
                  "     room_is_trash = %d;             \n"
                  "</script>\n",
                  ((WC->CurRoom.RAFlags & UA_ISTRASH) != 0)
-       );
+               );
 
        /*
         * If the user happens to select the "make this my start page" link,
@@ -319,311 +257,280 @@ void embed_room_banner(char *got, int navbar_style) {
        StrBufPrintf(WCC->Hdr->this_page, 
                     "dotskip?room=%s",
                     ChrPtr(WC->CurRoom.name)
-       );
-
-       /* Check for new mail. */
-       WC->new_mail = extract_int(&got[4], 9);
-       WC->CurRoom.view = extract_int(&got[4], 11);
-
-       /* Is this a directory room and does it contain files and how many? */
-       if ((WC->CurRoom.QRFlags & QR_DIRECTORY) && (WC->CurRoom.QRFlags & QR_VISDIR))
-       {
-               serv_puts("RDIR");
-               serv_getln(buf2, sizeof buf2);
-               if (buf2[0] == '1') while (serv_getln(buf2, sizeof buf2), strcmp(buf2, "000"))
-                                           file_count++;
-               snprintf (with_files, sizeof with_files, 
-                         "; <a href=\"do_template?template=files\"> %d %s </a>", 
-                         file_count, 
-                         ((file_count>1) || (file_count == 0)  ? _("files") : _("file")));
-       }
-       else
-               strcpy (with_files, "");
-       
-       svprintf(HKEY("NUMMSGS"), WCS_STRING,
-                _("%d new of %d messages%s"),
-                extract_int(&got[4], 1),
-                extract_int(&got[4], 2),
-                with_files
                );
-       svcallback("VIEWOMATIC", embed_view_o_matic); 
+
        do_template("roombanner", NULL);
        /* roombanner contains this for mobile */
-       if (navbar_style != navbar_none && (WC->is_mobile < 1)) { 
+       if (WC->is_mobile)
+               return;
 
-               wc_printf("<div id=\"navbar\"><ul>");
 
-               if (navbar_style == navbar_default) wc_printf(
-                       "<li class=\"ungoto\">"
-                       "<a href=\"ungoto\">"
-                       "<img src=\"static/ungoto2_24x.gif\" alt=\"\" width=\"24\" height=\"24\">"
+       wc_printf("<div id=\"navbar\"><ul>");
+
+       wc_printf(
+               "<li class=\"ungoto\">"
+               "<a href=\"ungoto\">"
+               "<img src=\"static/ungoto2_24x.gif\" alt=\"\" width=\"24\" height=\"24\">"
+               "<span class=\"navbar_link\">%s</span></A>"
+               "</li>\n", _("Ungoto")
+               );
+       
+       if (WC->CurRoom.view == VIEW_BBS) {
+               wc_printf(
+                       "<li class=\"newmess\">"
+                       "<a href=\"readnew\">"
+                       "<img src=\"static/newmess2_24x.gif\" alt=\"\" width=\"24\" height=\"24\">"
                        "<span class=\"navbar_link\">%s</span></A>"
-                       "</li>\n", _("Ungoto")
+                       "</li>\n", _("Read new messages")
                        );
+       }
 
-               if ( (navbar_style == navbar_default) && (WC->CurRoom.view == VIEW_BBS) ) {
+       switch(WC->CurRoom.view) {
+       case VIEW_ADDRESSBOOK:
+               wc_printf(
+                       "<li class=\"viewcontacts\">"
+                       "<a href=\"readfwd\">"
+                       "<img src=\"static/viewcontacts_24x.gif\" "
+                       "alt=\"\" width=\"24\" height=\"24\">"
+                       "<span class=\"navbar_link\">"
+                       "%s"
+                       "</span></a></li>\n", _("View contacts")
+                       );
+               break;
+       case VIEW_CALENDAR:
+               wc_printf(
+                       "<li class=\"staskday\">"
+                       "<a href=\"readfwd?calview=day\">"
+                       "<img src=\"static/taskday2_24x.gif\" "
+                       "alt=\"\" width=\"24\" height=\"24\">"
+                       "<span class=\"navbar_link\">"
+                       "%s"
+                       "</span></a></li>\n", _("Day view")
+                       );
+               wc_printf(
+                       "<li class=\"monthview\">"
+                       "<a href=\"readfwd?calview=month\">"
+                       "<img src=\"static/monthview2_24x.gif\" "
+                       "alt=\"\" width=\"24\" height=\"24\">"
+                       "<span class=\"navbar_link\">"
+                       "%s"
+                       "</span></a></li>\n", _("Month view")
+                       );
+               break;
+       case VIEW_CALBRIEF:
+               wc_printf(
+                       "<li class=\"monthview\">"
+                       "<a href=\"readfwd?calview=month\">"
+                       "<img src=\"static/monthview2_24x.gif\" "
+                       "alt=\"\" width=\"24\" height=\"24\">"
+                       "<span class=\"navbar_link\">"
+                       "%s"
+                       "</span></a></li>\n", _("Calendar list")
+                       );
+               break;
+       case VIEW_TASKS:
+               wc_printf(
+                       "<li class=\"taskmanag\">"
+                       "<a href=\"readfwd\">"
+                       "<img src=\"static/taskmanag_24x.gif\" "
+                       "alt=\"\" width=\"24\" height=\"24\">"
+                       "<span class=\"navbar_link\">"
+                       "%s"
+                       "</span></a></li>\n", _("View tasks")
+                       );
+               break;
+       case VIEW_NOTES:
+               wc_printf(
+                       "<li class=\"viewnotes\">"
+                       "<a href=\"readfwd\">"
+                       "<img src=\"static/viewnotes_24x.gif\" "
+                       "alt=\"\" width=\"24\" height=\"24\">"
+                       "<span class=\"navbar_link\">"
+                       "%s"
+                       "</span></a></li>\n", _("View notes")
+                       );
+               break;
+       case VIEW_MAILBOX:
+               wc_printf(
+                       "<li class=\"readallmess\">"
+                       "<a id=\"m_refresh\" href=\"readfwd\">"
+                       "<img src=\"static/readallmess3_24x.gif\" "
+                       "alt=\"\" width=\"24\" height=\"24\">"
+                       "<span class=\"navbar_link\">"
+                       "%s"
+                       "</span></a></li>\n", _("Refresh message list")
+                       );
+               break;
+       case VIEW_WIKI:
+               wc_printf(
+                       "<li class=\"readallmess\">"
+                       "<a href=\"wiki?page=home\">"
+                       "<img src=\"static/readallmess3_24x.gif\" "
+                       "alt=\"\" width=\"24\" height=\"24\">"
+                       "<span class=\"navbar_link\">"
+                       "%s"
+                       "</span></a></li>\n", _("Wiki home")
+                       );
+               break;
+       default:
+               wc_printf(
+                       "<li class=\"readallmess\">"
+                       "<a href=\"readfwd\">"
+                       "<img src=\"static/readallmess3_24x.gif\" "
+                       "alt=\"\" width=\"24\" height=\"24\">"
+                       "<span class=\"navbar_link\">"
+                       "%s"
+                       "</span></a></li>\n", _("Read all messages")
+                       );
+               break;
+       }
+       
+       switch(WC->CurRoom.view) {
+       case VIEW_ADDRESSBOOK:
+               wc_printf(
+                       "<li class=\"addnewcontact\">"
+                       "<a href=\"display_enter\">"
+                       "<img src=\"static/addnewcontact_24x.gif\" "
+                       "alt=\"\" width=\"24\" height=\"24\">"
+                       "<span class=\"navbar_link\">"
+                       "%s"
+                       "</span></a></li>\n", _("Add new contact")
+                       );
+               break;
+       case VIEW_CALENDAR:
+       case VIEW_CALBRIEF:
+               wc_printf("<li class=\"addevent\"><a href=\"display_enter");
+               if (havebstr("year" )) wc_printf("?year=%s", bstr("year"));
+               if (havebstr("month")) wc_printf("?month=%s", bstr("month"));
+               if (havebstr("day"  )) wc_printf("?day=%s", bstr("day"));
+               wc_printf("\">"
+                         "<img  src=\"static/addevent_24x.gif\" "
+                         "alt=\"\" width=\"24\" height=\"24\">"
+                         "<span class=\"navbar_link\">"
+                         "%s"
+                         "</span></a></li>\n", _("Add new event")
+                       );
+               break;
+       case VIEW_TASKS:
+               wc_printf(
+                       "<li class=\"newmess\">"
+                       "<a href=\"display_enter\">"
+                       "<img  src=\"static/newmess3_24x.gif\" "
+                       "alt=\"\" width=\"24\" height=\"24\">"
+                       "<span class=\"navbar_link\">"
+                       "%s"
+                       "</span></a></li>\n", _("Add new task")
+                       );
+               break;
+       case VIEW_NOTES:
+               wc_printf(
+                       "<li class=\"enternewnote\">"
+                       "<a href=\"add_new_note\">"
+                       "<img  src=\"static/enternewnote_24x.gif\" "
+                       "alt=\"\" width=\"24\" height=\"24\">"
+                       "<span class=\"navbar_link\">"
+                       "%s"
+                       "</span></a></li>\n", _("Add new note")
+                       );
+               break;
+       case VIEW_WIKI:
+               safestrncpy(buf, bstr("page"), sizeof buf);
+               if (IsEmptyStr(buf)) {
+                       safestrncpy(buf, "home", sizeof buf);
+               }
+               str_wiki_index(buf);
+               wc_printf(
+                       "<li class=\"newmess\">"
+                       "<a href=\"display_enter?page=%s\">"
+                       "<img  src=\"static/newmess3_24x.gif\" "
+                       "alt=\"\" width=\"24\" height=\"24\">"
+                       "<span class=\"navbar_link\">"
+                       "%s"
+                       "</span></a></li>\n", buf, _("Edit this page")
+                       );
+               
+               if (bmstrcasestr((char *)ChrPtr(WCC->Hdr->HR.ReqLine), "wiki_history")) {
+                       /* already viewing history; display a link to the current page */
                        wc_printf(
                                "<li class=\"newmess\">"
-                               "<a href=\"readnew\">"
-                               "<img src=\"static/newmess2_24x.gif\" alt=\"\" width=\"24\" height=\"24\">"
-                               "<span class=\"navbar_link\">%s</span></A>"
-                               "</li>\n", _("Read new messages")
+                               "<a href=\"wiki?page=%s\">"
+                               "<img  src=\"static/newmess3_24x.gif\" "
+                               "alt=\"\" width=\"24\" height=\"24\">"
+                               "<span class=\"navbar_link\">"
+                               "%s"
+                               "</span></a></li>\n", buf, _("Current version")
                                );
                }
-
-               if (navbar_style == navbar_default) {
-                       switch(WC->CurRoom.view) {
-                       case VIEW_ADDRESSBOOK:
-                               wc_printf(
-                                       "<li class=\"viewcontacts\">"
-                                       "<a href=\"readfwd\">"
-                                       "<img src=\"static/viewcontacts_24x.gif\" "
-                                       "alt=\"\" width=\"24\" height=\"24\">"
-                                       "<span class=\"navbar_link\">"
-                                       "%s"
-                                       "</span></a></li>\n", _("View contacts")
-                                       );
-                               break;
-                       case VIEW_CALENDAR:
-                               wc_printf(
-                                       "<li class=\"staskday\">"
-                                       "<a href=\"readfwd?calview=day\">"
-                                       "<img src=\"static/taskday2_24x.gif\" "
-                                       "alt=\"\" width=\"24\" height=\"24\">"
-                                       "<span class=\"navbar_link\">"
-                                       "%s"
-                                       "</span></a></li>\n", _("Day view")
-                                       );
-                               wc_printf(
-                                       "<li class=\"monthview\">"
-                                       "<a href=\"readfwd?calview=month\">"
-                                       "<img src=\"static/monthview2_24x.gif\" "
-                                       "alt=\"\" width=\"24\" height=\"24\">"
-                                       "<span class=\"navbar_link\">"
-                                       "%s"
-                                       "</span></a></li>\n", _("Month view")
-                                       );
-                               break;
-                       case VIEW_CALBRIEF:
-                               wc_printf(
-                                       "<li class=\"monthview\">"
-                                       "<a href=\"readfwd?calview=month\">"
-                                       "<img src=\"static/monthview2_24x.gif\" "
-                                       "alt=\"\" width=\"24\" height=\"24\">"
-                                       "<span class=\"navbar_link\">"
-                                       "%s"
-                                       "</span></a></li>\n", _("Calendar list")
-                                       );
-                               break;
-                       case VIEW_TASKS:
-                               wc_printf(
-                                       "<li class=\"taskmanag\">"
-                                       "<a href=\"readfwd\">"
-                                       "<img src=\"static/taskmanag_24x.gif\" "
-                                       "alt=\"\" width=\"24\" height=\"24\">"
-                                       "<span class=\"navbar_link\">"
-                                       "%s"
-                                       "</span></a></li>\n", _("View tasks")
-                                       );
-                               break;
-                       case VIEW_NOTES:
-                               wc_printf(
-                                       "<li class=\"viewnotes\">"
-                                       "<a href=\"readfwd\">"
-                                       "<img src=\"static/viewnotes_24x.gif\" "
-                                       "alt=\"\" width=\"24\" height=\"24\">"
-                                       "<span class=\"navbar_link\">"
-                                       "%s"
-                                       "</span></a></li>\n", _("View notes")
-                                       );
-                               break;
-                       case VIEW_MAILBOX:
-                               wc_printf(
-                                       "<li class=\"readallmess\">"
-                                       "<a id=\"m_refresh\" href=\"readfwd\">"
-                                       "<img src=\"static/readallmess3_24x.gif\" "
-                                       "alt=\"\" width=\"24\" height=\"24\">"
-                                       "<span class=\"navbar_link\">"
-                                       "%s"
-                                       "</span></a></li>\n", _("Refresh message list")
-                                       );
-                               break;
-                       case VIEW_WIKI:
-                               wc_printf(
-                                       "<li class=\"readallmess\">"
-                                       "<a href=\"wiki?page=home\">"
-                                       "<img src=\"static/readallmess3_24x.gif\" "
-                                       "alt=\"\" width=\"24\" height=\"24\">"
-                                       "<span class=\"navbar_link\">"
-                                       "%s"
-                                       "</span></a></li>\n", _("Wiki home")
-                                       );
-                               break;
-                       default:
-                               wc_printf(
-                                       "<li class=\"readallmess\">"
-                                       "<a href=\"readfwd\">"
-                                       "<img src=\"static/readallmess3_24x.gif\" "
-                                       "alt=\"\" width=\"24\" height=\"24\">"
-                                       "<span class=\"navbar_link\">"
-                                       "%s"
-                                       "</span></a></li>\n", _("Read all messages")
-                                       );
-                               break;
-                       }
-               }
-
-               if (navbar_style == navbar_default) {
-                       switch(WC->CurRoom.view) {
-                       case VIEW_ADDRESSBOOK:
-                               wc_printf(
-                                       "<li class=\"addnewcontact\">"
-                                       "<a href=\"display_enter\">"
-                                       "<img src=\"static/addnewcontact_24x.gif\" "
-                                       "alt=\"\" width=\"24\" height=\"24\">"
-                                       "<span class=\"navbar_link\">"
-                                       "%s"
-                                       "</span></a></li>\n", _("Add new contact")
-                                       );
-                               break;
-                       case VIEW_CALENDAR:
-                       case VIEW_CALBRIEF:
-                               wc_printf("<li class=\"addevent\"><a href=\"display_enter");
-                               if (havebstr("year" )) wc_printf("?year=%s", bstr("year"));
-                               if (havebstr("month")) wc_printf("?month=%s", bstr("month"));
-                               if (havebstr("day"  )) wc_printf("?day=%s", bstr("day"));
-                               wc_printf("\">"
-                                       "<img  src=\"static/addevent_24x.gif\" "
-                                       "alt=\"\" width=\"24\" height=\"24\">"
-                                       "<span class=\"navbar_link\">"
-                                       "%s"
-                                       "</span></a></li>\n", _("Add new event")
-                                       );
-                               break;
-                       case VIEW_TASKS:
-                               wc_printf(
-                                       "<li class=\"newmess\">"
-                                       "<a href=\"display_enter\">"
-                                       "<img  src=\"static/newmess3_24x.gif\" "
-                                       "alt=\"\" width=\"24\" height=\"24\">"
-                                       "<span class=\"navbar_link\">"
-                                       "%s"
-                                       "</span></a></li>\n", _("Add new task")
-                                       );
-                               break;
-                       case VIEW_NOTES:
-                               wc_printf(
-                                       "<li class=\"enternewnote\">"
-                                       "<a href=\"add_new_note\">"
-                                       "<img  src=\"static/enternewnote_24x.gif\" "
-                                       "alt=\"\" width=\"24\" height=\"24\">"
-                                       "<span class=\"navbar_link\">"
-                                       "%s"
-                                       "</span></a></li>\n", _("Add new note")
-                                       );
-                               break;
-                       case VIEW_WIKI:
-                               safestrncpy(buf, bstr("page"), sizeof buf);
-                               if (IsEmptyStr(buf)) {
-                                       safestrncpy(buf, "home", sizeof buf);
-                               }
-                               str_wiki_index(buf);
-                               wc_printf(
-                                       "<li class=\"newmess\">"
-                                       "<a href=\"display_enter?page=%s\">"
-                                       "<img  src=\"static/newmess3_24x.gif\" "
-                                       "alt=\"\" width=\"24\" height=\"24\">"
-                                       "<span class=\"navbar_link\">"
-                                       "%s"
-                                       "</span></a></li>\n", buf, _("Edit this page")
-                                       );
-
-                               if (bmstrcasestr((char *)ChrPtr(WCC->Hdr->HR.ReqLine), "wiki_history")) {
-                                       /* already viewing history; display a link to the current page */
-                                       wc_printf(
-                                               "<li class=\"newmess\">"
-                                               "<a href=\"wiki?page=%s\">"
-                                               "<img  src=\"static/newmess3_24x.gif\" "
-                                               "alt=\"\" width=\"24\" height=\"24\">"
-                                               "<span class=\"navbar_link\">"
-                                               "%s"
-                                               "</span></a></li>\n", buf, _("Current version")
-                                               );
-                               }
-                               else {
-                                       /* display a link to the history */
-                                       wc_printf(
-                                               "<li class=\"newmess\">"
-                                               "<a href=\"wiki_history?page=%s\">"
-                                               "<img  src=\"static/newmess3_24x.gif\" "
-                                               "alt=\"\" width=\"24\" height=\"24\">"
-                                               "<span class=\"navbar_link\">"
-                                               "%s"
-                                               "</span></a></li>\n", buf, _("History")
-                                               );
-                               }
-                               break;
-                       case VIEW_MAILBOX:
-                               wc_printf(
-                                       "<li class=\"newmess\">"
-                                       "<a href=\"display_enter\">"
-                                       "<img  src=\"static/newmess3_24x.gif\" "
-                                       "alt=\"\" width=\"24\" height=\"24\">"
-                                       "<span class=\"navbar_link\">"
-                                       "%s"
-                                       "</span></a></li>\n", _("Write mail")
-                                       );
-                               wc_printf(
-                                       "<li class=\"newmess\">"
-                                       "<a href=\"javascript:deleteAllSelectedMessages();\">"
-                                       "<img  src=\"static/delete.gif\" "
-                                       "alt=\"\" width=\"24\" height=\"24\"><span class=\"navbar_link\">"
-                                       "%s"
-                                       "</span></a></li>\n", _("Delete")
-                                       );
-                               break;
-                       default:
-                               wc_printf(
-                                       "<li class=\"newmess\">"
-                                       "<a href=\"display_enter\">"
-                                       "<img  src=\"static/newmess3_24x.gif\" "
-                                       "alt=\"\" width=\"24\" height=\"24\">"
-                                       "<span class=\"navbar_link\">"
-                                       "%s"
-                                       "</span></a></li>\n", _("Enter a message")
-                                       );
-                               break;
-                       }
+               else {
+                       /* display a link to the history */
+                       wc_printf(
+                               "<li class=\"newmess\">"
+                               "<a href=\"wiki_history?page=%s\">"
+                               "<img  src=\"static/newmess3_24x.gif\" "
+                               "alt=\"\" width=\"24\" height=\"24\">"
+                               "<span class=\"navbar_link\">"
+                               "%s"
+                               "</span></a></li>\n", buf, _("History")
+                               );
                }
-
-               if (navbar_style == navbar_default) wc_printf(
-                       "<li class=\"skipthisroom\">"
-                       "<a href=\"skip\" "
-                       "title=\"%s\">"
-                       "<img  src=\"static/skipthisroom_24x.gif\" alt=\"\" "
-                       "width=\"24\" height=\"24\">"
-                       "<span class=\"navbar_link\">%s</span></a>"
-                       "</li>\n",
-                       _("Leave all messages marked as unread, go to next room with unread messages"),
-                       _("Skip this room")
+               break;
+       case VIEW_MAILBOX:
+               wc_printf(
+                       "<li class=\"newmess\">"
+                       "<a href=\"display_enter\">"
+                       "<img  src=\"static/newmess3_24x.gif\" "
+                       "alt=\"\" width=\"24\" height=\"24\">"
+                       "<span class=\"navbar_link\">"
+                       "%s"
+                       "</span></a></li>\n", _("Write mail")
                        );
-
-               if (navbar_style == navbar_default) wc_printf(
-                       "<li class=\"markngo\">"
-                       "<a href=\"gotonext\" "
-                       "title=\"%s\">"
-                       "<img  src=\"static/markngo_24x.gif\" alt=\"\" "
-                       "width=\"24\" height=\"24\">"
-                       "<span class=\"navbar_link\">%s</span></a>"
-                       "</li>\n",
-                       _("Mark all messages as read, go to next room with unread messages"),
-                       _("Goto next room")
+               wc_printf(
+                       "<li class=\"newmess\">"
+                       "<a href=\"javascript:deleteAllSelectedMessages();\">"
+                       "<img  src=\"static/delete.gif\" "
+                       "alt=\"\" width=\"24\" height=\"24\"><span class=\"navbar_link\">"
+                       "%s"
+                       "</span></a></li>\n", _("Delete")
                        );
-
-               wc_printf("</ul></div>\n");
+               break;
+       default:
+               wc_printf(
+                       "<li class=\"newmess\">"
+                       "<a href=\"display_enter\">"
+                       "<img  src=\"static/newmess3_24x.gif\" "
+                       "alt=\"\" width=\"24\" height=\"24\">"
+                       "<span class=\"navbar_link\">"
+                       "%s"
+                       "</span></a></li>\n", _("Enter a message")
+                       );
+               break;
        }
-
+       
+       wc_printf(
+               "<li class=\"skipthisroom\">"
+               "<a href=\"skip\" "
+               "title=\"%s\">"
+               "<img  src=\"static/skipthisroom_24x.gif\" alt=\"\" "
+               "width=\"24\" height=\"24\">"
+               "<span class=\"navbar_link\">%s</span></a>"
+               "</li>\n",
+               _("Leave all messages marked as unread, go to next room with unread messages"),
+               _("Skip this room")
+               );
+       
+       wc_printf(
+               "<li class=\"markngo\">"
+               "<a href=\"gotonext\" "
+               "title=\"%s\">"
+               "<img  src=\"static/markngo_24x.gif\" alt=\"\" "
+               "width=\"24\" height=\"24\">"
+               "<span class=\"navbar_link\">%s</span></a>"
+               "</li>\n",
+               _("Mark all messages as read, go to next room with unread messages"),
+               _("Goto next room")
+               );
+       
+       wc_printf("</ul></div>\n");
 }
 
 
@@ -638,12 +545,16 @@ long gotoroom(const StrBuf *gname)
        long err = 0;
 
        /* store ungoto information */
-       strcpy(WCC->ugname, ChrPtr(WCC->CurRoom.name));
+       if (StrLength(gname) > 0)
+               strcpy(WCC->ugname, ChrPtr(WCC->CurRoom.name));
        WCC->uglsn = ls;
        Buf = NewStrBuf();
 
        /* move to the new room */
-       serv_printf("GOTO %s", ChrPtr(gname));
+       if (StrLength(gname) > 0)
+               serv_printf("GOTO %s", ChrPtr(gname));
+       else /* or just refresh the current state... */
+               serv_printf("GOTO 00000000000000000000");
        StrBuf_ServGetln(Buf);
        if  (GetServerStatus(Buf, &err) != 2) {
                serv_puts("GOTO _BASEROOM_");
@@ -660,9 +571,12 @@ long gotoroom(const StrBuf *gname)
        }
        ParseGoto(&WCC->CurRoom, Buf);
 
-       remove_march(WCC->CurRoom.name);
-       if (!strcasecmp(ChrPtr(gname), "_BASEROOM_"))
-               remove_march(gname);
+       if (StrLength(gname) > 0)
+       {
+               remove_march(WCC->CurRoom.name);
+               if (!strcasecmp(ChrPtr(gname), "_BASEROOM_"))
+                       remove_march(gname);
+       }
        FreeStrBuf(&Buf);
 
        return err;
@@ -859,7 +773,7 @@ void LoadRoomXA (void)
                StrBufExtract_NextToken(WCC->CurRoom.Directory, Buf, &Pos, '|'); 
                StrBufSkip_NTokenS(Buf, &Pos, '|', 2); /* QRFlags, FloorNum we already know... */
                WCC->CurRoom.Order = StrBufExtractNext_long(Buf, &Pos, '|');
-               WCC->CurRoom.DefView = StrBufExtractNext_long(Buf, &Pos, '|');
+               /* defview, we already know you. */
                /* QR2Flags, we already know them... */
 
        }
@@ -1028,9 +942,7 @@ void tmplput_CurrentRoomDefView(StrBuf *Target, WCTemplputParams *TP)
 {
        wcsession *WCC = WC;
 
-       LoadRoomXA();
-
-       StrBufAppendPrintf(Target, "%d", WCC->CurRoom.DefView);
+       StrBufAppendPrintf(Target, "%d", WCC->CurRoom.defview);
 }
 
 void tmplput_CurrentRoom_nNewMessages(StrBuf *Target, WCTemplputParams *TP) 
@@ -1073,14 +985,81 @@ int ConditionalThisRoomDefView(StrBuf *Target, WCTemplputParams *TP)
        if (WCC == NULL)
                return 0;
 
-       LoadRoomXA();
+       CheckThis = GetTemplateTokenNumber(Target, TP, 2, 0);
+       return CheckThis == WCC->CurRoom.defview;
+}
+
+int ConditionalThisRoomCurrView(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       long CheckThis;
+
+       if (WCC == NULL)
+               return 0;
+
+       CheckThis = GetTemplateTokenNumber(Target, TP, 2, 0);
+       return CheckThis == WCC->CurRoom.view;
+}
+
+int ConditionalThisRoomHaveView(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       long CheckThis;
+       
+       if (WCC == NULL)
+               return 0;
 
        CheckThis = GetTemplateTokenNumber(Target, TP, 2, 0);
-       return CheckThis == WCC->CurRoom.DefView;
+       if ((CheckThis >= VIEW_MAX) || (CheckThis < VIEW_BBS))
+       {
+               LogTemplateError(Target, "Conditional", ERR_PARM2, TP,
+                                "Roomview [%ld] not valid\n", 
+                                CheckThis);
+               return 0;
+       }
+
+       return exchangeable_views [WCC->CurRoom.defview][CheckThis] != VIEW_MAX;
+}
+
+void tmplput_CurrentRoomViewString(StrBuf *Target, WCTemplputParams *TP) 
+{
+       wcsession *WCC = WC;
+       StrBuf *Buf;
+
+       if ((WCC == NULL) ||
+           (WCC->CurRoom.defview >= VIEW_MAX) || 
+           (WCC->CurRoom.defview < VIEW_BBS))
+       {
+               LogTemplateError(Target, "Token", ERR_PARM2, TP,
+                                "Roomview [%ld] not valid\n", 
+                                (WCC != NULL)? 
+                                WCC->CurRoom.defview : -1);
+               return;
+       }
+
+       Buf = NewStrBufPlain(_(viewdefs[WCC->CurRoom.defview]), -1);
+       StrBufAppendTemplate(Target, TP, Buf, 0);
+       FreeStrBuf(&Buf);
 }
 
+void tmplput_RoomViewString(StrBuf *Target, WCTemplputParams *TP) 
+{
+       long CheckThis;
+       StrBuf *Buf;
 
+       CheckThis = GetTemplateTokenNumber(Target, TP, 0, 0);
+       if ((CheckThis >= VIEW_MAX) || (CheckThis < VIEW_BBS))
+       {
+               LogTemplateError(Target, "Token", ERR_PARM2, TP,
+                                "Roomview [%ld] not valid\n", 
+                                CheckThis);
+               return;
+       }
 
+       Buf = NewStrBufPlain(_(viewdefs[CheckThis]), -1);
+       StrBufAppendTemplate(Target, TP, Buf, 0);
+       FreeStrBuf(&Buf);
+}
 
 
 /*
@@ -2809,7 +2788,7 @@ void entroom(void)
        }
        /** TODO: Room created, now update the left hand icon bar for this user */
        burn_folder_cache(0);   /* burn the old folder cache */
-       
+       FlushRoomlist ();
        gotoroom(er_name);
 
        serv_printf("VIEW %d", er_view);
@@ -2915,34 +2894,6 @@ void goto_private(void)
 }
 
 
-/**
- * \brief display the screen to zap a room
- */
-void display_zap(void)
-{
-       output_headers(1, 1, 2, 0, 0, 0);
-
-       wc_printf("<div id=\"banner\">\n");
-       wc_printf("<h1>");
-       wc_printf(_("Zap (forget/unsubscribe) the current room"));
-       wc_printf("</h1>\n");
-       wc_printf("</div>\n");
-
-       wc_printf("<div id=\"content\" class=\"service\">\n");
-
-       wc_printf(_("If you select this option, <em>%s</em> will "
-                 "disappear from your room list.  Is this what you wish "
-                 "to do?<br />\n"), ChrPtr(WC->CurRoom.name));
-
-       wc_printf("<form method=\"POST\" action=\"zap\">\n");
-       wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-       wc_printf("<input type=\"submit\" NAME=\"ok_button\" VALUE=\"%s\">", _("Zap this room"));
-       wc_printf("&nbsp;");
-       wc_printf("<input type=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">", _("Cancel"));
-       wc_printf("</form>\n");
-       wDumpContent(1);
-}
-
 
 /**
  * \brief zap a room
@@ -2969,6 +2920,7 @@ void zap(void)
                                StrBufAppendBufPlain(final_destination, HKEY("_BASEROOM_"), 0);
                        }
                }
+               FlushRoomlist ();
        }
        smart_goto(final_destination);
        FreeStrBuf(&final_destination);
@@ -2987,6 +2939,7 @@ void delete_room(void)
        serv_puts("KILL 1");
        serv_getln(buf, sizeof buf);
        burn_folder_cache(0);   /* Burn the cahce of known rooms to update the icon bar */
+       FlushRoomlist ();
        if (buf[0] != '2') {
                strcpy(WC->ImportantMessage, &buf[4]);
                display_main_menu();
@@ -3289,7 +3242,7 @@ void tmplput_current_room(StrBuf *Target, WCTemplputParams *TP)
 void tmplput_roombanner(StrBuf *Target, WCTemplputParams *TP)
 {
        wc_printf("<div id=\"banner\">\n");
-       embed_room_banner(NULL, navbar_default);
+       embed_room_banner();
        wc_printf("</div>\n");
 }
 
@@ -3435,7 +3388,6 @@ HashList *GetWhoKnowsHash(StrBuf *Target, WCTemplputParams *TP)
 
        serv_puts("WHOK");
        Line = NewStrBuf();
-       Token = NewStrBuf();
        StrBuf_ServGetln(Line);
        if (GetServerStatus(Line, &State) == 1) 
        {
@@ -3464,9 +3416,19 @@ HashList *GetWhoKnowsHash(StrBuf *Target, WCTemplputParams *TP)
                                     _("Higher access is required to access this function."), -1, 0);
 
 
+       FreeStrBuf(&Line);
        return Whok;
 }
 
+void FlushRoomlist(void)
+{
+       wcsession *WCC = WC;
+       free_march_list(WCC);
+       DeleteHash(&WCC->Floors);
+       DeleteHash(&WCC->Rooms);
+       DeleteHash(&WCC->FloorsByName);
+}
+
 void 
 InitModule_ROOMOPS
 (void)
@@ -3486,8 +3448,6 @@ InitModule_ROOMOPS
        WebcitAddUrlHandler(HKEY("dotskip"), "", 0, dotskip, NEED_URL);
        WebcitAddUrlHandler(HKEY("display_private"), "", 0, _display_private, 0);
        WebcitAddUrlHandler(HKEY("goto_private"), "", 0, goto_private, NEED_URL);
-       WebcitAddUrlHandler(HKEY("zapped_list"), "", 0, zapped_list, 0);
-       WebcitAddUrlHandler(HKEY("display_zap"), "", 0, display_zap, 0);
        WebcitAddUrlHandler(HKEY("zap"), "", 0, zap, 0);
        WebcitAddUrlHandler(HKEY("display_entroom"), "", 0, display_entroom, 0);
        WebcitAddUrlHandler(HKEY("entroom"), "", 0, entroom, 0);
@@ -3520,9 +3480,14 @@ InitModule_ROOMOPS
        RegisterNamespace("THISROOM:DIRECTORY", 0, 1, tmplput_CurrentRoomDirectory, NULL, CTX_NONE);
        RegisterNamespace("THISROOM:ORDER", 0, 0, tmplput_CurrentRoomOrder, NULL, CTX_NONE);
        RegisterNamespace("THISROOM:DEFAULT_VIEW", 0, 0, tmplput_CurrentRoomDefView, NULL, CTX_NONE);
+       RegisterConditional(HKEY("COND:THISROOM:HAVE_VIEW"), 0, ConditionalThisRoomHaveView, CTX_NONE);
+       RegisterNamespace("THISROOM:VIEW_STRING", 0, 1, tmplput_CurrentRoomViewString, NULL, CTX_NONE);
+       RegisterNamespace("ROOM:VIEW_STRING", 1, 2, tmplput_RoomViewString, NULL, CTX_NONE);
+
        RegisterNamespace("THISROOM:INFOTEXT", 1, 2, tmplput_CurrentRoomInfoText, NULL, CTX_NONE);
        RegisterConditional(HKEY("COND:THISROOM:ORDER"), 0, ConditionalThisRoomOrder, CTX_NONE);
        RegisterConditional(HKEY("COND:THISROOM:DEFAULT_VIEW"), 0, ConditionalThisRoomDefView, CTX_NONE);
+       RegisterConditional(HKEY("COND:THISROOM:CURR_VIEW"), 0, ConditionalThisRoomCurrView, CTX_NONE);
        RegisterConditional(HKEY("COND:THISROOM:HAVE_PIC"), 0, ConditionalThisRoomXHavePic, CTX_NONE);
        RegisterConditional(HKEY("COND:THISROOM:HAVE_INFOTEXT"), 0, ConditionalThisRoomXHaveInfoText, CTX_NONE);
        RegisterNamespace("THISROOM:FILES:N", 0, 1, tmplput_CurrentRoomXNFiles, NULL, CTX_NONE);
@@ -3626,10 +3591,7 @@ SessionDestroyModule_ROOMOPS
                free(sess->cache_fold);
        }
        
-       free_march_list(sess);
-       DeleteHash(&sess->Floors);
-       DeleteHash(&sess->Rooms);
-       DeleteHash(&sess->FloorsByName);
+       FlushRoomlist ();
 }