Clean: use "authorizationContexts"

[gigi.git] / src / org / cacert / gigi / pages / wot / AssurePage.java

diff --git a/src/org/cacert/gigi/pages/wot/AssurePage.java b/src/org/cacert/gigi/pages/wot/AssurePage.java
index cc20c4d7a900b9183856da9c2551b8d3c5d326cf..af00c0e8b7acb0319d4f2be12b8eaf68fba09be2 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/AssurePage.java
+++ b/src/org/cacert/gigi/pages/wot/AssurePage.java
@@ -2,6 +2,8 @@ package org.cacert.gigi.pages.wot;
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.sql.Date;
+import java.util.Calendar;
 import java.util.HashMap;
 
 import javax.servlet.http.HttpServletRequest;
@@ -17,6 +19,7 @@ import org.cacert.gigi.output.template.Form;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.pages.Page;
+import org.cacert.gigi.util.AuthorizationContext;
 import org.cacert.gigi.util.Notary;
 
 public class AssurePage extends Page {
@@ -44,8 +47,8 @@ public class AssurePage extends Page {
     }
 
     @Override
-    public boolean isPermitted(User u) {
-        return u != null && u.canAssure();
+    public boolean isPermitted(AuthorizationContext ac) {
+        return ac != null && ac.getActor().canAssure();
     }
 
     private void outputForm(HttpServletRequest req, PrintWriter out, AssuranceForm form) {
@@ -75,19 +78,20 @@ public class AssurePage extends Page {
 
         GigiResultSet rs = null;
         try {
-            GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT users.id, verified FROM users inner join certOwners on certOwners.id=users.id WHERE email=? AND dob=? AND deleted is null");
+            GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT `users`.`id`, `verified` FROM `users` INNER JOIN `certOwners` ON `certOwners`.`id`=`users`.`id` WHERE `email`=? AND `dob`=? AND `deleted` IS NULL");
             ps.setString(1, req.getParameter("email"));
-            String day = req.getParameter("year") + "-" + req.getParameter("month") + "-" + req.getParameter("day");
-            ps.setString(2, day);
+            Calendar c = Calendar.getInstance();
+            c.set(Integer.parseInt(req.getParameter("year")), Integer.parseInt(req.getParameter("month")) - 1, Integer.parseInt(req.getParameter("day")));
+            ps.setDate(2, new Date(c.getTimeInMillis()));
             rs = ps.executeQuery();
             int id = 0;
             if (rs.next()) {
                 id = rs.getInt(1);
-                int verified = rs.getInt(2);
+                boolean verified = rs.getBoolean(2);
                 if (rs.next()) {
                     out.println("Error, ambigous user. Please contact support@cacert.org.");
                 } else {
-                    if (verified == 0) {
+                    if ( !verified) {
                         out.println(translate(req, "User is not yet verified. Please try again in 24 hours!"));
                     } else if (getUser(req).getId() == id) {