Merge branch 'master' into newmc

diff --combined lib/Plack/App/Gruntmaster.pm
index 0cb7aabca2fa1b0dd392b33ea74b9f0b29d61900,2edc6dc2999daa3cbb9006cb3954e25b48fe4ada..e0f921df77625ec0f9e9a0cc81b765fdcd876afb
--- 1/lib/Plack/App/Gruntmaster.pm
--- 2/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@@ -163,8 -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) {
@@@ -279,6 -278,8 +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 => [
@@@ -302,6 -303,7 +304,7 @@@
                        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';