X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Fmain%2FSignup.java;h=94c686d983e85c1df24292ca4faf9daffa07a70a;hb=5ddf1c2f80e539d2f52a8685bce9c923796dda10;hp=24562ac89da7d276368c712191aa2f4967649bb7;hpb=123b7724f9b8ab944a7aa6ab2df9499f34b02a4b;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/main/Signup.java b/src/org/cacert/gigi/pages/main/Signup.java
index 24562ac8..94c686d9 100644
--- a/src/org/cacert/gigi/pages/main/Signup.java
+++ b/src/org/cacert/gigi/pages/main/Signup.java
@@ -93,8 +93,8 @@ public class Signup extends Form {
     @Override
     public synchronized boolean submit(PrintWriter out, HttpServletRequest req) {
         update(req);
-        if (buildup.getFname().equals("") || buildup.getLname().equals("")) {
-            outputError(out, req, "First and/or last names were blank.");
+        if (buildup.getLname().trim().equals("")) {
+            outputError(out, req, "Last name were blank.");
         }
         if ( !myDoB.isValid()) {
             outputError(out, req, "Invalid date of birth");
@@ -119,8 +119,8 @@ public class Signup extends Form {
         if (isFailed(out)) {
             return false;
         }
-        GigiPreparedStatement q1 = DatabaseConnection.getInstance().prepare("select * from `emails` where `email`=? and `deleted`=0");
-        GigiPreparedStatement q2 = DatabaseConnection.getInstance().prepare("select * from certOwners inner join users on users.id=certOwners.id where `email`=? and `deleted`=0");
+        GigiPreparedStatement q1 = DatabaseConnection.getInstance().prepare("select * from `emails` where `email`=? and `deleted` IS NULL");
+        GigiPreparedStatement q2 = DatabaseConnection.getInstance().prepare("select * from certOwners inner join users on users.id=certOwners.id where `email`=? and `deleted` IS NULL");
         q1.setString(1, buildup.getEmail());
         q2.setString(1, buildup.getEmail());
         GigiResultSet r1 = q1.executeQuery();
@@ -164,11 +164,14 @@ public class Signup extends Form {
             run(req, pw1);
         } catch (SQLException e) {
             e.printStackTrace();
+        } catch (GigiApiException e) {
+            outputError(out, req, e.getMessage());
+            return false;
         }
         return true;
     }
 
-    private void run(HttpServletRequest req, String password) throws SQLException {
+    private void run(HttpServletRequest req, String password) throws SQLException, GigiApiException {
         try {
             DatabaseConnection.getInstance().beginTransaction();
             buildup.setPreferredLocale(Page.getLanguage(req).getLocale());