/*
* $Id$
- */
-/**
*
- * \defgroup WebcitAuth WebcitAuth; Handles authentication of users to a Citadel server.
- * \ingroup CitadelConfig
+ * WebcitAuth; Handles authentication of users to a Citadel server.
*/
-/*@{*/
#include "webcit.h"
-
-
-/**
- * \brief user states
+/*
+ * user states
* the plain text states of a user. filled in at \ function TODO initialize_ax_defs()
* due to NLS
*/
-/**
- * \brief Display the login screen
- * \param mesg The error message if last attempt failed.
+/*
+ * Display the login screen
+ * mesg = the error message if last attempt failed.
*/
void display_login(char *mesg)
{
output_headers(1, 1, 2, 0, 0, 0);
wprintf("<div id=\"login_screen\">\n");
- if (mesg != NULL) if (strlen(mesg) > 0) {
- stresc(buf, mesg, 0, 0);
- svprintf("mesg", WCS_STRING, "%s", buf);
+ if (mesg != NULL) if (!IsEmptyStr(mesg)) {
+ stresc(buf, SIZ, mesg, 0, 0);
+ svprintf("mesg", WCS_STRING, "%s", buf);
}
svprintf("LOGIN_INSTRUCTIONS", WCS_STRING,
-/** \brief Initialize the session
+/* Initialize the session
+ *
* This function needs to get called whenever the session changes from
* not-logged-in to logged-in, either by an explicit login by the user or
* by a timed-out session automatically re-establishing with a little help
* from the browser cookie. Either way, we need to load access controls and
* preferences from the server.
*
- * \param user the username
- * \param pass his password
- * \param serv_response The parameters returned from a Citadel USER or NEWU command
+ * user the username
+ * pass his password
+ * serv_response The parameters returned from a Citadel USER or NEWU command
*/
void become_logged_in(char *user, char *pass, char *serv_response)
{
}
-/**
- * \brief Login Checks
- * the logics to detect invalid passwords not to get on citservers nerves
+/*
+ * Login Checks
+ * the logic to detect invalid passwords not to get on citservers nerves
*/
void do_login(void)
{
char buf[SIZ];
- if (strlen(bstr("language")) > 0) {
+ if (havebstr("language")) {
set_selected_language(bstr("language"));
go_selected_language();
}
- if (strlen(bstr("exit_action")) > 0) {
+ if (havebstr("exit_action")) {
do_logout();
return;
}
- if (strlen(bstr("login_action")) > 0) {
+ if (havebstr("login_action")) {
serv_printf("USER %s", bstr("name"));
serv_getln(buf, sizeof buf);
if (buf[0] == '3') {
return;
}
}
- if (strlen(bstr("newuser_action")) > 0) {
- if (strlen(bstr("pass")) == 0) {
+ if (havebstr("newuser_action")) {
+ if (!havebstr("pass")) {
display_login(_("Blank passwords are not allowed."));
return;
}
}
-/**
- * \brief display the user a welcome screen.
+/*
+ * display the user a welcome screen.
+ *
* if this is the first time login, and the web based setup is enabled,
* lead the user through the setup routines
*/
*/
if (WC->is_aide) {
if (!setup_wizard) {
+ int len;
sprintf(wizard_filename, "setupwiz.%s.%s",
ctdlhost, ctdlport);
- for (i=0; i<strlen(wizard_filename); ++i) {
+ len = strlen(wizard_filename);
+ for (i=0; i<len; ++i) {
if ( (wizard_filename[i]==' ')
|| (wizard_filename[i] == '/')
) {
}
#endif
- /**
+ /*
* Go to the user's preferred start page
*/
get_preference("startpage", buf, sizeof buf);
- if (strlen(buf)==0) {
+ if (IsEmptyStr(buf)) {
safestrncpy(buf, "dotskip&room=_BASEROOM_", sizeof buf);
set_preference("startpage", buf, 1);
}
}
-/**
+/*
* Disconnect from the Citadel server, and end this WebCit session
*/
void end_webcit_session(void) {
/* close() of citadel socket will be done by do_housekeeping() */
}
-/**
+/*
* execute the logout
*/
void do_logout(void)
/** Calling output_headers() this way causes the cookies to be un-set */
output_headers(1, 1, 0, 1, 0, 0);
- wprintf("<center>");
+ wprintf("<div id=\"logout_screen\">");
+ wprintf("<div class=\"box\">");
+ wprintf("<div class=\"boxlabel\">");
+ wprintf(_("Log off"));
+ wprintf("</div><div class=\"boxcontent\">");
serv_puts("MESG goodbye");
serv_getln(buf, sizeof buf);
"connected to the Citadel server. Please report "
"this problem to your system administrator.")
);
+ wprintf("<a href=\"http://www.citadel.org/doku.php/"
+ "faq:mastering_your_os:net#netstat\">%s</a>",
+ _("Read More..."));
}
- wprintf("<hr /><a href=\".\">");
+ wprintf("<hr /><div class=\"buttons\"> "
+ "<span class=\"button_link\"><a href=\".\">");
wprintf(_("Log in again"));
- wprintf("</A> "
+ wprintf("</a></span> <span class=\"button_link\">"
"<a href=\"javascript:window.close();\">");
wprintf(_("Close window"));
- wprintf("</a></center>\n");
+ wprintf("</a></span></div></div></div></div>\n");
wDumpContent(2);
end_webcit_session();
}
-/* *
+/*
* validate new users
*/
void validate(void)
int a;
output_headers(1, 1, 2, 0, 0, 0);
- wprintf("<div id=\"banner\">\n"
- "<TABLE class=\"auth_banner\"><TR><TD>"
- "<SPAN CLASS=\"titlebar\">");
+ wprintf("<div id=\"banner\">\n");
+ wprintf("<h1>");
wprintf(_("Validate new users"));
- wprintf("</SPAN></TD></TR></TABLE>\n</div>\n<div id=\"content\">\n");
+ wprintf("</h1>");
+ wprintf("</div>\n");
+
+ wprintf("<div id=\"content\" class=\"service\">\n");
- /** If the user just submitted a validation, process it... */
+ /* If the user just submitted a validation, process it... */
safestrncpy(buf, bstr("user"), sizeof buf);
- if (strlen(buf) > 0) {
- if (strlen(bstr("axlevel")) > 0) {
+ if (!IsEmptyStr(buf)) {
+ if (havebstr("axlevel")) {
serv_printf("VALI %s|%s", buf, bstr("axlevel"));
serv_getln(buf, sizeof buf);
if (buf[0] != '2') {
}
}
- /** Now see if any more users require validation. */
+ /* Now see if any more users require validation. */
serv_puts("GNUR");
serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
wprintf(_("Select access level for this user:"));
wprintf("<br />\n");
for (a = 0; a <= 6; ++a) {
- wprintf("<a href=\"validate&user=");
+ wprintf("<a href=\"validate?nonce=%ld?user=", WC->nonce);
urlescputs(user);
wprintf("&axlevel=%d\">%s</A> \n",
a, axdefs[a]);
-/**
- * \brief Display form for registration.
+/*
+ * Display form for registration.
+ *
* (Set during_login to 1 if this registration is being performed during
* new user login and will require chaining to the proper screen.)
- * \param during_login are we just in the login phase?
*/
void display_reg(int during_login)
{
}
if (during_login) {
- do_edit_vcard(vcard_msgnum, "1", "do_welcome");
+ do_edit_vcard(vcard_msgnum, "1", "do_welcome", USERCONFIGROOM);
}
else {
- do_edit_vcard(vcard_msgnum, "1", "display_main_menu");
+ do_edit_vcard(vcard_msgnum, "1", "display_main_menu", USERCONFIGROOM);
}
}
-/**
+/*
* display form for changing your password
*/
void display_changepw(void)
{
char buf[SIZ];
- output_headers(1, 1, 2, 0, 0, 0);
- wprintf("<div id=\"banner\">\n"
- "<TABLE class=\"auth_banner\"><TR><TD>"
- "<SPAN CLASS=\"titlebar\">");
- wprintf(_("Change your password"));
- wprintf("</SPAN>"
- "</TD></TR></TABLE>\n"
- "</div>\n<div id=\"content\">\n"
- );
+ output_headers(1, 1, 1, 0, 0, 0);
- if (strlen(WC->ImportantMessage) > 0) {
- do_template("beginbox_nt");
- wprintf("<SPAN CLASS=\"errormsg\">"
- "%s</SPAN><br />\n", WC->ImportantMessage);
- do_template("endbox");
+ svprintf("BOXTITLE", WCS_STRING, _("Change your password"));
+ do_template("beginbox");
+
+ if (!IsEmptyStr(WC->ImportantMessage)) {
+ wprintf("<span class=\"errormsg\">"
+ "%s</span><br />\n", WC->ImportantMessage);
safestrncpy(WC->ImportantMessage, "", sizeof WC->ImportantMessage);
}
- wprintf("<div class=\"fix_scrollbar_bug\">"
- "<table class=\"auth_validate\"><tr><td>\n");
-
- wprintf("<CENTER><br />");
serv_puts("MESG changepw");
serv_getln(buf, sizeof buf);
if (buf[0] == '1') {
}
wprintf("<form name=\"changepwform\" action=\"changepw\" method=\"post\">\n");
- wprintf("<CENTER>"
- "<table border=\"0\" cellspacing=\"5\" cellpadding=\"5\" "
- "BGCOLOR=\"#EEEEEE\">"
- "<TR><TD>");
+ wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+ wprintf("<table class=\"altern\" ");
+ wprintf("<tr class=\"even\"><td>");
wprintf(_("Enter new password:"));
- wprintf("</TD>\n");
- wprintf("<TD><INPUT TYPE=\"password\" NAME=\"newpass1\" VALUE=\"\" MAXLENGTH=\"20\"></TD></TR>\n");
- wprintf("<TR><TD>");
+ wprintf("</td><td>");
+ wprintf("<input type=\"password\" name=\"newpass1\" value=\"\" maxlength=\"20\"></td></tr>\n");
+ wprintf("<tr class=\"odd\"><td>");
wprintf(_("Enter it again to confirm:"));
- wprintf("</TD>\n");
- wprintf("<TD><INPUT TYPE=\"password\" NAME=\"newpass2\" VALUE=\"\" MAXLENGTH=\"20\"></TD></TR>\n");
+ wprintf("</td><td>");
+ wprintf("<input type=\"password\" name=\"newpass2\" value=\"\" maxlength=\"20\"></td></tr>\n");
+ wprintf("</table>\n");
- wprintf("</TABLE><br />\n");
- wprintf("<INPUT type=\"submit\" name=\"change_action\" value=\"%s\">", _("Change password"));
+ wprintf("<div class=\"buttons\">\n");
+ wprintf("<input type=\"submit\" name=\"change_action\" value=\"%s\">", _("Change password"));
wprintf(" ");
- wprintf("<INPUT type=\"submit\" name=\"cancel_action\" value=\"%s\">\n", _("Cancel"));
- wprintf("</form></center>\n");
- wprintf("</td></tr></table></div>\n");
+ wprintf("<input type=\"submit\" name=\"cancel_action\" value=\"%s\">\n", _("Cancel"));
+ wprintf("</div>\n");
+ wprintf("</form>\n");
+
+ do_template("endbox");
wDumpContent(1);
}
-/**
- * \brief change password
+/*
+ * change password
* if passwords match, propagate it to citserver.
*/
void changepw(void)
char buf[SIZ];
char newpass1[32], newpass2[32];
- if (strlen(bstr("change_action")) == 0) {
+ if (!havebstr("change_action")) {
safestrncpy(WC->ImportantMessage,
_("Cancelled. Password was not changed."),
sizeof WC->ImportantMessage);
return;
}
- if (strlen(newpass1) == 0) {
+ if (IsEmptyStr(newpass1)) {
safestrncpy(WC->ImportantMessage,
_("Blank passwords are not allowed."),
sizeof WC->ImportantMessage);
-/** @} */
+void InitModule_AUTH(void)
+{
+ WebcitAddUrlHandler(HKEY("do_welcome"), do_welcome, 0);
+ return ;
+}
projects / citadel.git / blobdiff