X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Fclub%2Fwpia%2Fgigi%2Fpages%2FPasswordResetPage.java;h=af1829a09223f504fc3bfcfec424d5d0c9acaced;hb=753ce950283248b931ee9da5158c88156c21e17d;hp=3608549cf4ba00249a021f8866f7d1a4998a366c;hpb=d71624703243c182beb0f946ebc582e0366a4686;p=gigi.git

diff --git a/src/club/wpia/gigi/pages/PasswordResetPage.java b/src/club/wpia/gigi/pages/PasswordResetPage.java
index 3608549c..af1829a0 100644
--- a/src/club/wpia/gigi/pages/PasswordResetPage.java
+++ b/src/club/wpia/gigi/pages/PasswordResetPage.java
@@ -20,6 +20,7 @@ import club.wpia.gigi.output.template.TranslateCommand;
 import club.wpia.gigi.util.AuthorizationContext;
 import club.wpia.gigi.util.RandomToken;
 import club.wpia.gigi.util.ServerConstants;
+import club.wpia.gigi.util.ServerConstants.Host;
 
 public class PasswordResetPage extends Page {
 
@@ -60,7 +61,7 @@ public class PasswordResetPage extends Page {
 
         @Override
         public SuccessMessageResult submit(HttpServletRequest req) throws GigiApiException {
-            try (GigiPreparedStatement passwordReset = new GigiPreparedStatement("UPDATE `passwordResetTickets` SET `used` = CURRENT_TIMESTAMP WHERE `used` IS NULL AND `created` < CURRENT_TIMESTAMP - interval '1 hours' * ?;")) {
+            try (GigiPreparedStatement passwordReset = new GigiPreparedStatement("UPDATE `passwordResetTickets` SET `used` = CURRENT_TIMESTAMP WHERE `used` IS NULL AND `created` < CURRENT_TIMESTAMP - interval '1 hours' * ?::INTEGER;")) {
                 passwordReset.setInt(1, HOUR_MAX);
                 passwordReset.execute();
             }
@@ -103,7 +104,7 @@ public class PasswordResetPage extends Page {
         try {
             new PasswordResetForm(req).output(resp.getWriter(), getLanguage(req), getDefaultVars(req));
         } catch (GigiApiException e) {
-            e.format(resp.getWriter(), getLanguage(req));
+            e.format(resp.getWriter(), getLanguage(req), getDefaultVars(req));
         }
     }
 
@@ -121,7 +122,7 @@ public class PasswordResetPage extends Page {
             HashMap<String, Object> vars = new HashMap<>();
             vars.put("subject", subject);
             vars.put("method", method);
-            vars.put("link", "https://" + ServerConstants.getWwwHostNamePortSecure() + PasswordResetPage.PATH //
+            vars.put("link", "https://" + ServerConstants.getHostNamePortSecure(Host.WWW) + PasswordResetPage.PATH //
                     + "?id=" + id + "&token=" + URLEncoder.encode(ptok, "UTF-8"));
             vars.put("hour_max", HOUR_MAX);