Fix FS#697 - Require user to be logged in in order to see non-public geography and...

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1887 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/include/userset.inc.php b/include/userset.inc.php
index bce96a4..895f489 100644 (file)
--- a/include/userset.inc.php
+++ b/include/userset.inc.php
@@ -180,7 +180,7 @@ class MinificheView extends MultipageView
 
     public function joins()
     {
-        return  "LEFT JOIN  entreprises    AS e   ON (e.entrid = 0 AND e.uid = u.user_id)
+        return  "LEFT JOIN  entreprises    AS e   ON (e.entrid = 0 AND e.uid = u.user_id".(S::logged() ? "" : " AND e.pub = 'public'").")
                  LEFT JOIN  emploi_secteur AS es  ON (e.secteur = es.id)
                  LEFT JOIN  fonctions_def  AS ef  ON (e.fonction = ef.id)
                  LEFT JOIN  geoloc_pays    AS n   ON (u.nationalite = n.a2)
@@ -189,7 +189,7 @@ class MinificheView extends MultipageView
                  LEFT JOIN  applis_ins     AS ai1 ON (u.user_id = ai1.uid AND ai1.ordre = 1)
                  LEFT JOIN  applis_def     AS ad1 ON (ad1.id = ai1.aid)
                  LEFT JOIN  adresses       AS adr ON (u.user_id = adr.uid
-                                                      AND FIND_IN_SET('active', adr.statut))
+                                                      AND FIND_IN_SET('active', adr.statut)".(S::logged() ? "" : " AND adr.pub = 'public'").")
                  LEFT JOIN  geoloc_pays    AS gp  ON (adr.country = gp.a2)
                  LEFT JOIN  geoloc_region  AS gr  ON (adr.country = gr.a2 AND adr.region = gr.region)
                  LEFT JOIN  emails         AS em  ON (em.uid = u.user_id AND em.flags = 'active')" .