X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Forga%2FCreateOrgForm.java;h=57f39d62c6a1e60e7dd7b9351f537ecea8d7809c;hb=cee46f66ee6e45667adf46a9a8b5df040bc61e21;hp=32a9ceb7033ebba4a602f729372714ab8c13d813;hpb=ec24cf6925bb3729a644580ad4a9375d05883c62;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/orga/CreateOrgForm.java b/src/org/cacert/gigi/pages/orga/CreateOrgForm.java
index 32a9ceb7..57f39d62 100644
--- a/src/org/cacert/gigi/pages/orga/CreateOrgForm.java
+++ b/src/org/cacert/gigi/pages/orga/CreateOrgForm.java
@@ -7,8 +7,10 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.Organisation;
+import org.cacert.gigi.email.EmailProvider;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.template.Form;
+import org.cacert.gigi.output.template.SprintfCommand;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;
 
@@ -28,6 +30,10 @@ public class CreateOrgForm extends Form {
 
     private String email = "";
 
+    private String optionalName = "";
+
+    private String postalAddress = "";
+
     private boolean isEdit = false;
 
     public CreateOrgForm(HttpServletRequest hsr) {
@@ -43,22 +49,73 @@ public class CreateOrgForm extends Form {
         st = t.getProvince();
         l = t.getCity();
         email = t.getContactEmail();
+        optionalName = t.getOptionalName();
+        postalAddress = t.getPostalAddress();
     }
 
     @Override
     public boolean submit(PrintWriter out, HttpServletRequest req) throws GigiApiException {
-        o = req.getParameter("O");
-        c = req.getParameter("C");
-        st = req.getParameter("ST");
-        l = req.getParameter("L");
-        email = req.getParameter("contact");
-        if (result != null) {
-            result.update(o, c, st, l, email);
+        String action = req.getParameter("action");
+        if (action == null) {
+            return false;
+        }
+
+        if (action.equals("new")) {
+            checkCertData(req);
+            checkOrganisationData(req);
+            Organisation ne = new Organisation(o, c, st, l, email, optionalName, postalAddress, LoginPage.getUser(req));
+            result = ne;
+            return true;
+        } else if (action.equals("updateOrganisationData")) {
+            checkOrganisationData(req);
+            result.updateOrgData(email, optionalName, postalAddress);
+            return true;
+        } else if (action.equals("updateCertificateData")) {
+            checkCertData(req);
+            result.updateCertData(o, c, st, l);
             return true;
         }
-        Organisation ne = new Organisation(o, c, st, l, email, LoginPage.getUser(req));
-        result = ne;
-        return true;
+
+        return false;
+    }
+
+    private void checkOrganisationData(HttpServletRequest req) throws GigiApiException {
+        email = extractParam(req, "contact");
+        optionalName = extractParam(req, "optionalName");
+        postalAddress = extractParam(req, "postalAddress");
+        if ( !EmailProvider.MAIL.matcher(email).matches()) {
+            throw new GigiApiException("Contact email is not a valid email address");
+        }
+    }
+
+    private void checkCertData(HttpServletRequest req) throws GigiApiException {
+        o = extractParam(req, "O");
+        c = extractParam(req, "C");
+        st = extractParam(req, "ST");
+        l = extractParam(req, "L");
+
+        if (o.length() > 64 || o.length() < 1) {
+            throw new GigiApiException(SprintfCommand.createSimple("{0} not given or longer than {1} characters", "Organisation name", 64));
+        }
+        if (c.length() != 2) {
+            throw new GigiApiException(SprintfCommand.createSimple("{0} not given or not exactly {1} characters long", "Country code", 2));
+        }
+
+        if (st.length() > 128 || st.length() < 1) {
+            throw new GigiApiException(SprintfCommand.createSimple("{0} not given or longer than {1} characters", "State/county", 128));
+        }
+
+        if (l.length() > 128 || l.length() < 1) {
+            throw new GigiApiException(SprintfCommand.createSimple("{0} not given or longer than {1} characters", "Town/suburb", 128));
+        }
+    }
+
+    private String extractParam(HttpServletRequest req, String name) {
+        String parameter = req.getParameter(name);
+        if (parameter == null) {
+            return "";
+        }
+        return parameter.trim();
     }
 
     public Organisation getResult() {
@@ -72,6 +129,8 @@ public class CreateOrgForm extends Form {
         vars.put("ST", st);
         vars.put("L", this.l);
         vars.put("email", email);
+        vars.put("optionalName", optionalName);
+        vars.put("postalAddress", postalAddress);
         if (isEdit) {
             vars.put("edit", true);
         }