UPD: Stricter name part handling

[gigi.git] / util-testing / org / cacert / gigi / pages / Manager.java

diff --git a/util-testing/org/cacert/gigi/pages/Manager.java b/util-testing/org/cacert/gigi/pages/Manager.java
index 486ba2c57614de75ad30b4f8511bf6bc2fc78fe3..e76b7c0ac6855b83ce74e67f72ea6598a5d98a33 100644 (file)
--- a/util-testing/org/cacert/gigi/pages/Manager.java
+++ b/util-testing/org/cacert/gigi/pages/Manager.java
@@ -21,10 +21,11 @@ import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.database.GigiPreparedStatement;
 import org.cacert.gigi.dbObjects.EmailAddress;
 import org.cacert.gigi.dbObjects.Group;
+import org.cacert.gigi.dbObjects.Name;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.email.EmailProvider;
 import org.cacert.gigi.localisation.Language;
-import org.cacert.gigi.output.Form;
+import org.cacert.gigi.output.template.Form;
 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.util.Notary;
@@ -155,14 +156,11 @@ public class Manager extends Page {
 
     private void createUser(String email) throws GigiApiException, IllegalAccessException {
         User u = new User();
-        u.setFname("Först");
-        u.setMname("Müddle");
-        u.setLname("Läst");
-        u.setSuffix("Süffix");
+        u.setName(new Name("Först", "Läst", "Müddle", "Süffix"));
         u.setEmail(email);
         Calendar gc = GregorianCalendar.getInstance();
         gc.set(1990, 0, 1);
-        u.setDob(new Date(gc.getTime().getTime()));
+        u.setDoB(new Date(gc.getTime().getTime()));
         u.setPreferredLocale(Locale.ENGLISH);
         u.insert("xvXV12°§");
         EmailAddress ea = new EmailAddress(u, email);
@@ -178,6 +176,7 @@ public class Manager extends Page {
     public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
         if (req.getParameter("create") != null) {
             batchCreateUsers(req.getParameter("prefix"), req.getParameter("suffix"), Integer.parseInt(req.getParameter("amount")), resp.getWriter());
+            resp.getWriter().println("User batch created.");
         } else if (req.getParameter("addpriv") != null || req.getParameter("delpriv") != null) {
             User u = User.getByEmail(req.getParameter("email"));
             if (u == null) {
@@ -186,10 +185,11 @@ public class Manager extends Page {
             }
             if (req.getParameter("addpriv") != null) {
                 u.grantGroup(u, Group.getByString(req.getParameter("priv")));
+                resp.getWriter().println("Privilege granted");
             } else {
                 u.revokeGroup(u, Group.getByString(req.getParameter("priv")));
+                resp.getWriter().println("Privilege revoked");
             }
-
         } else if (req.getParameter("fetch") != null) {
             String mail = req.getParameter("femail");
             fetchMails(req, resp, mail);
@@ -201,6 +201,7 @@ public class Manager extends Page {
                 return;
             }
             passCATS(byEmail);
+            resp.getWriter().println("User has been passed CATS");
         } else if (req.getParameter("assure") != null) {
             String mail = req.getParameter("assureEmail");
             User byEmail = User.getByEmail(mail);
@@ -210,11 +211,12 @@ public class Manager extends Page {
             }
             try {
                 for (int i = 0; i < getAssurers().length; i++) {
-                    Notary.assure(getAssurers()[i], byEmail, byEmail.getName(), byEmail.getDob(), 10, "Testmanager Assure up code", "2014-11-06");
+                    Notary.assure(getAssurers()[i], byEmail, byEmail.getName(), byEmail.getDoB(), 10, "Testmanager Assure up code", "2014-11-06");
                 }
             } catch (GigiApiException e) {
                 throw new Error(e);
             }
+            resp.getWriter().println("User has been assured.");
         }
     }
 
@@ -229,8 +231,9 @@ public class Manager extends Page {
 
                 @Override
                 public boolean next(Language l, Map<String, Object> vars) {
-                    if ( !s.hasNext())
+                    if ( !s.hasNext()) {
                         return false;
+                    }
                     vars.put("body", s.next().replaceAll("(https?://\\S+)", "<a href=\"$1\">$1</a>"));
                     return true;
                 }