* templatize the room creation form
[citadel.git] / webcit / roomops.c
index a5243ebca34eea84ba6fba10c769e203ef2558f0..8e05a246888ee36337451054c4e8ae3cdc2a2a37 100644 (file)
@@ -33,6 +33,20 @@ ROOM_VIEWS exchangeable_views[VIEW_MAX][VIEW_MAX] = {        /* the different kinds of
        };
 /* the brief calendar view is disabled: VIEW_CALBRIEF */
 
+allowed_default_views[VIEW_MAX] = {
+       1, /* VIEW_BBS          Bulletin board view */
+       1, /* VIEW_MAILBOX              Mailbox summary */
+       1, /* VIEW_ADDRESSBOOK  Address book view */
+       1, /* VIEW_CALENDAR             Calendar view */
+       1, /* VIEW_TASKS                Tasks view */
+       1, /* VIEW_NOTES                Notes view */
+       1, /* VIEW_WIKI         Wiki view */
+       0, /* VIEW_CALBRIEF             Brief Calendar view */
+       0, /* VIEW_JOURNAL              Journal view */
+       0  /* VIEW_BLOG         Blog view (not yet implemented) */
+};
+
+
 /*
  * Initialize the viewdefs with localized strings
  */
@@ -49,29 +63,11 @@ void initialize_viewdefs(void) {
        viewdefs[VIEW_BLOG] = _("Blog");
 }
 
-/*
- * Determine which views are allowed as the default for creating a new room.
- */
-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_WIKI:         return(1);
-               case VIEW_CALBRIEF:     return(0);
-               case VIEW_JOURNAL:      return(0);
-               default:                return(0);      /* should never get here */
-       }
-}
 
 
 /*
  * load the list of floors
- */
+ * /
 void load_floorlist(StrBuf *Buf)
 {
        int a;
@@ -95,199 +91,7 @@ void load_floorlist(StrBuf *Buf)
                extract_token(floorlist[StrBufExtract_int(Buf, 0, '|')], ChrPtr(Buf), 1, '|', sizeof floorlist[0]);
        }
 }
-
-
-
-
-/*
- * display rooms in tree structure
- */
-void room_tree_list(struct roomlisting *rp)
-{
-       char rmname[64];
-       int f;
-
-       if (rp == NULL) {
-               return;
-       }
-
-       room_tree_list(rp->lnext);
-
-       strcpy(rmname, rp->rlname);
-       f = rp->rlflags;
-
-       wc_printf("<a href=\"dotgoto?room=");
-       urlescputs(rmname);
-       wc_printf("\"");
-       wc_printf(">");
-       escputs1(rmname, 1, 1);
-       if ((f & QR_DIRECTORY) && (f & QR_NETWORK))
-               wc_printf("}");
-       else if (f & QR_DIRECTORY)
-               wc_printf("]");
-       else if (f & QR_NETWORK)
-               wc_printf(")");
-       else
-               wc_printf("&gt;");
-       wc_printf("</a><tt> </tt>\n");
-
-       room_tree_list(rp->rnext);
-       free(rp);
-}
-
-
-/* 
- * Room ordering stuff (compare first by floor, then by order)
- */
-int rordercmp(struct roomlisting *r1, struct roomlisting *r2)
-{
-       if ((r1 == NULL) && (r2 == NULL))
-               return (0);
-       if (r1 == NULL)
-               return (-1);
-       if (r2 == NULL)
-               return (1);
-       if (r1->rlfloor < r2->rlfloor)
-               return (-1);
-       if (r1->rlfloor > r2->rlfloor)
-               return (1);
-       if (r1->rlorder < r2->rlorder)
-               return (-1);
-       if (r1->rlorder > r2->rlorder)
-               return (1);
-       return (0);
-}
-
-
-/*
- * Common code for all room listings
- */
-void listrms(char *variety)
-{
-       char buf[SIZ];
-       int num_rooms = 0;
-
-       struct roomlisting *rl = NULL;
-       struct roomlisting *rp;
-       struct roomlisting *rs;
-
-       /* Ask the server for a room list */
-       serv_puts(variety);
-       serv_getln(buf, sizeof buf);
-       if (buf[0] != '1') {
-               wc_printf("&nbsp;");
-               return;
-       }
-
-       while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-               ++num_rooms;
-               rp = malloc(sizeof(struct roomlisting));
-               extract_token(rp->rlname, buf, 0, '|', sizeof rp->rlname);
-               rp->rlflags = extract_int(buf, 1);
-               rp->rlfloor = extract_int(buf, 2);
-               rp->rlorder = extract_int(buf, 3);
-               rp->lnext = NULL;
-               rp->rnext = NULL;
-
-               rs = rl;
-               if (rl == NULL) {
-                       rl = rp;
-               } else
-                       while (rp != NULL) {
-                               if (rordercmp(rp, rs) < 0) {
-                                       if (rs->lnext == NULL) {
-                                               rs->lnext = rp;
-                                               rp = NULL;
-                                       } else {
-                                               rs = rs->lnext;
-                                       }
-                               } else {
-                                       if (rs->rnext == NULL) {
-                                               rs->rnext = rp;
-                                               rp = NULL;
-                                       } else {
-                                               rs = rs->rnext;
-                                       }
-                               }
-                       }
-       }
-
-       room_tree_list(rl);
-
-       /*
-        * If no rooms were listed, print an nbsp to make the cell
-        * borders show up anyway.
-        */
-       if (num_rooms == 0) wc_printf("&nbsp;");
-}
-
-
-/*
- * 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");
-}
-
+*/
 
 
 /*
@@ -298,31 +102,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,
@@ -335,288 +128,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);
+               );
 
        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");
 }
 
 
@@ -631,12 +416,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_");
@@ -653,9 +442,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;
@@ -1068,6 +860,18 @@ int ConditionalThisRoomDefView(StrBuf *Target, WCTemplputParams *TP)
        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;
@@ -1129,6 +933,26 @@ void tmplput_RoomViewString(StrBuf *Target, WCTemplputParams *TP)
 }
 
 
+int ConditionalIsAllowedDefaultView(StrBuf *Target, WCTemplputParams *TP)
+{
+       wcsession *WCC = WC;
+       long CheckThis;
+       
+       if (WCC == NULL)
+               return 0;
+
+       CheckThis = GetTemplateTokenNumber(Target, TP, 2, 0);
+       if ((CheckThis >= VIEW_MAX) || (CheckThis < VIEW_BBS))
+       {
+               LogTemplateError(Target, "Conditional", ERR_PARM2, TP,
+                                "Roomview [%ld] not valid\n", 
+                                CheckThis);
+               return 0;
+       }
+
+       return allowed_default_views[CheckThis] != 0;
+}
+
 /*
  * goto next room
  */
@@ -1290,7 +1114,6 @@ int set_roomflags(room_states *RoomOps)
  */
 void display_editroom(void)
 {
-       StrBuf *Buf;
        char buf[SIZ];
        char cmd[1024];
        char node[256];
@@ -1318,9 +1141,9 @@ void display_editroom(void)
        tab = bstr("tab");
        if (IsEmptyStr(tab)) tab = "admin";
 
-       Buf = NewStrBuf();
-       load_floorlist(Buf);
-       FreeStrBuf(&Buf);
+//     Buf = NewStrBuf();
+//     load_floorlist(Buf);
+//     FreeStrBuf(&Buf);
        output_headers(1, 1, 1, 0, 0, 0);
 
        wc_printf("<div class=\"fix_scrollbar_bug\">");
@@ -2652,7 +2475,7 @@ void display_entroom(void)
        wc_printf("<tr class=\"odd\"><td>");
        wc_printf(_("Resides on floor: "));
        wc_printf("</td><td>");
-        load_floorlist(Buf); 
+//        load_floorlist(Buf); 
         wc_printf("<select name=\"er_floor\" size=\"1\">\n");
         for (i = 0; i < 128; ++i)
                 if (!IsEmptyStr(floorlist[i])) {
@@ -2685,12 +2508,14 @@ void display_entroom(void)
                "       }                                               "
                "\">\n");
        for (i=0; i<(sizeof viewdefs / sizeof (char *)); ++i) {
+/*
                if (is_view_allowed_as_default(i)) {
                        wc_printf("<option %s value=\"%d\">",
                                ((i == 0) ? "selected" : ""), i );
                        escputs(viewdefs[i]);
                        wc_printf("</option>\n");
                }
+*/
        }
        wc_printf("</select>\n");
        wc_printf("</td></tr>");
@@ -2855,7 +2680,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);
@@ -2871,63 +2696,6 @@ void entroom(void)
 }
 
 
-/**
- * \brief display the screen to enter a private room
- */
-void display_private(char *rname, int req_pass)
-{
-       WCTemplputParams SubTP;
-       StrBuf *Buf;
-       output_headers(1, 1, 1, 0, 0, 0);
-
-       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);
-
-       wc_printf("<p>");
-       wc_printf(_("If you know the name of a hidden (guess-name) or "
-                 "passworded room, you can enter that room by typing "
-                 "its name below.  Once you gain access to a private "
-                 "room, it will appear in your regular room listings "
-                 "so you don't have to keep returning here."));
-       wc_printf("</p>");
-
-       wc_printf("<form method=\"post\" action=\"goto_private\">\n");
-       wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-
-       wc_printf("<table class=\"altern\"> "
-               "<tr class=\"even\"><td>");
-       wc_printf(_("Enter room name:"));
-       wc_printf("</td><td>"
-               "<input type=\"text\" name=\"gr_name\" "
-               "value=\"%s\" maxlength=\"128\">\n", rname);
-
-       if (req_pass) {
-               wc_printf("</td></tr><tr class=\"odd\"><td>");
-               wc_printf(_("Enter room password:"));
-               wc_printf("</td><td>");
-               wc_printf("<input type=\"password\" name=\"gr_pass\" maxlength=\"9\">\n");
-       }
-       wc_printf("</td></tr></table>\n");
-
-       wc_printf("<div class=\"buttons\">\n");
-       wc_printf("<input type=\"submit\" name=\"ok_button\" value=\"%s\">"
-               "&nbsp;"
-               "<input type=\"submit\" name=\"cancel_button\" value=\"%s\">",
-               _("Go there"),
-               _("Cancel")
-               );
-       wc_printf("</div></form>\n");
-
-       do_template("endbox", NULL);
-
-       wDumpContent(1);
-}
-
 /**
  * \brief goto a private room
  */
@@ -2940,6 +2708,7 @@ void goto_private(void)
                display_main_menu();
                return;
        }
+       FlushRoomlist();
        strcpy(hold_rm, ChrPtr(WC->CurRoom.name));
        serv_printf("GOTO %s|%s",
                    bstr("gr_name"),
@@ -2951,7 +2720,7 @@ void goto_private(void)
                return;
        }
        if (!strncmp(buf, "540", 3)) {
-               display_private(bstr("gr_name"), 1);
+               DoTemplate(HKEY("room_display_private"), NULL, &NoCtx);
                return;
        }
        output_headers(1, 1, 1, 0, 0, 0);
@@ -2961,34 +2730,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
@@ -3015,6 +2756,7 @@ void zap(void)
                                StrBufAppendBufPlain(final_destination, HKEY("_BASEROOM_"), 0);
                        }
                }
+               FlushRoomlist ();
        }
        smart_goto(final_destination);
        FreeStrBuf(&final_destination);
@@ -3033,6 +2775,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();
@@ -3304,11 +3047,6 @@ void tmplput_RoomName(StrBuf *Target, WCTemplputParams *TP)
        StrBufAppendTemplate(Target, TP, WC->CurRoom.name, 0);
 }
 
-
-void _display_private(void) {
-       display_private("", 0);
-}
-
 void dotgoto(void) {
        if (!havebstr("room")) {
                readloop(readnew, eUseDefault);
@@ -3335,7 +3073,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");
 }
 
@@ -3481,7 +3219,6 @@ HashList *GetWhoKnowsHash(StrBuf *Target, WCTemplputParams *TP)
 
        serv_puts("WHOK");
        Line = NewStrBuf();
-       Token = NewStrBuf();
        StrBuf_ServGetln(Line);
        if (GetServerStatus(Line, &State) == 1) 
        {
@@ -3510,9 +3247,25 @@ HashList *GetWhoKnowsHash(StrBuf *Target, WCTemplputParams *TP)
                                     _("Higher access is required to access this function."), -1, 0);
 
 
+       FreeStrBuf(&Line);
        return Whok;
 }
 
+void _FlushRoomList(wcsession *WCC)
+{
+       free_march_list(WCC);
+       DeleteHash(&WCC->Floors);
+       DeleteHash(&WCC->Rooms);
+       DeleteHash(&WCC->FloorsByName);
+}
+
+void FlushRoomlist(void)
+{
+       wcsession *WCC = WC;
+       _FlushRoomList(WCC);
+}
+
+
 void 
 InitModule_ROOMOPS
 (void)
@@ -3530,10 +3283,8 @@ InitModule_ROOMOPS
        WebcitAddUrlHandler(HKEY("knrooms"), "", 0, knrooms, 0);
        WebcitAddUrlHandler(HKEY("dotgoto"), "", 0, dotgoto, NEED_URL);
        WebcitAddUrlHandler(HKEY("dotskip"), "", 0, dotskip, NEED_URL);
-       WebcitAddUrlHandler(HKEY("display_private"), "", 0, _display_private, 0);
+
        WebcitAddUrlHandler(HKEY("goto_private"), "", 0, goto_private, NEED_URL);
-       WebcitAddUrlHandler(HKEY("zapped_list"), "", 0, zapped_list, 0);
-       WebcitAddUrlHandler(HKEY("display_zap"), "", 0, display_zap, 0);
        WebcitAddUrlHandler(HKEY("zap"), "", 0, zap, 0);
        WebcitAddUrlHandler(HKEY("display_entroom"), "", 0, display_entroom, 0);
        WebcitAddUrlHandler(HKEY("entroom"), "", 0, entroom, 0);
@@ -3567,12 +3318,15 @@ InitModule_ROOMOPS
        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);
+       RegisterConditional(HKEY("COND:ALLOWED_DEFAULT_VIEW"), 0, ConditionalIsAllowedDefaultView, 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);
@@ -3676,10 +3430,7 @@ SessionDestroyModule_ROOMOPS
                free(sess->cache_fold);
        }
        
-       free_march_list(sess);
-       DeleteHash(&sess->Floors);
-       DeleteHash(&sess->Rooms);
-       DeleteHash(&sess->FloorsByName);
+       _FlushRoomList (sess);
 }