From e6ec311ba322afaf3dbf491e46677825b22cada2 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Wed, 29 Dec 2010 17:41:23 -0500 Subject: [PATCH] Smooth transition between logged-in and not-logged-in states --- webcit/auth.c | 24 ++++++++++-------------- webcit/static/t/get_logged_in.html | 4 ++-- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/webcit/auth.c b/webcit/auth.c index 435850113..c3a3cac50 100644 --- a/webcit/auth.c +++ b/webcit/auth.c @@ -568,14 +568,20 @@ void do_logout(void) FlushStrBuf(WCC->wc_username); FlushStrBuf(WCC->wc_password); - FlushStrBuf(WCC->CurRoom.name); FlushStrBuf(WCC->wc_fullname); - /* FIXME: this is to suppress the iconbar displaying, because we aren't - actually logged out yet */ + serv_puts("LOUT"); + serv_getln(buf, sizeof buf); WCC->logged_in = 0; - /** Calling output_headers() this way causes the cookies to be un-set */ + 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); wc_printf("
"); @@ -607,16 +613,6 @@ void do_logout(void) ""); wc_printf(_("Log in again")); wc_printf(""); - - /* The "close window" link is commented out because some browsers don't - * allow it to work. - * - wc_printf("   " - ""); - wc_printf(_("Close window")); - wc_printf(""); - */ - wc_printf("
\n"); wDumpContent(2); end_webcit_session(); diff --git a/webcit/static/t/get_logged_in.html b/webcit/static/t/get_logged_in.html index 0112971dc..57be840b5 100644 --- a/webcit/static/t/get_logged_in.html +++ b/webcit/static/t/get_logged_in.html @@ -17,8 +17,8 @@ To complete this action, you must log in. FIXME localize this string.
-');">Proceed and be clueless
- +
');">
+
-- 2.30.2