UPD: Details display assured

diff --git a/src/org/cacert/gigi/User.java b/src/org/cacert/gigi/User.java
index 764873812d29b4ae3c7e89e4d3a44af67fa3a5fd..842f2f20e11a071d2943aed124772d8119a95547 100644 (file)
--- a/src/org/cacert/gigi/User.java
+++ b/src/org/cacert/gigi/User.java
@@ -443,7 +443,6 @@ public class User {
     public void updateUserData() throws SQLException, GigiApiException {
         synchronized (Notary.class) {
             if (getAssurancePoints() != 0) {
-                updateUserData();
                 throw new GigiApiException("No change after assurance allowed.");
             }
             PreparedStatement update = DatabaseConnection.getInstance().prepare("UPDATE users SET fname=?, lname=?, mname=?, suffix=?, dob=? WHERE id=?");

diff --git a/src/org/cacert/gigi/output/DateSelector.java b/src/org/cacert/gigi/output/DateSelector.java
index e4e66f6f4c4f92e316f2cf186f486e1830f45dff..f98ec8fa6993e9e349848c8f40e02f13a827adb6 100644 (file)
--- a/src/org/cacert/gigi/output/DateSelector.java
+++ b/src/org/cacert/gigi/output/DateSelector.java
@@ -11,6 +11,7 @@ import java.util.TimeZone;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.localisation.Language;
 
 public class DateSelector implements Outputable {
@@ -88,30 +89,25 @@ public class DateSelector implements Outputable {
         out.print("\" size=\"4\" autocomplete=\"off\">");
     }
 
-    public void update(HttpServletRequest r) {
-        String dayS = r.getParameter(names[0]);
-        if (dayS != null) {
-            day = parseIntSafe(dayS);
-        }
-
-        String monthS = r.getParameter(names[1]);
-        if (monthS != null) {
-            month = parseIntSafe(monthS);
-        }
+    public void update(HttpServletRequest r) throws GigiApiException {
+        try {
+            String dayS = r.getParameter(names[0]);
+            if (dayS != null) {
+                day = Integer.parseInt(dayS);
+            }
 
-        String yearS = r.getParameter(names[2]);
-        if (yearS != null) {
-            year = parseIntSafe(yearS);
-        }
-    }
+            String monthS = r.getParameter(names[1]);
+            if (monthS != null) {
+                month = Integer.parseInt(monthS);
+            }
 
-    private int parseIntSafe(String dayS) {
-        try {
-            return Integer.parseInt(dayS);
+            String yearS = r.getParameter(names[2]);
+            if (yearS != null) {
+                year = Integer.parseInt(yearS);
+            }
         } catch (NumberFormatException e) {
-
+            throw new GigiApiException("Unparsable date.");
         }
-        return 0;
     }
 
     public boolean isValid() {

diff --git a/src/org/cacert/gigi/pages/account/MyDetailsForm.java b/src/org/cacert/gigi/pages/account/MyDetailsForm.java
index 32e275fb47b668f9681111fd368a5f7a0a2f4545..4faa66276d98d44971ce1f1ba93793062fb8cea0 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MyDetailsForm.java
+++ b/src/org/cacert/gigi/pages/account/MyDetailsForm.java
@@ -2,17 +2,14 @@ package org.cacert.gigi.pages.account;
 
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
-import java.sql.Date;
 import java.sql.SQLException;
-import java.util.Calendar;
 import java.util.Map;
-import java.util.TimeZone;
-
 import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.User;
 import org.cacert.gigi.localisation.Language;
+import org.cacert.gigi.output.CertificateValiditySelector;
 import org.cacert.gigi.output.DateSelector;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.Template;
@@ -21,6 +18,8 @@ import org.cacert.gigi.util.HTMLEncoder;
 
 public class MyDetailsForm extends Form {
 
+    private static Template assured = new Template(MyDetails.class.getResource("MyDetailsFormAssured.templ"));
+
     private static Template templ;
     static {
         templ = new Template(new InputStreamReader(MyDetailsForm.class.getResourceAsStream("MyDetailsForm.templ")));
@@ -28,9 +27,12 @@ public class MyDetailsForm extends Form {
 
     private User target;
 
+    private DateSelector ds;
+
     public MyDetailsForm(HttpServletRequest hsr, User target) {
         super(hsr);
         this.target = target;
+        this.ds = new DateSelector("day", "month", "year", target.getDob());
     }
 
     @Override
@@ -48,14 +50,8 @@ public class MyDetailsForm extends Form {
                 target.setLname(newLname);
                 target.setMname(newMname);
                 target.setSuffix(newSuffix);
-                int newYear = Integer.parseInt(req.getParameter("year"));
-                int newMonth = Integer.parseInt(req.getParameter("month"));
-                int newDay = Integer.parseInt(req.getParameter("day"));
-                Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
-                cal.set(Calendar.YEAR, newYear);
-                cal.set(Calendar.MONTH, newMonth);
-                cal.set(Calendar.DAY_OF_MONTH, newDay);
-                target.setDob(new Date(cal.getTimeInMillis()));
+                ds.update(req);
+                target.setDob(ds.getDate());
                 target.updateUserData();
             } else {
                 throw new GigiApiException("No change after assurance allowed.");
@@ -79,10 +75,18 @@ public class MyDetailsForm extends Form {
         vars.put("mname", target.getMname() == null ? "" : HTMLEncoder.encodeHTML(target.getMname()));
         vars.put("lname", HTMLEncoder.encodeHTML(target.getLname()));
         vars.put("suffix", target.getSuffix() == null ? "" : HTMLEncoder.encodeHTML(target.getSuffix()));
-        DateSelector ds = new DateSelector("day", "month", "year", target.getDob());
-        vars.put("DoB", ds);
         vars.put("details", "");
-        templ.output(out, l, vars);
+        try {
+            if (target.getAssurancePoints() == 0) {
+                vars.put("DoB", ds);
+                templ.output(out, l, vars);
+            } else {
+                vars.put("DoB", CertificateValiditySelector.getDateFormat().format(target.getDob()));
+                assured.output(out, l, vars);
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
     }
 
 }

diff --git a/src/org/cacert/gigi/pages/account/MyDetailsFormAssured.templ b/src/org/cacert/gigi/pages/account/MyDetailsFormAssured.templ
new file mode 100644 (file)
index 0000000..898f6f3
--- /dev/null
+++ b/src/org/cacert/gigi/pages/account/MyDetailsFormAssured.templ
@@ -0,0 +1,42 @@
+<table class="wrapper dataTable" width="400">
+<thead>
+  <tr>
+    <th colspan="2"><?=_My Details?></th>
+  </tr>
+  </thead>
+  <tbody>
+  <tr>
+    <td width="125"><?=_First Name?>: </td>
+    <td width="125"><?=$fname?></td>
+  </tr>
+  <tr>
+    <td valign="top"><?=_Middle Name(s)?><br>
+      (<?=_optional?>)
+    </td>
+    <td><?=$mname?></td>
+  </tr>
+  <tr>
+    <td><?=_Last Name?>: </td>
+    <td><?=$lname?></td>
+  </tr>
+  <tr>
+    <td><?=_Suffix?><br>
+      (<?=_optional?>)</td>
+    <td><?=$suffix?></td>
+  </tr>
+  <tr>
+    <td><?=_Date of Birth?><br>
+           (<?=_dd/mm/yyyy?>)</td>
+    <td><?=$DoB?></td>
+  </tr>
+  <tr>
+    <td colspan="2" class="title"><?=_Show account history?></td>
+  </tr>
+  <tr>
+    <td colspan="2" class="title"><?=_View secret question & answers and OTP phrases?></td>
+  </tr>
+  <?=$details?>
+  <tr><td colspan="2"><input type="submit" name="processDetails" value="<?=_Update?>"></td>
+  </tr>
+  </tbody>
+</table>

diff --git a/src/org/cacert/gigi/pages/main/Signup.java b/src/org/cacert/gigi/pages/main/Signup.java
index 35b8344b797485ced366b6d74cef3cdd4f07562e..4fca9450613f3cebe1deed54237e11292d14752c 100644 (file)
--- a/src/org/cacert/gigi/pages/main/Signup.java
+++ b/src/org/cacert/gigi/pages/main/Signup.java
@@ -14,6 +14,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.EmailAddress;
+import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.User;
 import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.email.EmailProvider;
@@ -85,7 +86,10 @@ public class Signup extends Form {
         country = "1".equals(r.getParameter("country"));
         regional = "1".equals(r.getParameter("regional"));
         radius = "1".equals(r.getParameter("radius"));
-        myDoB.update(r);
+        try {
+            myDoB.update(r);
+        } catch (GigiApiException e) {
+        }
     }
 
     @Override

diff --git a/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java b/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java
index 458d982bd0d306b4b70f1b9d317230a51848a022..7aa33290ff1d60918fb0baae3944f41cdc8a927b 100644 (file)
--- a/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java
+++ b/tests/org/cacert/gigi/pages/account/TestMyDetailsEdit.java
@@ -112,11 +112,11 @@ public class TestMyDetailsEdit extends ManagedTest {
         String email = createUniqueName() + "@e.de";
         int id = createVerifiedUser("Kurti", "Hansel", email, TEST_PASSWORD);
         String cookie = login(email, TEST_PASSWORD);
-        assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "lname=Hansel&fname=Kurti&mname=&suffix=&day=1&month=1&year=2000&processDetails", 0));
+        assertNull(executeBasicWebInteraction(cookie, MyDetails.PATH, "lname=Hansel&fname=Kurti&mname=&suffix=&day=1&month=2&year=2000&processDetails", 0));
         User u = User.getById(id);
         Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
         cal.set(Calendar.YEAR, 2000);
-        cal.set(Calendar.DAY_OF_MONTH, 1);
+        cal.set(Calendar.DAY_OF_MONTH, Calendar.FEBRUARY);
         cal.set(Calendar.MONTH, 1);
         Date d = new Date(cal.getTimeInMillis());
         assertEquals(d.toString(), u.getDob().toString());