Merge remote-tracking branch 'origin/libs/scrypt/local'

[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 3aa413503f68571ee714844e04834611a800742a..cc20c4d7a900b9183856da9c2551b8d3c5d326cf 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/AssurePage.java
+++ b/src/org/cacert/gigi/pages/wot/AssurePage.java
@@ -2,23 +2,22 @@ package org.cacert.gigi.pages.wot;
 
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.HashMap;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.cacert.gigi.User;
+import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.database.DatabaseConnection;
+import org.cacert.gigi.database.GigiPreparedStatement;
+import org.cacert.gigi.database.GigiResultSet;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.output.DateSelector;
-import org.cacert.gigi.output.Form;
+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.Notary;
-import org.cacert.gigi.util.Notary.AssuranceResult;
 
 public class AssurePage extends Page {
 
@@ -46,20 +45,15 @@ public class AssurePage extends Page {
 
     @Override
     public boolean isPermitted(User u) {
-        try {
-            return u != null && u.canAssure();
-        } catch (SQLException e) {
-            e.printStackTrace();
-            return false;
-        }
+        return u != null && u.canAssure();
     }
 
     private void outputForm(HttpServletRequest req, PrintWriter out, AssuranceForm form) {
         User myself = LoginPage.getUser(req);
-        AssuranceResult check = Notary.checkAssuranceIsPossible(myself, form.getAssuree());
-        if (check != AssuranceResult.ASSURANCE_SUCCEDED) {
-            out.println(translate(req, check.getMessage()));
-            return;
+        try {
+            Notary.checkAssuranceIsPossible(myself, form.getAssuree());
+        } catch (GigiApiException e) {
+            e.format(out, Page.getLanguage(req));
         }
 
         form.output(out, getLanguage(req), new HashMap<String, Object>());
@@ -79,9 +73,9 @@ public class AssurePage extends Page {
             return;
         }
 
-        ResultSet rs = null;
+        GigiResultSet rs = null;
         try {
-            PreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT id, verified FROM users WHERE email=? AND dob=? AND deleted=0");
+            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);
@@ -98,7 +92,7 @@ public class AssurePage extends Page {
                     } else if (getUser(req).getId() == id) {
 
                     } else {
-                        AssuranceForm form = new AssuranceForm(req, id);
+                        AssuranceForm form = new AssuranceForm(req, User.getById(id));
                         outputForm(req, out, form);
                     }
                 }
@@ -110,15 +104,9 @@ public class AssurePage extends Page {
             }
 
             rs.close();
-        } catch (SQLException e) {
-            e.printStackTrace();
         } finally {
-            try {
-                if (rs != null) {
-                    rs.close();
-                }
-            } catch (SQLException e) {
-                e.printStackTrace();
+            if (rs != null) {
+                rs.close();
             }
         }
     }