* set_room_policy(): use modern representations of the policy names
[citadel.git] / webcit / roomops.c
index 319b80f4e7136f43bafc5147e6a6ff39ab7ac63e..79323c9f8a110fd892d64a3c9d6b6f7c879aa254 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 */
 
+ROOM_VIEWS 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,132 +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;");
-}
-
+*/
 
 
 /*
@@ -296,6 +167,15 @@ void embed_room_banner(void)
                        "%s"
                        "</span></a></li>\n", _("View contacts")
                        );
+               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:
                wc_printf(
@@ -316,6 +196,17 @@ void embed_room_banner(void)
                        "%s"
                        "</span></a></li>\n", _("Month view")
                        );
+               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_CALBRIEF:
                wc_printf(
@@ -338,6 +229,15 @@ void embed_room_banner(void)
                        "%s"
                        "</span></a></li>\n", _("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(
@@ -349,30 +249,26 @@ void embed_room_banner(void)
                        "%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\" "
+                       "<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", _("Refresh message list")
+                       "</span></a></li>\n", _("Add new note")
                        );
                break;
-       case VIEW_WIKI:
+       case VIEW_MAILBOX:
                wc_printf(
                        "<li class=\"readallmess\">"
-                       "<a href=\"wiki?page=home\">"
+                       "<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", _("Wiki home")
+                       "</span></a></li>\n", _("Refresh message list")
                        );
-               break;
-       default:
                wc_printf(
                        "<li class=\"readallmess\">"
                        "<a href=\"readfwd\">"
@@ -382,36 +278,6 @@ void embed_room_banner(void)
                        "%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\">"
@@ -419,21 +285,19 @@ void embed_room_banner(void)
                        "alt=\"\" width=\"24\" height=\"24\">"
                        "<span class=\"navbar_link\">"
                        "%s"
-                       "</span></a></li>\n", _("Add new task")
+                       "</span></a></li>\n", _("Write mail")
                        );
                break;
-       case VIEW_NOTES:
+       case VIEW_WIKI:
                wc_printf(
-                       "<li class=\"enternewnote\">"
-                       "<a href=\"add_new_note\">"
-                       "<img  src=\"static/enternewnote_24x.gif\" "
+                       "<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", _("Add new note")
+                       "</span></a></li>\n", _("Wiki home")
                        );
-               break;
-       case VIEW_WIKI:
                safestrncpy(buf, bstr("page"), sizeof buf);
                if (IsEmptyStr(buf)) {
                        safestrncpy(buf, "home", sizeof buf);
@@ -474,26 +338,17 @@ void embed_room_banner(void)
                                );
                }
                break;
-       case VIEW_MAILBOX:
+               break;
+       default:
                wc_printf(
-                       "<li class=\"newmess\">"
-                       "<a href=\"display_enter\">"
-                       "<img  src=\"static/newmess3_24x.gif\" "
+                       "<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", _("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")
+                       "</span></a></li>\n", _("Read all messages")
                        );
-               break;
-       default:
                wc_printf(
                        "<li class=\"newmess\">"
                        "<a href=\"display_enter\">"
@@ -569,6 +424,7 @@ long gotoroom(const StrBuf *gname)
                        return err;
                }
        }
+       FlushFolder(&WCC->CurRoom);
        ParseGoto(&WCC->CurRoom, Buf);
 
        if (StrLength(gname) > 0)
@@ -582,6 +438,85 @@ long gotoroom(const StrBuf *gname)
        return err;
 }
 
+void DBG_QR(long QR)
+{
+       const char *QRFlagList[15] = {
+               strof(QR_PERMANENT),
+               strof(QR_INUSE),
+               strof(QR_PRIVATE),
+               strof(QR_PASSWORDED),
+               strof(QR_GUESSNAME),
+               strof(QR_DIRECTORY),
+               strof(QR_UPLOAD),
+               strof(QR_DOWNLOAD),
+               strof(QR_VISDIR),
+               strof(QR_ANONONLY),
+               strof(QR_ANONOPT),
+               strof(QR_NETWORK),
+               strof(QR_PREFONLY),
+               strof(QR_READONLY),
+               strof(QR_MAILBOX)
+       };
+       int i = 1;
+       int j=0;
+       StrBuf *QRVec;
+
+       QRVec = NewStrBufPlain(NULL, 256);
+       while (i != 0)
+       {
+               if ((QR & i) != 0) {
+                       if (StrLength(QRVec) > 0)
+                               StrBufAppendBufPlain(QRVec, HKEY(" | "), 0);
+                       StrBufAppendBufPlain(QRVec, QRFlagList[j], -1, 0);
+               }
+               i = i << 1;
+               j++;
+       }
+       lprintf(9, "DBG: QR-Vec [%ld] [%s]\n", QR, ChrPtr(QRVec));
+       FreeStrBuf(&QRVec);
+}
+
+
+
+void DBG_QR2(long QR2)
+{
+       const char *QR2FlagList[15] = {
+               strof(QR2_SYSTEM),
+               strof(QR2_SELFLIST),
+               strof(QR2_COLLABDEL),
+               strof(QR2_SUBJECTREQ),
+               strof(QR2_SMTP_PUBLIC),
+               strof(QR2_MODERATED),
+               "", 
+               "", 
+               "", 
+               "", 
+               "", 
+               "", 
+               "", 
+               "", 
+               ""
+       };
+       int i = 1;
+       int j=0;
+       StrBuf *QR2Vec;
+
+       QR2Vec = NewStrBufPlain(NULL, 256);
+       while (i != 0)
+       {
+               if ((QR2 & i) != 0) {
+                       if (StrLength(QR2Vec) > 0)
+                               StrBufAppendBufPlain(QR2Vec, HKEY(" | "), 0);
+                       StrBufAppendBufPlain(QR2Vec, QR2FlagList[j], -1, 0);
+               }
+               i = i << 1;
+               j++;
+       }
+       lprintf(9, "DBG: QR2-Vec [%ld] [%s]\n", QR2, ChrPtr(QR2Vec));
+       FreeStrBuf(&QR2Vec);
+}
+
+
 
 void ParseGoto(folder *room, StrBuf *Line)
 {
@@ -627,6 +562,8 @@ void ParseGoto(folder *room, StrBuf *Line)
        
        room->QRFlags = StrBufExtractNext_long(Line, &Pos, '|'); //CurRoom->QRFlags
 
+       DBG_QR(room->QRFlags);
+
        room->HighestRead = StrBufExtractNext_long(Line, &Pos, '|');
        room->LastMessageRead = StrBufExtractNext_long(Line, &Pos, '|');
 
@@ -650,6 +587,7 @@ void ParseGoto(folder *room, StrBuf *Line)
                room->RAFlags |= UA_ISTRASH; // wc_is_trash
 
        room->QRFlags2 = StrBufExtractNext_long(Line, &Pos, '|'); // CurRoom->QRFlags2
+       DBG_QR2(room->QRFlags2);
 
        /* find out, whether we are in a sub-room */
        room->nRoomNameParts = StrBufNum_tokens(room->name, '\\');
@@ -749,7 +687,7 @@ void LoadRoomXA (void)
 
        WCC->CurRoom.XALoaded = 1;
        Buf = NewStrBuf();
-       serv_puts("GETA");
+       serv_puts("GETR");
        StrBuf_ServGetln(Buf);
        if (GetServerStatus(Buf, NULL) != 2) {
                FlushStrBuf(WCC->CurRoom.XAPass);
@@ -1062,6 +1000,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
  */
@@ -1151,6 +1109,7 @@ int self_service(int newval) {
                serv_getln(buf, sizeof buf);
        }
 
+       FlushRoomlist ();
        return(newval);
 
 }
@@ -1210,6 +1169,8 @@ int set_roomflags(room_states *RoomOps)
                    RoomOps->view, 
                    RoomOps->flags2);
        serv_getln(buf, sizeof buf);
+       FlushRoomlist ();
+
        return (1);
 }
 
@@ -1223,7 +1184,6 @@ int set_roomflags(room_states *RoomOps)
  */
 void display_editroom(void)
 {
-       StrBuf *Buf;
        char buf[SIZ];
        char cmd[1024];
        char node[256];
@@ -1251,9 +1211,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\">");
@@ -2195,7 +2155,7 @@ void toggle_self_service(void) {
 
        set_roomflags (&RoomFlags);
        
-       display_editroom();
+       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
 }
 
 
@@ -2222,7 +2182,7 @@ void editroom(void)
        if (!havebstr("ok_button")) {
                strcpy(WC->ImportantMessage,
                       _("Cancelled.  Changes were not saved."));
-               display_editroom();
+               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
                return;
        }
        serv_puts("GETR");
@@ -2231,11 +2191,13 @@ void editroom(void)
        if (GetServerStatus(Buf, NULL) != 2) {
                StrBufCutLeft(Buf, 4);
                strcpy(WC->ImportantMessage, ChrPtr(Buf));
-               display_editroom();
+               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
                FreeStrBuf(&Buf);
                return;
        }
 
+       FlushRoomlist ();
+
        er_name = NewStrBuf();
        er_password = NewStrBuf();
        er_dirname = NewStrBuf();
@@ -2386,7 +2348,7 @@ void editroom(void)
        StrBuf_ServGetln(Buf);
        if (GetServerStatus(Buf, NULL) != 2) {
                strcpy(WC->ImportantMessage, &ChrPtr(Buf)[4]);
-               display_editroom();
+               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
                FreeStrBuf(&Buf);
                FreeStrBuf(&er_name);
                FreeStrBuf(&er_password);
@@ -2412,7 +2374,7 @@ void editroom(void)
        }
        gotoroom(er_name);
        strcpy(WC->ImportantMessage, _("Your changes have been saved."));
-       display_editroom();
+       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
        FreeStrBuf(&Buf);
        FreeStrBuf(&er_name);
        FreeStrBuf(&er_password);
@@ -2467,7 +2429,7 @@ void do_invt_kick(void) {
                 }
         }
 
-       display_editroom();
+       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
 }
 
 
@@ -2544,162 +2506,6 @@ void display_whok(void)
         wDumpContent(1);
 }
 
-
-
-/*
- * display the form for entering a new room
- */
-void display_entroom(void)
-{
-       StrBuf *Buf;
-       int i;
-       char buf[SIZ];
-
-       Buf = NewStrBuf();
-       serv_puts("CRE8 0");
-       serv_getln(buf, sizeof buf);
-
-       if (buf[0] != '2') {
-               strcpy(WC->ImportantMessage, &buf[4]);
-               display_main_menu();
-               FreeStrBuf(&Buf);
-               return;
-       }
-
-       output_headers(1, 1, 1, 0, 0, 0);
-
-       svprintf(HKEY("BOXTITLE"), WCS_STRING, _("Create a new room"));
-       do_template("beginbox", NULL);
-
-       wc_printf("<form name=\"create_room_form\" method=\"POST\" action=\"entroom\">\n");
-       wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
-
-       wc_printf("<table class=\"altern\"> ");
-
-       wc_printf("<tr class=\"even\"><td>");
-       wc_printf(_("Name of room: "));
-       wc_printf("</td><td>");
-       wc_printf("<input type=\"text\" NAME=\"er_name\" MAXLENGTH=\"127\">\n");
-        wc_printf("</td></tr>");
-
-       wc_printf("<tr class=\"odd\"><td>");
-       wc_printf(_("Resides on floor: "));
-       wc_printf("</td><td>");
-        load_floorlist(Buf); 
-        wc_printf("<select name=\"er_floor\" size=\"1\">\n");
-        for (i = 0; i < 128; ++i)
-                if (!IsEmptyStr(floorlist[i])) {
-                        wc_printf("<option ");
-                        wc_printf("value=\"%d\">", i);
-                        escputs(floorlist[i]);
-                        wc_printf("</option>\n");
-                }
-        wc_printf("</select>\n");
-        wc_printf("</td></tr>");
-
-       /*
-        * Our clever little snippet of JavaScript automatically selects
-        * a public room if the view is set to Bulletin Board or wiki, and
-        * it selects a mailbox room otherwise.  The user can override this,
-        * of course.  We also disable the floor selector for mailboxes.
-        */
-       wc_printf("<tr class=\"even\"><td>");
-       wc_printf(_("Default view for room: "));
-       wc_printf("</td><td>");
-        wc_printf("<select name=\"er_view\" size=\"1\" OnChange=\""
-               "       if ( (this.form.er_view.value == 0)             "
-               "          || (this.form.er_view.value == 6) ) {        "
-               "               this.form.type[0].checked=true;         "
-               "               this.form.er_floor.disabled = false;    "
-               "       }                                               "
-               "       else {                                          "
-               "               this.form.type[4].checked=true;         "
-               "               this.form.er_floor.disabled = true;     "
-               "       }                                               "
-               "\">\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>");
-
-       wc_printf("<tr class=\"even\"><td>");
-       wc_printf(_("Type of room:"));
-       wc_printf("</td><td>");
-       wc_printf("<ul class=\"adminlist\">\n");
-
-       wc_printf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"public\" ");
-       wc_printf("CHECKED OnChange=\""
-               "       if (this.form.type[0].checked == true) {        "
-               "               this.form.er_floor.disabled = false;    "
-               "       }                                               "
-               "\"> ");
-       wc_printf(_("Public (automatically appears to everyone)"));
-       wc_printf("</li>");
-
-       wc_printf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"hidden\" OnChange=\""
-               "       if (this.form.type[1].checked == true) {        "
-               "               this.form.er_floor.disabled = false;    "
-               "       }                                               "
-               "\"> ");
-       wc_printf(_("Private - hidden (accessible to anyone who knows its name)"));
-       wc_printf("</li>");
-
-       wc_printf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"passworded\" OnChange=\""
-               "       if (this.form.type[2].checked == true) {        "
-               "               this.form.er_floor.disabled = false;    "
-               "       }                                               "
-               "\"> ");
-       wc_printf(_("Private - require password: "));
-       wc_printf("<input type=\"text\" NAME=\"er_password\" MAXLENGTH=\"9\">\n");
-       wc_printf("</li>");
-
-       wc_printf("<li><input type=\"radio\" NAME=\"type\" VALUE=\"invonly\" OnChange=\""
-               "       if (this.form.type[3].checked == true) {        "
-               "               this.form.er_floor.disabled = false;    "
-               "       }                                               "
-               "\"> ");
-       wc_printf(_("Private - invitation only"));
-       wc_printf("</li>");
-
-       wc_printf("\n<li><input type=\"radio\" NAME=\"type\" VALUE=\"personal\" "
-               "OnChange=\""
-               "       if (this.form.type[4].checked == true) {        "
-               "               this.form.er_floor.disabled = true;     "
-               "       }                                               "
-               "\"> ");
-       wc_printf(_("Personal (mailbox for you only)"));
-       wc_printf("</li>");
-
-       wc_printf("\n</ul>\n");
-       wc_printf("</td></tr></table>\n");
-
-       wc_printf("<div class=\"buttons\">\n");
-       wc_printf("<input type=\"submit\" name=\"ok_button\" value=\"%s\">", _("Create new room"));
-       wc_printf("&nbsp;");
-       wc_printf("<input type=\"submit\" name=\"cancel_button\" value=\"%s\">", _("Cancel"));
-       wc_printf("</div>\n");
-       wc_printf("</form>\n<hr />");
-       serv_printf("MESG roomaccess");
-       serv_getln(buf, sizeof buf);
-       if (buf[0] == '1') {
-               fmout("LEFT");
-       }
-
-       do_template("endbox", NULL);
-
-       wDumpContent(1);
-       FreeStrBuf(&Buf);
-}
-
-
-
-
 /*
  * support function for entroom() -- sets the default view 
  */
@@ -2788,7 +2594,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);
@@ -2796,7 +2602,7 @@ void entroom(void)
        WCC->CurRoom.view = er_view;
 
        if ( (WCC != NULL) && ( (WCC->CurRoom.RAFlags & UA_ADMINALLOWED) != 0) )  {
-               display_editroom ();
+               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
        } else {
                do_change_view(er_view);                /* Now go there */
        }
@@ -2804,63 +2610,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
  */
@@ -2873,6 +2622,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"),
@@ -2884,7 +2634,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);
@@ -2987,14 +2737,14 @@ void netedit(void) {
                strcat(line, bstr("suffix"));
        }
        else {
-               display_editroom();
+               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
                return;
        }
 
 
        fp = tmpfile();
        if (fp == NULL) {
-               display_editroom();
+               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
                return;
        }
 
@@ -3002,7 +2752,7 @@ void netedit(void) {
        serv_getln(buf, sizeof buf);
        if (buf[0] != '1') {
                fclose(fp);
-               display_editroom();
+               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
                return;
        }
 
@@ -3023,7 +2773,7 @@ void netedit(void) {
        serv_getln(buf, sizeof buf);
        if (buf[0] != '4') {
                fclose(fp);
-               display_editroom();
+               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
                return;
        }
 
@@ -3053,7 +2803,7 @@ void netedit(void) {
 
        serv_puts("000");
        fclose(fp);
-       display_editroom();
+       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
 }
 
 
@@ -3188,22 +2938,22 @@ void set_room_policy(void) {
        if (!havebstr("ok_button")) {
                strcpy(WC->ImportantMessage,
                       _("Cancelled.  Changes were not saved."));
-               display_editroom();
+               http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
                return;
        }
 
-       serv_printf("SPEX room|%d|%d", ibstr("roompolicy"), ibstr("roomvalue"));
+       serv_printf("SPEX roompolicy|%d|%d", ibstr("roompolicy"), ibstr("roomvalue"));
        serv_getln(buf, sizeof buf);
        strcpy(WC->ImportantMessage, &buf[4]);
 
        if (WC->axlevel >= 6) {
                strcat(WC->ImportantMessage, "<br />\n");
-               serv_printf("SPEX floor|%d|%d", ibstr("floorpolicy"), ibstr("floorvalue"));
+               serv_printf("SPEX floorpolicy|%d|%d", ibstr("floorpolicy"), ibstr("floorvalue"));
                serv_getln(buf, sizeof buf);
                strcat(WC->ImportantMessage, &buf[4]);
        }
-
-       display_editroom();
+       FlushRoomlist();
+       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
 }
 
 void tmplput_RoomName(StrBuf *Target, WCTemplputParams *TP)
@@ -3211,11 +2961,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);
@@ -3306,9 +3051,15 @@ int ConditionalCurrentRoomHas_QRFlag(StrBuf *Target, WCTemplputParams *TP)
        if (QR_CheckFlag == 0)
                LogTemplateError(Target, "Conditional", ERR_PARM1, TP,
                                 "requires one of the #\"QR*\"- defines or an integer flag 0 is invalid!");
+       
+       if (WCC == NULL)
+               return 0;
 
-       return ((WCC!=NULL) &&
-               ((WCC->CurRoom.QRFlags & QR_CheckFlag) != 0));
+       if ((TP->Tokens->Params[2]->MaskBy == eOR) ||
+           (TP->Tokens->Params[2]->MaskBy == eNO))
+               return (WCC->CurRoom.QRFlags & QR_CheckFlag) != 0;
+       else
+               return (WCC->CurRoom.QRFlags & QR_CheckFlag) == QR_CheckFlag;
 }
 
 int ConditionalRoomHas_QRFlag(StrBuf *Target, WCTemplputParams *TP)
@@ -3320,7 +3071,12 @@ int ConditionalRoomHas_QRFlag(StrBuf *Target, WCTemplputParams *TP)
        if (QR_CheckFlag == 0)
                LogTemplateError(Target, "Conditional", ERR_PARM1, TP,
                                 "requires one of the #\"QR*\"- defines or an integer flag 0 is invalid!");
-       return ((Folder->QRFlags & QR_CheckFlag) != 0);
+
+       if ((TP->Tokens->Params[2]->MaskBy == eOR) ||
+           (TP->Tokens->Params[2]->MaskBy == eNO))
+               return (Folder->QRFlags & QR_CheckFlag) != 0;
+       else
+               return (Folder->QRFlags & QR_CheckFlag) == QR_CheckFlag;
 }
 
 
@@ -3334,8 +3090,15 @@ int ConditionalCurrentRoomHas_QRFlag2(StrBuf *Target, WCTemplputParams *TP)
                LogTemplateError(Target, "Conditional", ERR_PARM1, TP,
                                 "requires one of the #\"QR2*\"- defines or an integer flag 0 is invalid!");
 
-       return ((WCC!=NULL) &&
-               ((WCC->CurRoom.QRFlags2 & QR2_CheckFlag) != 0));
+       
+       if (WCC == NULL)
+               return 0;
+
+       if ((TP->Tokens->Params[2]->MaskBy == eOR) ||
+           (TP->Tokens->Params[2]->MaskBy == eNO))
+               return (WCC->CurRoom.QRFlags2 & QR2_CheckFlag) != 0;
+       else
+               return (WCC->CurRoom.QRFlags2 & QR2_CheckFlag) == QR2_CheckFlag;
 }
 
 int ConditionalRoomHas_QRFlag2(StrBuf *Target, WCTemplputParams *TP)
@@ -3420,15 +3183,21 @@ HashList *GetWhoKnowsHash(StrBuf *Target, WCTemplputParams *TP)
        return Whok;
 }
 
-void FlushRoomlist(void)
+void _FlushRoomList(wcsession *WCC)
 {
-       wcsession *WCC = WC;
        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)
@@ -3446,12 +3215,10 @@ 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("zap"), "", 0, zap, 0);
-       WebcitAddUrlHandler(HKEY("display_entroom"), "", 0, display_entroom, 0);
        WebcitAddUrlHandler(HKEY("entroom"), "", 0, entroom, 0);
-       WebcitAddUrlHandler(HKEY("display_whok"), "", 0, display_whok, 0);
        WebcitAddUrlHandler(HKEY("do_invt_kick"), "", 0, do_invt_kick, 0);
        WebcitAddUrlHandler(HKEY("display_editroom"), "", 0, display_editroom, 0);
        WebcitAddUrlHandler(HKEY("netedit"), "", 0, netedit, 0);
@@ -3481,6 +3248,8 @@ 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);
 
@@ -3591,7 +3360,7 @@ SessionDestroyModule_ROOMOPS
                free(sess->cache_fold);
        }
        
-       FlushRoomlist ();
+       _FlushRoomList (sess);
 }