X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Forga%2FViewOrgPage.java;h=16c8bc5388a7b90e4a815c853c54444b93bf136e;hb=464967d119cb27b72323ffaff17e2e63edbd0de5;hp=a26b71314284794483b5546098ad530c85d646e1;hpb=d4802b68c651a984f0b98a462ac1e7721aa50388;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/orga/ViewOrgPage.java b/src/org/cacert/gigi/pages/orga/ViewOrgPage.java
index a26b7131..16c8bc53 100644
--- a/src/org/cacert/gigi/pages/orga/ViewOrgPage.java
+++ b/src/org/cacert/gigi/pages/orga/ViewOrgPage.java
@@ -3,6 +3,7 @@ package org.cacert.gigi.pages.orga;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -12,9 +13,10 @@ 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.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.pages.LoginPage;
 import org.cacert.gigi.pages.Page;
 
 public class ViewOrgPage extends Page {
@@ -31,16 +33,21 @@ public class ViewOrgPage extends Page {
 
     @Override
     public boolean isPermitted(User u) {
-        return u != null && u.isInGroup(CreateOrgPage.ORG_ASSURER);
+        return u != null && (u.isInGroup(CreateOrgPage.ORG_ASSURER) || u.getOrganisations().size() != 0);
     }
 
     @Override
     public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
         try {
-            if (req.getParameter("affiliate") != null) {
+            User u = LoginPage.getUser(req);
+            if ( !u.isInGroup(CreateOrgPage.ORG_ASSURER)) {
+                return;
+            }
+            if (req.getParameter("do_affiliate") != null || req.getParameter("del") != null) {
                 AffiliationForm form = Form.getForm(req, AffiliationForm.class);
-                form.submit(resp.getWriter(), req);
-                resp.sendRedirect(DEFAULT_PATH + "/" + form.getOrganisation().getId());
+                if (form.submit(resp.getWriter(), req)) {
+                    resp.sendRedirect(DEFAULT_PATH + "/" + form.getOrganisation().getId());
+                }
             } else {
                 Form.getForm(req, CreateOrgForm.class).submit(resp.getWriter(), req);
             }
@@ -51,34 +58,29 @@ public class ViewOrgPage extends Page {
 
     @Override
     public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        User u = LoginPage.getUser(req);
         String idS = req.getPathInfo();
         Language lang = getLanguage(req);
         PrintWriter out = resp.getWriter();
         if (idS.length() < DEFAULT_PATH.length() + 2) {
             final Organisation[] orgas = Organisation.getOrganisations(0, 30);
             HashMap<String, Object> map = new HashMap<>();
-            map.put("orgas", new IterableDataset() {
-
-                int count = 0;
-
-                @Override
-                public boolean next(Language l, Map<String, Object> vars) {
-                    if (count >= orgas.length)
-                        return false;
-                    Organisation org = orgas[count++];
-                    vars.put("id", Integer.toString(org.getId()));
-                    vars.put("name", org.getName());
-                    vars.put("country", org.getState());
-                    return true;
-                }
-            });
+            final List<Organisation> myOrgs = u.getOrganisations();
+            final boolean orgAss = u.isInGroup(CreateOrgPage.ORG_ASSURER);
+            if (orgAss) {
+                map.put("orgas", makeOrgDataset(orgas));
+            } else {
+                map.put("orgas", makeOrgDataset(myOrgs.toArray(new Organisation[myOrgs.size()])));
+            }
             this.orgas.output(out, lang, map);
             return;
         }
         idS = idS.substring(DEFAULT_PATH.length() + 1);
         int id = Integer.parseInt(idS);
         Organisation o = Organisation.getById(id);
-        if (o == null) {
+        final List<Organisation> myOrgs = u.getOrganisations();
+        final boolean orgAss = u.isInGroup(CreateOrgPage.ORG_ASSURER);
+        if (o == null || ( !orgAss && !myOrgs.contains(o))) {
             resp.sendError(404);
             return;
         }
@@ -87,4 +89,23 @@ public class ViewOrgPage extends Page {
         vars.put("affForm", new AffiliationForm(req, o));
         mainTempl.output(out, lang, vars);
     }
+
+    private IterableDataset makeOrgDataset(final Organisation[] orgas) {
+        return new IterableDataset() {
+
+            int count = 0;
+
+            @Override
+            public boolean next(Language l, Map<String, Object> vars) {
+                if (count >= orgas.length) {
+                    return false;
+                }
+                Organisation org = orgas[count++];
+                vars.put("id", Integer.toString(org.getId()));
+                vars.put("name", org.getName());
+                vars.put("country", org.getState());
+                return true;
+            }
+        };
+    }
 }