* 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 0b01a16b8ebea184aa3fec6277dbd84e832abab4..73a39ba62657cd0f4365c586f81eb9f41ff2eda7 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -41,9 +41,9 @@ void display_login(char *mesg)
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"login_screen\">\n");
 
-       if (mesg != NULL) if (!IsEmptyStr(mesg)) {
-                       stresc(buf, SIZ,  mesg, 0, 0);
-                       svprintf(HKEY("MESG"), WCS_STRING, "%s", buf);
+       if ((mesg != NULL) && (!IsEmptyStr(mesg))) {
+               stresc(buf, SIZ,  mesg, 0, 0);
+               svprintf(HKEY("MESG"), WCS_STRING, "%s", buf);
        }
 
        svprintf(HKEY("LOGIN_INSTRUCTIONS"), WCS_STRING,
@@ -116,9 +116,9 @@ void display_openid_login(char *mesg)
        output_headers(1, 1, 2, 0, 0, 0);
        wprintf("<div id=\"login_screen\">\n");
 
-       if (mesg != NULL) if (!IsEmptyStr(mesg)) {
-                       stresc(buf, SIZ,  mesg, 0, 0);
-                       svprintf(HKEY("MESG"), WCS_STRING, "%s", buf);
+       if ((mesg != NULL) && (!IsEmptyStr(mesg))) {
+               stresc(buf, SIZ,  mesg, 0, 0);
+               svprintf(HKEY("MESG"), WCS_STRING, "%s", buf);
        }
 
        svprintf(HKEY("LOGIN_INSTRUCTIONS"), WCS_STRING,
@@ -209,6 +209,7 @@ void display_openid_name_request(char *claimed_id, char *username) {
 void become_logged_in(char *user, char *pass, char *serv_response)
 {
        char buf[SIZ];
+       StrBuf *FloorDiv;
 
        WC->logged_in = 1;
        extract_token(WC->wc_fullname, &serv_response[4], 0, '|', sizeof WC->wc_fullname);
@@ -232,7 +233,8 @@ void become_logged_in(char *user, char *pass, char *serv_response)
 
        get_pref_long("current_iconbar", &WC->current_iconbar, current_iconbar_menu);
 
-       get_preference("floordiv_expanded", &WC->floordiv_expanded);
+       get_preference("floordiv_expanded", &FloorDiv);
+       WC->floordiv_expanded = FloorDiv;
 }
 
 
@@ -405,7 +407,7 @@ void finalize_openid_login(void)
                                urlcontent *u;
                                void *U;
                                long HKLen;
-                               char *HKey;
+                               const char *HKey;
                                HashPos *Cursor;
                                
                                Cursor = GetNewHashPos ();
@@ -553,7 +555,6 @@ void end_webcit_session(void) {
        
        if (WC->logged_in) {
                set_pref_long("current_iconbar", WC->current_iconbar, 0);
-               set_preference("floordiv_expanded", WC->floordiv_expanded, 1);
        }
 
        serv_puts("QUIT");
@@ -791,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\">"
@@ -881,6 +884,24 @@ void changepw(void)
        }
 }
 
+int ConditionalAide(WCTemplateToken *Token, void *Context, int ContextType)
+{
+       return (WC->is_aide == 0);
+}
+
+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);}
 void _display_reg(void) {display_reg(0);}
 
@@ -901,5 +922,10 @@ InitModule_AUTH
        WebcitAddUrlHandler(HKEY("display_changepw"), display_changepw, 0);
        WebcitAddUrlHandler(HKEY("changepw"), changepw, 0);
        WebcitAddUrlHandler(HKEY("termquit"), do_logout, 0);
+
+       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 ;
 }