X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Fwot%2FAssurePage.java;h=508a9c62413b5b5f0807d7ee300abe94e87737be;hb=557a8a2e5f395400467459f003956bf7660cc044;hp=4603e8436263e12634f697dbeed91acda975d834;hpb=25f59f370978c0e9789821a15d89a83d5d702622;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/wot/AssurePage.java b/src/org/cacert/gigi/pages/wot/AssurePage.java
index 4603e843..508a9c62 100644
--- a/src/org/cacert/gigi/pages/wot/AssurePage.java
+++ b/src/org/cacert/gigi/pages/wot/AssurePage.java
@@ -14,10 +14,8 @@ import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.output.DateSelector;
 import org.cacert.gigi.output.template.Form;
 import org.cacert.gigi.output.template.Template;
-import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.util.AuthorizationContext;
-import org.cacert.gigi.util.Notary;
 
 public class AssurePage extends Page {
 
@@ -25,11 +23,10 @@ public class AssurePage extends Page {
 
     DateSelector ds = new DateSelector("day", "month", "year");
 
-    private final Template t;
+    private static final Template t = new Template(AssuranceForm.class.getResource("AssureeSearch.templ"));
 
     public AssurePage() {
-        super("Assure someone");
-        t = new Template(AssuranceForm.class.getResource("AssureeSearch.templ"));
+        super("Verify someone");
 
     }
 
@@ -54,17 +51,12 @@ public class AssurePage extends Page {
             AssuranceForm form = Form.getForm(req, AssuranceForm.class);
             try {
                 if (form.submit(out, req)) {
-                    out.println(translate(req, "Assurance complete."));
+                    out.println(translate(req, "Verification complete."));
                     return;
                 }
             } catch (GigiApiException e) {
                 e.format(out, Page.getLanguage(req));
-                try {
-                    Notary.checkAssuranceIsPossible(LoginPage.getUser(req), form.getAssuree());
-                    form.output(out, getLanguage(req), new HashMap<String, Object>());
-                } catch (GigiApiException e1) {
-                    e1.format(out, Page.getLanguage(req));
-                }
+                form.output(out, getLanguage(req), new HashMap<String, Object>());
             }
 
             return;
@@ -89,9 +81,7 @@ public class AssurePage extends Page {
 
                     } else {
                         User assuree = User.getById(id);
-                        User myself = LoginPage.getUser(req);
                         try {
-                            Notary.checkAssuranceIsPossible(myself, assuree);
                             new AssuranceForm(req, assuree).output(out, getLanguage(req), new HashMap<String, Object>());
                         } catch (GigiApiException e) {
                             e.format(out, Page.getLanguage(req));