Merge branch 'master' into newmc

[plack-app-gruntmaster.git] / lib / Plack / App / Gruntmaster.pm

diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index bfc2e27049b064f09bc4d7f6e1c4d4fb5b01c8bc..e0f921df77625ec0f9e9a0cc81b765fdcd876afb 100644 (file)
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -163,7 +163,8 @@ sub dispatch_request{
 
                sub (/ed/:contest) {
                        forbid contest->is_running;
-                       response ed => 'Editorial of ' . contest->name, db->problem_list(contest => $_{contest}, solution => 1);
+                       my $pblist = db->problem_list(contest => $_{contest}, solution => 1);
+                       response ed => 'Editorial of ' . contest->name, {%$pblist, editorial => contest->editorial};
                },
 
                sub (/login) {
@@ -278,6 +279,8 @@ website using the following information:
 Username: $_{username}
 Password: <your new password>
 Reset token: $token
+
+The token is valid for 24 hours.
 EOF
                        my $email = Email::Simple->create(
                                header => [
@@ -301,6 +304,7 @@ EOF
                        my $user = db->user($_{username});
                        return reply 'No such user' unless $user;
                        my ($token, $exp) = split ':', $_{token};
+                       return reply 'Reset token is expired' if time >= $exp;
                        return reply 'Bad reset token' unless $user->make_reset_hmac($exp) eq $token;
                        $user->set_passphrase($_{password});
                        reply 'Password reset successfully';