* add transitional beginboxx template and move some places to the new syntax

[citadel.git] / webcit / auth.c

diff --git a/webcit/auth.c b/webcit/auth.c
index af571a48f8ab827f72146170b85cbfba81499be2..73a39ba62657cd0f4365c586f81eb9f41ff2eda7 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -792,11 +792,13 @@ void display_reg(int during_login)
 void display_changepw(void)
 {
        char buf[SIZ];
-
+       StrBuf *Buf;
        output_headers(1, 1, 1, 0, 0, 0);
 
-       svput("BOXTITLE", WCS_STRING, _("Change your password"));
-       do_template("beginbox", NULL);
+       Buf = NewStrBufPlain(_("Change your password"), -1);
+       DoTemplate(HKEY("beginbox"), NULL, Buf, CTX_STRBUF);
+
+       FreeStrBuf(&Buf);
 
        if (!IsEmptyStr(WC->ImportantMessage)) {
                wprintf("<span class=\"errormsg\">"
@@ -892,6 +894,12 @@ int ConditionalRoomAide(WCTemplateToken *Token, void *Context, int ContextType)
        return (WC->is_room_aide == 0);
 }
 
+int ConditionalRoomAcessDelete(WCTemplateToken *Token, void *Context, int ContextType)
+{
+       struct wcsession *WCC = WC;
+       return ( (WCC->is_room_aide) || (WCC->is_mailbox) || (WCC->room_flags2 & QR2_COLLABDEL) );
+}
+
 
 
 void _display_openid_login(void) {display_openid_login(NULL);}
@@ -917,6 +925,7 @@ InitModule_AUTH
 
        RegisterConditional(HKEY("COND:AIDE"), 2, ConditionalAide, CTX_NONE);
        RegisterConditional(HKEY("COND:ROOMAIDE"), 2, ConditionalRoomAide, CTX_NONE);
+       RegisterConditional(HKEY("COND:ACCESS:DELETE"), 2, ConditionalRoomAcessDelete, CTX_NONE);
 
        return ;
 }