X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Forga%2FViewOrgPage.java;h=887761076759dd37df1fd5170f2cfa481172f7d8;hb=bdb770e853028d8510a941c936a290ab69cf675c;hp=9e470240d95124bab73db23e98d5fc558ec67553;hpb=33a87a70ba2320451c3b3b1faa9b487dbcbd3540;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/orga/ViewOrgPage.java b/src/org/cacert/gigi/pages/orga/ViewOrgPage.java
index 9e470240..88776107 100644
--- a/src/org/cacert/gigi/pages/orga/ViewOrgPage.java
+++ b/src/org/cacert/gigi/pages/orga/ViewOrgPage.java
@@ -9,22 +9,23 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.Organisation;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.template.Form;
+import org.cacert.gigi.output.template.Form.CSRFException;
 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;
-import org.cacert.gigi.pages.Page;
+import org.cacert.gigi.pages.ManagedMultiFormPage;
+import org.cacert.gigi.pages.account.domain.DomainManagementForm;
 import org.cacert.gigi.util.AuthorizationContext;
 
-public class ViewOrgPage extends Page {
+public class ViewOrgPage extends ManagedMultiFormPage {
 
-    private final Template orgas = new Template(ViewOrgPage.class.getResource("ViewOrgs.templ"));
+    private static final Template orgas = new Template(ViewOrgPage.class.getResource("ViewOrgs.templ"));
 
-    private final Template mainTempl = new Template(ViewOrgPage.class.getResource("EditOrg.templ"));
+    private static final Template mainTempl = new Template(ViewOrgPage.class.getResource("EditOrg.templ"));
 
     public static final String DEFAULT_PATH = "/orga";
 
@@ -34,34 +35,25 @@ public class ViewOrgPage extends Page {
 
     @Override
     public boolean isPermitted(AuthorizationContext ac) {
-        return ac != null && (ac.isInGroup(CreateOrgPage.ORG_ASSURER) || ac.getActor().getOrganisations().size() != 0);
+        return ac != null && (ac.isInGroup(CreateOrgPage.ORG_ASSURER) || ac.getActor().getOrganisations(true).size() != 0);
     }
 
     @Override
-    public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-        try {
-            User u = LoginPage.getUser(req);
-            if (req.getParameter("do_affiliate") != null || req.getParameter("del") != null) {
-                AffiliationForm form = Form.getForm(req, AffiliationForm.class);
-                if (form.submit(resp.getWriter(), req)) {
-                    resp.sendRedirect(DEFAULT_PATH + "/" + form.getOrganisation().getId());
-                }
-                return;
-            } else if (req.getParameter("addDomain") != null) {
-                if (Form.getForm(req, OrgDomainAddForm.class).submit(resp.getWriter(), req)) {
-                    // resp.sendRedirect(DEFAULT_PATH + "/" +
-                    // form.getOrganisation().getId());
-                }
-            } else {
-                if ( !u.isInGroup(CreateOrgPage.ORG_ASSURER)) {
-                    resp.sendError(403, "Access denied");
-                    return;
-                }
-                Form.getForm(req, CreateOrgForm.class).submit(resp.getWriter(), req);
+    public Form getForm(HttpServletRequest req) throws CSRFException {
+        if (req.getParameter("do_affiliate") != null || req.getParameter("del") != null) {
+            return Form.getForm(req, AffiliationForm.class);
+        } else {
+            if ( !getUser(req).isInGroup(CreateOrgPage.ORG_ASSURER)) {
+                return null;
             }
 
-        } catch (GigiApiException e) {
-            e.format(resp.getWriter(), getLanguage(req));
+            if (req.getParameter("addDomain") != null) {
+                return Form.getForm(req, OrgDomainAddForm.class);
+            } else if (req.getParameter("delete") != null) {
+                return Form.getForm(req, DomainManagementForm.class);
+            } else {
+                return Form.getForm(req, CreateOrgForm.class);
+            }
         }
     }
 
@@ -72,31 +64,43 @@ public class ViewOrgPage extends Page {
         Language lang = getLanguage(req);
         PrintWriter out = resp.getWriter();
         if (idS.length() < DEFAULT_PATH.length() + 2) {
-            final Organisation[] orgas = Organisation.getOrganisations(0, 30);
+            final Organisation[] orgList = Organisation.getOrganisations(0, 30);
             HashMap<String, Object> map = new HashMap<>();
-            final List<Organisation> myOrgs = u.getOrganisations();
+            final List<Organisation> myOrgs = u.getOrganisations(true);
             final boolean orgAss = u.isInGroup(CreateOrgPage.ORG_ASSURER);
             if (orgAss) {
-                map.put("orgas", makeOrgDataset(orgas));
+                map.put("orgas", makeOrgDataset(orgList));
             } else {
                 map.put("orgas", makeOrgDataset(myOrgs.toArray(new Organisation[myOrgs.size()])));
             }
-            this.orgas.output(out, lang, map);
+            orgas.output(out, lang, map);
             return;
         }
         idS = idS.substring(DEFAULT_PATH.length() + 1);
         int id = Integer.parseInt(idS);
-        Organisation o = Organisation.getById(id);
+        Organisation o;
+        try {
+            o = Organisation.getById(id);
+        } catch (IllegalArgumentException e) {
+            resp.sendError(404);
+            return;
+        }
         final List<Organisation> myOrgs = u.getOrganisations();
         final boolean orgAss = u.isInGroup(CreateOrgPage.ORG_ASSURER);
-        if (o == null || ( !orgAss && !myOrgs.contains(o))) {
+        if ( !orgAss && !myOrgs.contains(o)) {
             resp.sendError(404);
             return;
         }
         HashMap<String, Object> vars = new HashMap<>();
-        vars.put("editForm", new CreateOrgForm(req, o));
-        vars.put("affForm", new AffiliationForm(req, o));
-        vars.put("addDom", new OrgDomainAddForm(req, o));
+        if (orgAss) {
+            vars.put("editForm", new CreateOrgForm(req, o));
+            vars.put("affForm", new AffiliationForm(req, o));
+            vars.put("mgmDom", new DomainManagementForm(req, o, true));
+            vars.put("addDom", new OrgDomainAddForm(req, o));
+        } else {
+            vars.put("affForm", new AffiliationForm(req, o));
+            vars.put("orgName", o.getName());
+        }
         mainTempl.output(out, lang, vars);
     }
 
@@ -113,7 +117,7 @@ public class ViewOrgPage extends Page {
                 Organisation org = orgas[count++];
                 vars.put("id", Integer.toString(org.getId()));
                 vars.put("name", org.getName());
-                vars.put("country", org.getState());
+                vars.put("country", org.getState().getCode());
                 return true;
             }
         };