* add contexttype, so the subst can precheck the context pointer for us, and bad...

[citadel.git] / webcit / auth.c

diff --git a/webcit/auth.c b/webcit/auth.c
index d347e78414a657de154d4ef261794dc55f29d2aa..2e58a710a0d053d5d5d249f26d90d69ee41c3b4c 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -97,7 +97,7 @@ void display_login(char *mesg)
                svput("OFFER_OPENID_LOGIN", WCS_STRING, "");
        }
 
-       do_template("login");
+       do_template("login", NULL);
 
        wDumpContent(2);
 }
@@ -153,7 +153,7 @@ void display_openid_login(char *mesg)
                "Log in using a user name and password"
        );
 
-       do_template("openid_login");
+       do_template("openid_login", NULL);
        wDumpContent(2);
 }
 
@@ -188,7 +188,7 @@ void display_openid_name_request(char *claimed_id, char *username) {
        svprintf(HKEY("BOXTITLE"), WCS_STRING, _("%s - powered by <a href=\"http://www.citadel.org\">Citadel</a>"),
                serv_info.serv_humannode);
 
-       do_template("openid_manual_create");
+       do_template("openid_manual_create", NULL);
        wDumpContent(2);
 }
 
@@ -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;
 }
 
 
@@ -286,6 +288,7 @@ void do_login(void)
                }
        }
        if (WC->logged_in) {
+               set_preference("language", NewStrBufPlain(bstr("language"), -1), 1);
                if (WC->need_regi) {
                        display_reg(1);
                } else if (WC->need_vali) {
@@ -404,14 +407,14 @@ void finalize_openid_login(void)
                                urlcontent *u;
                                void *U;
                                long HKLen;
-                               char *HKey;
+                               const char *HKey;
                                HashPos *Cursor;
                                
                                Cursor = GetNewHashPos ();
                                while (GetNextHashPos(WCC->urlstrings, Cursor, &HKLen, &HKey, &U)) {
                                        u = (urlcontent*) U;
                                        if (!strncasecmp(u->url_key, "openid.", 7)) {
-                                               serv_printf("%s|%s", &u->url_key[7], u->url_data);
+                                               serv_printf("%s|%s", &u->url_key[7], ChrPtr(u->url_data));
                                        }
                                }
 
@@ -540,7 +543,7 @@ void do_welcome(void)
                StrBufCutLeft(Buf, 1);
        }
        if (StrLength(Buf) == 0)
-               StrBufAppendBufPlain(Buf, "/knrooms", 1, 0);
+               StrBufAppendBufPlain(Buf, "dotgoto?room=_BASEROOM_", -1, 0);
        http_redirect(ChrPtr(Buf));
 }
 
@@ -552,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");
@@ -794,7 +796,7 @@ void display_changepw(void)
        output_headers(1, 1, 1, 0, 0, 0);
 
        svput("BOXTITLE", WCS_STRING, _("Change your password"));
-       do_template("beginbox");
+       do_template("beginbox", NULL);
 
        if (!IsEmptyStr(WC->ImportantMessage)) {
                wprintf("<span class=\"errormsg\">"
@@ -828,7 +830,7 @@ void display_changepw(void)
        wprintf("</div>\n");
        wprintf("</form>\n");
 
-       do_template("endbox");
+       do_template("endbox", NULL);
        wDumpContent(1);
 }
 
@@ -880,6 +882,18 @@ 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);
+}
+
+
+
 void _display_openid_login(void) {display_openid_login(NULL);}
 void _display_reg(void) {display_reg(0);}
 
@@ -900,5 +914,9 @@ 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);
+
        return ;
 }