Fix: Coverity CSS bug

[gigi.git] / src / org / cacert / gigi / pages / main / Signup.java

diff --git a/src/org/cacert/gigi/pages/main/Signup.java b/src/org/cacert/gigi/pages/main/Signup.java
index 07cd608400a2fb83c298ab2486cdbdfadc18be69..438c8fa906c07e965d9d515086868fbef754fa98 100644 (file)
--- a/src/org/cacert/gigi/pages/main/Signup.java
+++ b/src/org/cacert/gigi/pages/main/Signup.java
@@ -18,7 +18,7 @@ import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.email.EmailProvider;
 import org.cacert.gigi.localisation.Language;
 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.Page;
 import org.cacert.gigi.util.HTMLEncoder;
@@ -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");
@@ -141,7 +141,7 @@ public class Signup extends Form {
         r3.close();
         String mailResult = EmailProvider.FAIL;
         try {
-            mailResult = EmailProvider.getInstance().checkEmailServer(0, buildup.getEmail());
+            mailResult = HTMLEncoder.encodeHTML(EmailProvider.getInstance().checkEmailServer(0, buildup.getEmail()));
         } catch (IOException e) {
         }
         if ( !mailResult.equals(EmailProvider.OK)) {
@@ -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());