\n");
- if (mesg != NULL) if (strlen(mesg) > 0) {
+ if (mesg != NULL) if (!IsEmptyStr(mesg)) {
stresc(buf, mesg, 0, 0);
svprintf("mesg", WCS_STRING, "%s", buf);
}
@@ -50,12 +65,24 @@ void display_login(char *mesg)
serv_info.serv_humannode
);
+ svprintf("USERNAME_BOX", WCS_STRING, "%s", _("User name:"));
+ svprintf("PASSWORD_BOX", WCS_STRING, "%s", _("Password:"));
+ svprintf("LANGUAGE_BOX", WCS_STRING, "%s", _("Language:"));
svprintf("LOGIN_BUTTON", WCS_STRING, "%s", _("Login"));
svprintf("NEWUSER_BUTTON", WCS_STRING, "%s", _("New User"));
svprintf("EXIT_BUTTON", WCS_STRING, "%s", _("Exit"));
svprintf("hello", WCS_SERVCMD, "MESG hello");
- svprintf("BOXTITLE", WCS_STRING, _("%s - powered by Citadel"),
+ svprintf("BOXTITLE", WCS_STRING, _("%s - powered by
Citadel"),
serv_info.serv_humannode);
+ svcallback("DO_LANGUAGE_BOX", offer_languages);
+ if (serv_info.serv_newuser_disabled) {
+ svprintf("NEWUSER_BUTTON_PRE", WCS_STRING, "
");
+ svprintf("NEWUSER_BUTTON_POST", WCS_STRING, "
");
+ }
+ else {
+ svprintf("NEWUSER_BUTTON_PRE", WCS_STRING, "");
+ svprintf("NEWUSER_BUTTON_POST", WCS_STRING, "");
+ }
do_template("login");
@@ -65,19 +92,24 @@ void display_login(char *mesg)
-/*
+/** \brief 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
*/
void become_logged_in(char *user, char *pass, char *serv_response)
{
char buf[SIZ];
WC->logged_in = 1;
- extract_token(WC->wc_username, &serv_response[4], 0, '|', sizeof WC->wc_username);
+ extract_token(WC->wc_fullname, &serv_response[4], 0, '|', sizeof WC->wc_fullname);
+ safestrncpy(WC->wc_username, user, sizeof WC->wc_username);
safestrncpy(WC->wc_password, pass, sizeof WC->wc_password);
WC->axlevel = extract_int(&serv_response[4], 1);
if (WC->axlevel >= 6) {
@@ -94,18 +126,32 @@ void become_logged_in(char *user, char *pass, char *serv_response)
WC->need_vali = extract_int(&buf[4], 2);
extract_token(WC->cs_inet_email, &buf[4], 3, '|', sizeof WC->cs_inet_email);
}
+
+ get_preference("current_iconbar", buf, sizeof buf);
+ WC->current_iconbar = atoi(buf);
+
+ get_preference("floordiv_expanded", WC->floordiv_expanded, sizeof WC->floordiv_expanded);
}
+/**
+ * \brief Login Checks
+ * the logics to detect invalid passwords not to get on citservers nerves
+ */
void do_login(void)
{
char buf[SIZ];
- if (strlen(bstr("exit_action")) > 0) {
+ if (!IsEmptyStr(bstr("language"))) {
+ set_selected_language(bstr("language"));
+ go_selected_language();
+ }
+
+ if (!IsEmptyStr(bstr("exit_action"))) {
do_logout();
return;
}
- if (strlen(bstr("login_action")) > 0) {
+ if (!IsEmptyStr(bstr("login_action"))) {
serv_printf("USER %s", bstr("name"));
serv_getln(buf, sizeof buf);
if (buf[0] == '3') {
@@ -123,8 +169,8 @@ void do_login(void)
return;
}
}
- if (strlen(bstr("newuser_action")) > 0) {
- if (strlen(bstr("pass")) == 0) {
+ if (!IsEmptyStr(bstr("newuser_action"))) {
+ if (IsEmptyStr(bstr("pass"))) {
display_login(_("Blank passwords are not allowed."));
return;
}
@@ -151,6 +197,11 @@ void do_login(void)
}
+/**
+ * \brief 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
+ */
void do_welcome(void)
{
char buf[SIZ];
@@ -158,14 +209,16 @@ void do_welcome(void)
FILE *fp;
int i;
- /*
+ /**
* See if we have to run the first-time setup wizard
*/
if (WC->is_aide) {
if (!setup_wizard) {
+ int len;
sprintf(wizard_filename, "setupwiz.%s.%s",
ctdlhost, ctdlport);
- for (i=0; i
logged_in) {
+ sprintf(buf, "%d", WC->current_iconbar);
+ set_preference("current_iconbar", buf, 0);
+ set_preference("floordiv_expanded", WC->floordiv_expanded, 1);
+ }
+
serv_puts("QUIT");
WC->killthis = 1;
/* close() of citadel socket will be done by do_housekeeping() */
}
-
+/**
+ * execute the logout
+ */
void do_logout(void)
{
char buf[SIZ];
@@ -219,9 +285,10 @@ void do_logout(void)
safestrncpy(WC->wc_username, "", sizeof WC->wc_username);
safestrncpy(WC->wc_password, "", sizeof WC->wc_password);
safestrncpy(WC->wc_roomname, "", sizeof WC->wc_roomname);
+ safestrncpy(WC->wc_fullname, "", sizeof WC->wc_fullname);
- /* Calling output_headers() this way causes the cookies to be un-set */
- output_headers(1, 1, 0, 1, 0, 0, 0);
+ /** Calling output_headers() this way causes the cookies to be un-set */
+ output_headers(1, 1, 0, 1, 0, 0);
wprintf("");
serv_puts("MESG goodbye");
@@ -229,7 +296,7 @@ void do_logout(void)
if (WC->serv_sock >= 0) {
if (buf[0] == '1') {
- fmout(NULL, "CENTER");
+ fmout("CENTER");
} else {
wprintf("Goodbye\n");
}
@@ -241,7 +308,9 @@ void do_logout(void)
);
}
- wprintf("
Log in again "
+ wprintf("
");
+ wprintf(_("Log in again"));
+ wprintf(" "
"");
wprintf(_("Close window"));
wprintf("\n");
@@ -250,7 +319,7 @@ void do_logout(void)
}
-/*
+/* *
* validate new users
*/
void validate(void)
@@ -260,33 +329,45 @@ void validate(void)
char buf[SIZ];
int a;
- output_headers(1, 1, 2, 0, 0, 0, 0);
- wprintf("\n"
- "
"
- "");
+ output_headers(1, 1, 2, 0, 0, 0);
+ wprintf(" \n");
+ wprintf(" ");
wprintf(_("Validate new users"));
- wprintf(" |
\n
\n\n");
+ wprintf("");
+ wprintf("
\n");
+
+ wprintf("\n");
+ /** 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 (!IsEmptyStr(bstr("axlevel"))) {
serv_printf("VALI %s|%s", buf, bstr("axlevel"));
serv_getln(buf, sizeof buf);
if (buf[0] != '2') {
wprintf("
%s\n", &buf[4]);
}
}
+ }
+
+ /** Now see if any more users require validation. */
serv_puts("GNUR");
serv_getln(buf, sizeof buf);
-
+ if (buf[0] == '2') {
+ wprintf("
");
+ wprintf(_("No users require validation at this time."));
+ wprintf("\n");
+ wDumpContent(1);
+ return;
+ }
if (buf[0] != '3') {
wprintf("
%s\n", &buf[4]);
wDumpContent(1);
return;
}
- wprintf("