The various login-page actions now set the label 'status' to their
result and this is used to pick the right label for the response text.
The interpretation of 'back' is fixed too.
}
/* We have a new cookie */
header_cookie(output->sink);
}
/* We have a new cookie */
header_cookie(output->sink);
- if((back = cgi_get("back")) && back)
+ cgi_set_option("status", "loginok");
+ if((back = cgi_get("back")) && *back)
/* Redirect back to somewhere or other */
redirect(output->sink);
else
/* Redirect back to somewhere or other */
redirect(output->sink);
else
/* Reconnect as guest */
disorder_cgi_login(ds, output);
/* Back to the login page */
/* Reconnect as guest */
disorder_cgi_login(ds, output);
/* Back to the login page */
+ cgi_set_option("status", "logoutok");
expand_template(ds, output, "login");
}
expand_template(ds, output, "login");
}
sendmail("", config->mail_sender, email, "Welcome to DisOrder",
encoding, content_type, text); /* TODO error checking */
/* We'll go back to the login page with a suitable message */
sendmail("", config->mail_sender, email, "Welcome to DisOrder",
encoding, content_type, text); /* TODO error checking */
/* We'll go back to the login page with a suitable message */
- cgi_set_option("registered", "registeredok");
+ cgi_set_option("status", "registered");
expand_template(ds, output, "login");
}
expand_template(ds, output, "login");
}
cgi_set_option("error", "badconfirm");
expand_template(ds, output, "login");
}
cgi_set_option("error", "badconfirm");
expand_template(ds, output, "login");
}
- cgi_set_option("confirmed", "confirmedok");
+ cgi_set_option("status", "confirmed");
expand_template(ds, output, "login");
}
expand_template(ds, output, "login");
}
<p>@label{error.@label:error@}@</p>
}@
<p>@label{error.@label:error@}@</p>
}@
- @if{@ne{@label:registered@}{registered}@}{
- @#{registration succeeded}@
- <p>@label:login.registered@</p>
+ @if{@ne{@label:status@}{status}@}{
+ @#{some action succeeded}@
+ <p class=loginstatus>@label{login.@label:status@}@</p>
- <!-- TODO report success of confirmation -->
@if{@eq{@user@}{guest}@}{
@#{guest user, allow login and registration}@
@if{@eq{@user@}{guest}@}{
@#{guest user, allow login and registration}@
size=32></td>
<td>
<button class=register name=action type=submit value=register>
size=32></td>
<td>
<button class=register name=action type=submit value=register>
label login.login "Login"
label login.register "Register"
label login.edituser "Change Details"
label login.login "Login"
label login.register "Register"
label login.edituser "Change Details"
-label login.lougout "Logout"
+label login.logout "Logout"
+
+label login.loginok "Logged in OK"
+label login.logoutok "Logged out OK"
+label login.registered "Registered your new login"
+label login.confirmed "Confirmed your new login"
# <TITLE> for account page
label account.title "DisOrder User Details"
# <TITLE> for account page
label account.title "DisOrder User Details"