Merge changes I7ab53fa7,Id4354942

* changes:
  upd: add exception handling
  upd: rephrase variables names and update expireCATS

diff --cc util-testing/club/wpia/gigi/pages/Manager.java
index bed50973a1bbef8d13c791cb514bd409f05080b4,2f866b2d22db8a3dc2ae3cbeb53211852467f095..7dabe4f2720e1836dfa5e383df61a433ae80310f
--- 1/util-testing/club/wpia/gigi/pages/Manager.java
--- 2/util-testing/club/wpia/gigi/pages/Manager.java
+++ b/util-testing/club/wpia/gigi/pages/Manager.java
@@@ -450,21 -451,10 +454,21 @@@ public class Manager extends Page 
  
              resp.getWriter().println("User has been verified " + verifications + " times." + info);
  
 +        } else if (req.getParameter("verifyexpire") != null) {
 +            String mail = req.getParameter("verifyEmail");
 +            User byEmail = User.getByEmail(mail);
 +            if (byEmail == null) {
 +                resp.getWriter().println("User not found.");
 +                return;
 +            } else {
 +                setVerificationDateToPast(byEmail.getPreferredName());
 +            }
 +
 +            resp.getWriter().println("Verification set to time past the limit.");
          } else if (req.getParameter("letverify") != null) {
              String mail = req.getParameter("letverifyEmail");
-             User byEmail = User.getByEmail(mail);
-             if (byEmail == null || !byEmail.canVerify()) {
+             User userByEmail = User.getByEmail(mail);
+             if (userByEmail == null || !userByEmail.canVerify()) {
                  resp.getWriter().println("User not found, or found user is not allowed to verify.");
              } else {
                  try {