/*
* These functions handle authentication of users to a Citadel server.
*
- * Copyright (c) 1996-2010 by the citadel.org team
+ * Copyright (c) 1996-2011 by the citadel.org team
*
* This program is open source software. You can redistribute it and/or
* modify it under the terms of the GNU General Public License as
-/*
- * Display the openid-enabled login screen
- * mesg = the error message if last attempt failed.
- */
-void display_openid_login(char *mesg)
-{
- begin_burst();
- output_headers(1, 0, 0, 0, 1, 0);
- do_template("openid_login", NULL);
- end_burst();
-}
-
-
-
/* Initialize the session
*
return;
}
else {
- display_openid_login(&buf[4]);
+ display_login();
return;
}
}
/* If we get to this point then something failed. */
- display_openid_login(_("Your password was not accepted."));
+ display_login();
}
/*
do_welcome();
}
} else {
- display_openid_login(_("Your password was not accepted."));
+ display_login();
}
FreeStrBuf(&result);
atoi(buf), axdefs[atoi(buf)]);
} while (strcmp(buf, "000"));
} else {
- wc_printf("<H1>%s</H1>%s<br />\n", user, &cmd[4]);
+ wc_printf("<H1>%s</H1>%s<br>\n", user, &cmd[4]);
}
wc_printf("<hr />");
wc_printf(_("Select access level for this user:"));
- wc_printf("<br />\n");
+ wc_printf("<br>\n");
for (a = 0; a <= 6; ++a) {
wc_printf("<a href=\"validate?nonce=%d?user=", WC->nonce);
urlescputs(user);
wc_printf("&axlevel=%d\">%s</A> \n",
a, axdefs[a]);
}
- wc_printf("<br />\n");
+ wc_printf("<br>\n");
wc_printf("</div>\n");
wc_printf("</td></tr></table>\n");
}
else {
StrBuf *ReturnTo;
- ReturnTo = NewStrBufPlain(HKEY("display_main_menu?gotofirst="));
+ ReturnTo = NewStrBufPlain(HKEY("display_main_menu?go="));
StrBufAppendBuf(ReturnTo, WC->CurRoom.name, 0);
do_edit_vcard(vcard_msgnum, "1", VCMsg, VCAtt, ChrPtr(ReturnTo), USERCONFIGROOM);
FreeStrBuf(&ReturnTo);
if (!IsEmptyStr(WC->ImportantMessage)) {
wc_printf("<span class=\"errormsg\">"
- "%s</span><br />\n", WC->ImportantMessage);
+ "%s</span><br>\n", WC->ImportantMessage);
safestrncpy(WC->ImportantMessage, "", sizeof WC->ImportantMessage);
}
{
wcsession *WCC = WC;
return (WCC != NULL)? (WCC->logged_in == 0) : 0;
-}
-
-void _display_openid_login(void) {
- display_openid_login(NULL);
}
+
void _display_reg(void) {
display_reg(0);
}
RegisterHeaderHandler(HKEY("COOKIE"), Header_HandleCookie);
RegisterHeaderHandler(HKEY("AUTHORIZATION"), Header_HandleAuth);
- WebcitAddUrlHandler(HKEY(""), "", 0, do_welcome, ANONYMOUS|COOKIEUNNEEDED); /* no url pattern at all? Show login. */
+ /* no url pattern at all? Show login. */
+ WebcitAddUrlHandler(HKEY(""), "", 0, do_welcome, ANONYMOUS|COOKIEUNNEEDED);
+
+ /* some of these will be removed soon */
WebcitAddUrlHandler(HKEY("do_welcome"), "", 0, do_welcome, ANONYMOUS|COOKIEUNNEEDED);
WebcitAddUrlHandler(HKEY("login"), "", 0, do_login, ANONYMOUS|COOKIEUNNEEDED);
- WebcitAddUrlHandler(HKEY("display_openid_login"), "", 0, _display_openid_login, ANONYMOUS);
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);
- WebcitAddUrlHandler(HKEY("do_logout"), "", 0, do_logout, ANONYMOUS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE);
- WebcitAddUrlHandler(HKEY("ajax_login_username_password"), "", 0, ajax_login_username_password, AJAX);
WebcitAddUrlHandler(HKEY("validate"), "", 0, validate, 0);
WebcitAddUrlHandler(HKEY("do_welcome"), "", 0, do_welcome, 0);
WebcitAddUrlHandler(HKEY("display_reg"), "", 0, _display_reg, 0);
WebcitAddUrlHandler(HKEY("display_changepw"), "", 0, display_changepw, 0);
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("ajax_login_username_password"), "", 0,
+ ajax_login_username_password, AJAX|ANONYMOUS);
RegisterConditional(HKEY("COND:AIDE"), 2, ConditionalAide, CTX_NONE);
RegisterConditional(HKEY("COND:LOGGEDIN"), 2, ConditionalIsLoggedIn, CTX_NONE);