Tidy up login reporting.

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.

diff --git a/server/dcgi.c b/server/dcgi.c
index d54160e559e6d791f33470079ffbe31573c69bcc..27c77b1037a85fe89b5d440ff9d0e60e759fac8b 100644 (file)
--- a/server/dcgi.c
+++ b/server/dcgi.c
@@ -477,7 +477,8 @@ static void act_login(cgi_sink *output,
   }
   /* 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
@@ -492,6 +493,7 @@ static void act_logout(cgi_sink *output,
   /* Reconnect as guest */
   disorder_cgi_login(ds, output);
   /* Back to the login page */
+  cgi_set_option("status", "logoutok");
   expand_template(ds, output, "login");
 }
 
@@ -545,7 +547,7 @@ static void act_register(cgi_sink *output,
   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");
 }
 
@@ -561,7 +563,7 @@ static void act_confirm(cgi_sink *output,
     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");
 }
 

diff --git a/templates/login.html b/templates/login.html
index 8f366bbbbf6232eaf83439c0c35f5ba50c3ca925..65f1939242b07365389125fd9285bbc8ddf96524 100644 (file)
--- a/templates/login.html
+++ b/templates/login.html
@@ -33,12 +33,12 @@ USA
    <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 -->
+  <p>User: @user@</p>
 
    @if{@eq{@user@}{guest}@}{
    @#{guest user, allow login and registration}@
@@ -101,7 +101,7 @@ USA
                     size=32></td>
          <td>
            <button class=register name=action type=submit value=register>
-             @label:login.login@
+             @label:login.register@
            </button>
          </td>
        </tr>

diff --git a/templates/options.labels b/templates/options.labels
index 249d6ae928e9dc06f181298deeb6ec6670661829..b62a918ffcb4e74ca229677a45f316dcc6fd050e 100644 (file)
--- a/templates/options.labels
+++ b/templates/options.labels
@@ -144,7 +144,12 @@ label      login.email             "Email address"
 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"