* defines may now be ored or anded

[citadel.git] / webcit / roomops.c

diff --git a/webcit/roomops.c b/webcit/roomops.c
index d54e00ebace6ece4c7f02f3f928c49332f45fd71..2a2b3472275803388d51e35cdd549ba875ddc532 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -2085,7 +2085,7 @@ void toggle_self_service(void) {
 
        set_roomflags (&RoomFlags);
        
-       display_editroom();
+       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
 }
 
 
@@ -2112,7 +2112,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");
@@ -2121,7 +2121,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;
        }
@@ -2276,7 +2276,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);
@@ -2302,7 +2302,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);
@@ -2357,7 +2357,7 @@ void do_invt_kick(void) {
                 }
         }
 
-       display_editroom();
+       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
 }
 
 
@@ -2530,7 +2530,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 */
        }
@@ -2665,14 +2665,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;
        }
 
@@ -2680,7 +2680,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;
        }
 
@@ -2701,7 +2701,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;
        }
 
@@ -2731,7 +2731,7 @@ void netedit(void) {
 
        serv_puts("000");
        fclose(fp);
-       display_editroom();
+       http_transmit_thing(ChrPtr(do_template("room_edit", NULL)), 0);
 }
 
 
@@ -2866,7 +2866,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;
        }
 
@@ -2881,7 +2881,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)
@@ -2979,9 +2979,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)
@@ -2993,7 +2999,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;
 }
 
 
@@ -3007,8 +3018,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)
@@ -3129,7 +3147,6 @@ InitModule_ROOMOPS
        WebcitAddUrlHandler(HKEY("goto_private"), "", 0, goto_private, NEED_URL);
        WebcitAddUrlHandler(HKEY("zap"), "", 0, zap, 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);