From b32f5119087a12ebc602223292ae819dee54f30b Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 24 Jan 2011 22:18:59 -0500 Subject: [PATCH] Disabled the old login screen. Some of this code will be re-used for registration and language selection. --- webcit/auth.c | 5 ++++- webcit/static/authmethods.js | 5 ++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/webcit/auth.c b/webcit/auth.c index 2d2e90be2..eba2e3bc4 100644 --- a/webcit/auth.c +++ b/webcit/auth.c @@ -140,6 +140,7 @@ void become_logged_in(const StrBuf *user, const StrBuf *pass, StrBuf *serv_respo } +#ifdef __OLD__LOGIN__SCREEN__ /* * Perform authentication using a user name and password */ @@ -227,7 +228,7 @@ void do_login(void) } FreeStrBuf(&Buf); } - +#endif /* @@ -1066,7 +1067,9 @@ InitModule_AUTH /* some of these will be removed soon */ WebcitAddUrlHandler(HKEY("do_welcome"), "", 0, do_welcome, ANONYMOUS|COOKIEUNNEEDED); +#ifdef __OLD__LOGIN__SCREEN__ WebcitAddUrlHandler(HKEY("login"), "", 0, do_login, ANONYMOUS|COOKIEUNNEEDED); +#endif WebcitAddUrlHandler(HKEY("openid_login"), "", 0, do_openid_login, ANONYMOUS); WebcitAddUrlHandler(HKEY("finalize_openid_login"), "", 0, finalize_openid_login, ANONYMOUS); WebcitAddUrlHandler(HKEY("openid_manual_create"), "", 0, openid_manual_create, ANONYMOUS); diff --git a/webcit/static/authmethods.js b/webcit/static/authmethods.js index 1ea70c00d..c8452c54a 100644 --- a/webcit/static/authmethods.js +++ b/webcit/static/authmethods.js @@ -1,5 +1,5 @@ /* - * Copyright 2010, the Citadel Team + * Copyright 2010-2011, the Citadel Team * Licensed under the GPL V3 * * JavaScript functions which handle various authentication methods. @@ -19,7 +19,6 @@ function IsLoggedIn() { } - /* * Wrapper script to require logging in before completing an action */ @@ -66,6 +65,7 @@ function ajax_try_username_and_password() { }); } + /* * The user pressed a key while in the username or password box. * Is it the enter/return key? Submit the form. @@ -110,4 +110,3 @@ function ajax_try_openid() { openid_url = encodeURI($('ajax_openid_form').elements["openid_url"].value); do_auth_popout("openid_login?openid_url=" + openid_url); } - -- 2.30.2