]> code.citadel.org Git - citadel.git/blobdiff - webcit/roomops.c
* embed_room_banner () simplify switch to one
[citadel.git] / webcit / roomops.c
index 139543ca465d058c67d6b47b43dd8deb22d5238c..380e9fca1d2c2fcb26eacb464f233e80861a068a 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,24 +63,6 @@ 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 */
-       }
-}
 
 
 /*
@@ -171,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(
@@ -191,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(
@@ -213,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(
@@ -224,6 +249,15 @@ void embed_room_banner(void)
                        "%s"
                        "</span></a></li>\n", _("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_MAILBOX:
                wc_printf(
@@ -246,69 +280,6 @@ void embed_room_banner(void)
                        "%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);
@@ -350,6 +321,15 @@ void embed_room_banner(void)
                }
                break;
        case VIEW_MAILBOX:
+               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")
+                       );
                wc_printf(
                        "<li class=\"newmess\">"
                        "<a href=\"display_enter\">"
@@ -369,6 +349,15 @@ void embed_room_banner(void)
                        );
                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")
+                       );
                wc_printf(
                        "<li class=\"newmess\">"
                        "<a href=\"display_enter\">"
@@ -937,6 +926,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
  */
@@ -1098,7 +1107,6 @@ int set_roomflags(room_states *RoomOps)
  */
 void display_editroom(void)
 {
-       StrBuf *Buf;
        char buf[SIZ];
        char cmd[1024];
        char node[256];
@@ -2070,7 +2078,7 @@ void toggle_self_service(void) {
 
        set_roomflags (&RoomFlags);
        
-       display_editroom();
+       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
 }
 
 
@@ -2097,7 +2105,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");
@@ -2106,7 +2114,7 @@ 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;
        }
@@ -2261,7 +2269,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);
@@ -2287,7 +2295,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);
@@ -2342,7 +2350,7 @@ void do_invt_kick(void) {
                 }
         }
 
-       display_editroom();
+       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
 }
 
 
@@ -2419,162 +2427,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 
  */
@@ -2671,7 +2523,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 */
        }
@@ -2679,63 +2531,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
  */
@@ -2748,6 +2543,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"),
@@ -2759,7 +2555,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);
@@ -2862,14 +2658,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;
        }
 
@@ -2877,7 +2673,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;
        }
 
@@ -2898,7 +2694,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;
        }
 
@@ -2928,7 +2724,7 @@ void netedit(void) {
 
        serv_puts("000");
        fclose(fp);
-       display_editroom();
+       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
 }
 
 
@@ -3063,7 +2859,7 @@ 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;
        }
 
@@ -3078,7 +2874,7 @@ void set_room_policy(void) {
                strcat(WC->ImportantMessage, &buf[4]);
        }
 
-       display_editroom();
+       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
 }
 
 void tmplput_RoomName(StrBuf *Target, WCTemplputParams *TP)
@@ -3086,11 +2882,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);
@@ -3181,9 +2972,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)
@@ -3195,7 +2992,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;
 }
 
 
@@ -3209,8 +3011,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)
@@ -3295,15 +3104,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)
@@ -3321,12 +3136,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);
@@ -3356,6 +3169,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);
 
@@ -3466,7 +3281,7 @@ SessionDestroyModule_ROOMOPS
                free(sess->cache_fold);
        }
        
-       FlushRoomlist ();
+       _FlushRoomList (sess);
 }