]> code.citadel.org Git - citadel.git/blobdiff - webcit/auth.c
projects / citadel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
move beginbox & endbox to box_* so we can tidy up our static/t/ directory a little...
[citadel.git] / webcit / auth.c
diff --git a/webcit/auth.c b/webcit/auth.c
index a1f881645ae3015d122a685ca89535215d80ef1d..a5e357edf7ca646818e6dc991f029de9a08e2dcc 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -64,7 +64,7 @@ void display_login(void)
 {
        begin_burst();
        output_headers(1, 0, 0, 0, 1, 0);
-       do_template("login", NULL);
+       do_template("login");
        end_burst();
 }
 
@@ -135,6 +135,7 @@ void become_logged_in(const StrBuf *user, const StrBuf *pass, StrBuf *serv_respo
        get_preference("floordiv_expanded", &FloorDiv);
        WCC->floordiv_expanded = FloorDiv;
        FreeStrBuf(&Buf);
+       FlushRoomlist();
 }
 
 
@@ -195,7 +196,7 @@ void openid_manual_create(void)
        if (havebstr("exit_action")) {
                begin_burst();
                output_headers(1, 0, 0, 0, 1, 0);
-               do_template("authpopup_finished", NULL);
+               do_template("authpopup_finished");
                end_burst();
                return;
        }
@@ -223,7 +224,7 @@ void openid_manual_create(void)
                if (WC->logged_in) {
                        begin_burst();
                        output_headers(1, 0, 0, 0, 1, 0);
-                       do_template("authpopup_finished", NULL);
+                       do_template("authpopup_finished");
                        end_burst();
                }
        } else {
@@ -236,7 +237,7 @@ void openid_manual_create(void)
                begin_burst();
                output_headers(1, 0, 0, 0, 1, 0);
                wc_printf("<html><body>");
-               do_template("openid_manual_create", NULL);
+               do_template("openid_manual_create");
                wc_printf("</body></html>");
                end_burst();
        }
@@ -302,6 +303,7 @@ void finalize_openid_login(void)
                                long HKLen;
                                const char *HKey;
                                HashPos *Cursor;
+                               int len;
                                
                                Cursor = GetNewHashPos (WCC->Hdr->urlstrings, 0);
                                while (GetNextHashPos(WCC->Hdr->urlstrings, Cursor, &HKLen, &HKey, &U)) {
@@ -314,7 +316,9 @@ void finalize_openid_login(void)
                                serv_puts("000");
 
                                linecount = 0;
-                               while (StrBuf_ServGetln(Buf), strcmp(ChrPtr(Buf), "000")) 
+                               while (len = StrBuf_ServGetln(Buf), 
+                                      ((len >= 0) &&
+                                       ((len != 3) || strcmp(ChrPtr(Buf), "000") )))
                                {
                                        if (linecount == 0) result = NewStrBufDup(Buf);
                                        if (!strcasecmp(ChrPtr(result), "authenticate")) {
@@ -360,7 +364,7 @@ void finalize_openid_login(void)
                if (WC->logged_in) {
                        begin_burst();
                        output_headers(1, 0, 0, 0, 1, 0);
-                       do_template("authpopup_finished", NULL);
+                       do_template("authpopup_finished");
                        end_burst();
                } else {
                        begin_burst();
@@ -385,7 +389,7 @@ void finalize_openid_login(void)
                begin_burst();
                output_headers(1, 0, 0, 0, 1, 0);
                wc_printf("<html><body>");
-               do_template("openid_manual_create", NULL);
+               do_template("openid_manual_create");
                wc_printf("</body></html>");
                end_burst();
        }
@@ -497,21 +501,25 @@ void do_logout(void)
        FlushStrBuf(WCC->wc_username);
        FlushStrBuf(WCC->wc_password);
        FlushStrBuf(WCC->wc_fullname);
+       FlushRoomlist();
 
        serv_puts("LOUT");
        serv_getln(buf, sizeof buf);
        WCC->logged_in = 0;
 
-       if (WC->serv_info->serv_supports_guest) {
-               display_default_landing_page();
-               return;
-       }
-
        FlushStrBuf(WCC->CurRoom.name);
 
        /* Calling output_headers() this way causes the cookies to be un-set */
        output_headers(1, 1, 0, 1, 0, 0);
 
+       /* For sites in guest mode, redirect to the landing page after we're logged out */
+       if (WC->serv_info->serv_supports_guest) {
+               wc_printf("     <script type=\"text/javascript\">       "
+                       "       window.location='/';                    "
+                       "       </script>                               "
+               );
+       }
+
        wc_printf("<div id=\"logout_screen\">");
         wc_printf("<div class=\"box\">");
         wc_printf("<div class=\"boxlabel\">");
@@ -542,6 +550,46 @@ void do_logout(void)
        wc_printf(_("Log in again"));
        wc_printf("</a></span>");
        wc_printf("</div></div></div>\n");
+       if (WC->serv_info->serv_supports_guest) {
+               display_default_landing_page();
+               return;
+       }
+
+       wDumpContent(2);
+       end_webcit_session();
+}
+
+
+/* 
+ * Special page for monitoring scripts etc
+ */
+void monitor(void)
+{
+       wcsession *WCC = WC;
+       char buf[SIZ];
+
+       FlushStrBuf(WCC->wc_username);
+       FlushStrBuf(WCC->wc_password);
+       FlushStrBuf(WCC->wc_fullname);
+       FlushRoomlist();
+
+       serv_puts("LOUT");
+       serv_getln(buf, sizeof buf);
+       WCC->logged_in = 0;
+
+       FlushStrBuf(WCC->CurRoom.name);
+
+       /* Calling output_headers() this way causes the cookies to be un-set */
+       output_headers(1, 0, 0, 1, 1, 0);
+
+       wc_printf("<html><body><tt>");
+       wc_printf("<strong>WebCit monitoring screen</strong><br>\n");
+       wc_printf("Connection to Citadel server at %s:%s : %s<br>\n",
+               ctdlhost, ctdlport,
+               (WC->connected ? "SUCCESS" : "FAIL")
+       );
+       wc_printf("</body></html>\n");
+
        wDumpContent(2);
        end_webcit_session();
 }
@@ -557,14 +605,11 @@ void validate(void)
        char buf[SIZ];
        int a;
 
-       output_headers(1, 1, 2, 0, 0, 0);
-       wc_printf("<div id=\"banner\">\n");
-       wc_printf("<h1>");
-       wc_printf(_("Validate new users"));
-       wc_printf("</h1>");
-       wc_printf("</div>\n");
+       output_headers(1, 1, 1, 0, 0, 0);
 
-       wc_printf("<div id=\"content\" class=\"service\">\n");
+        do_template("box_begin_1");
+        StrBufAppendBufPlain(WC->WBuf, _("Validate new users"), -1, 0);
+        do_template("box_begin_2");
 
        /* If the user just submitted a validation, process it... */
        safestrncpy(buf, bstr("user"), sizeof buf);
@@ -678,6 +723,7 @@ void validate(void)
 
        wc_printf("</div>\n");
        wc_printf("</td></tr></table>\n");
+       do_template("box_end");
        wDumpContent(1);
 }
 
@@ -753,7 +799,7 @@ void display_changepw(void)
        memset(&SubTP, 0, sizeof(WCTemplputParams));
        SubTP.Filter.ContextType = CTX_STRBUF;
        SubTP.Context = Buf;
-       DoTemplate(HKEY("beginbox"), NULL, &SubTP);
+       DoTemplate(HKEY("box_begin"), NULL, &SubTP);
 
        FreeStrBuf(&Buf);
 
@@ -789,7 +835,7 @@ void display_changepw(void)
        wc_printf("</div>\n");
        wc_printf("</form>\n");
 
-       do_template("endbox", NULL);
+       do_template("box_end");
        wDumpContent(1);
 }
 
@@ -881,6 +927,15 @@ int ConditionalIsLoggedIn(StrBuf *Target, WCTemplputParams *TP)
 }
 
 
+/* 
+ * toggle the session over to a different language
+ */
+void switch_language(void) {
+       set_selected_language(bstr("lang"));
+       pop_destination();
+}
+
+
 void _display_reg(void) {
        display_reg(0);
 }
@@ -1013,8 +1068,10 @@ InitModule_AUTH
        WebcitAddUrlHandler(HKEY("changepw"), "", 0, changepw, 0);
        WebcitAddUrlHandler(HKEY("termquit"), "", 0, do_logout, 0);
        WebcitAddUrlHandler(HKEY("do_logout"), "", 0, do_logout, ANONYMOUS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE);
+       WebcitAddUrlHandler(HKEY("monitor"), "", 0, monitor, ANONYMOUS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE);
        WebcitAddUrlHandler(HKEY("ajax_login_username_password"), "", 0, ajax_login_username_password, AJAX|ANONYMOUS);
        WebcitAddUrlHandler(HKEY("ajax_login_newuser"), "", 0, ajax_login_newuser, AJAX|ANONYMOUS);
+       WebcitAddUrlHandler(HKEY("switch_language"), "", 0, switch_language, ANONYMOUS);
        RegisterConditional(HKEY("COND:AIDE"), 2, ConditionalAide, CTX_NONE);
        RegisterConditional(HKEY("COND:LOGGEDIN"), 2, ConditionalIsLoggedIn, CTX_NONE);
        RegisterConditional(HKEY("COND:MAY_CREATE_ROOM"), 2,  ConditionalHaveAccessCreateRoom, CTX_NONE);
Citadel server, clients, utilities