bug 311 et 312 annuaire d'un groupe a visibilite tres reduite

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-672

diff --git a/htdocs.net/groupe/annuaire.php b/htdocs.net/groupe/annuaire.php
index 2a0a36f..8bb46d7 100644 (file)
--- a/htdocs.net/groupe/annuaire.php
+++ b/htdocs.net/groupe/annuaire.php
@@ -3,7 +3,11 @@ require 'xnet.inc.php';
 
 define('NB_PER_PAGE', 25);
 
-new_group_page('xnet/groupe/annuaire.tpl');
+if ($globals->asso('pub') == 'public')
+       new_group_page('xnet/groupe/annuaire.tpl');
+else
+       new_groupadmin_page('xnet/groupe/annuaire.tpl');
+
 $page->assign('admin', may_update());
 
 $tri = (Env::get('order') == 'alpha' ? 'promo, nom, prenom' : 'nom, prenom, promo');

diff --git a/htdocs.net/groupe/edit.php b/htdocs.net/groupe/edit.php
index 4e05332..ff8f515 100644 (file)
--- a/htdocs.net/groupe/edit.php
+++ b/htdocs.net/groupe/edit.php
@@ -7,21 +7,21 @@
         if (has_perms()) {
             $globals->xdb->execute(
                 "UPDATE  groupex.asso
-                    SET  nom={?}, diminutif={?}, cat={?}, dom={?}, descr={?}, site={?}, mail={?}, resp={?}, forum={?}, mail_domain={?}, ax={?}, sub_url={?}
+                    SET  nom={?}, diminutif={?}, cat={?}, dom={?}, descr={?}, site={?}, mail={?}, resp={?}, forum={?}, mail_domain={?}, ax={?}, pub={?}, sub_url={?}
                   WHERE  id={?}",
                   Post::get('nom'), Post::get('diminutif'), Post::get('cat'), Post::getInt('dom'),
                   Post::get('descr'), Post::get('site'), Post::get('mail'), Post::get('resp'),
-                  Post::get('forum'), Post::get('mail_domain'), Post::has('ax'), Post::get('sub_url'), $globals->asso('id'));
+                  Post::get('forum'), Post::get('mail_domain'), Post::has('ax'), Post::has('pub')?'private':'public', Post::get('sub_url'), $globals->asso('id'));
             if (Post::get('mail_domain')) {
                 $globals->xdb->execute('INSERT INTO virtual_domains (domain) VALUES({?})', Post::get('mail_domain'));
             }
         } else {
             $globals->xdb->execute(
                 "UPDATE  groupex.asso
-                    SET  descr={?}, site={?}, mail={?}, resp={?}, forum={?}, ax={?}, sub_url={?}
+                    SET  descr={?}, site={?}, mail={?}, resp={?}, forum={?}, ax={?}, pub= {?}, sub_url={?}
                   WHERE  id={?}",
                   Post::get('descr'), Post::get('site'), Post::get('mail'), Post::get('resp'),
-                  Post::get('forum'), Post::has('ax'), Post::get('sub_url'), $globals->asso('id'));
+                  Post::get('forum'), Post::has('ax'), Post::has('pub')?'private':'public', Post::get('sub_url'), $globals->asso('id'));
         }
 
         if ($_FILES['logo']['name']) {

diff --git a/include/xnet/page.inc.php b/include/xnet/page.inc.php
index a22ac51..3d1eccc 100644 (file)
--- a/include/xnet/page.inc.php
+++ b/include/xnet/page.inc.php
@@ -73,7 +73,8 @@ class XnetPage extends PlatalPage
             $sub = array();
             $dim = $globals->asso('diminutif');
             $sub['présentation'] = "$dim/asso.php";
-            $sub['annuaire du groupe'] = "$dim/annuaire.php";
+            if (may_update() || $globals->asso('pub') == 'public')
+                $sub['annuaire du groupe'] = "$dim/annuaire.php";
             if ($globals->asso('mail_domain')) {
                 $sub['listes de diffusion'] = "$dim/listes.php";
             }

diff --git a/templates/xnet/groupe/asso.tpl b/templates/xnet/groupe/asso.tpl
index 089b7bc..38bd2d7 100644 (file)
--- a/templates/xnet/groupe/asso.tpl
+++ b/templates/xnet/groupe/asso.tpl
@@ -65,7 +65,7 @@
   </tr>
   {/if}
 
-  {if !$is_member && $logged}
+  {if !$is_member && $logged && $asso.pub eq 'public'}
   <tr>
     <td class="titre">
       M'inscrire :

diff --git a/templates/xnet/groupe/edit.tpl b/templates/xnet/groupe/edit.tpl
index 622afa1..7d16926 100644 (file)
--- a/templates/xnet/groupe/edit.tpl
+++ b/templates/xnet/groupe/edit.tpl
@@ -142,6 +142,12 @@
         groupe agréé par l'AX
       </td>
     </tr>
+
+    <tr>
+      <td class="titre center" colspan="2">
+        <input type="checkbox" value="1" name="pub" {if $asso.pub eq 'private'}checked="checked"{/if} />
+        liste des membres privée
+      </td>
   </table>
 
   <div class="center">

diff --git a/upgrade/0.9.7/00_xnet.sql b/upgrade/0.9.7/00_xnet.sql
new file mode 100644 (file)
index 0000000..6aff287
--- /dev/null
+++ b/upgrade/0.9.7/00_xnet.sql
@@ -0,0 +1,2 @@
+ALTER TABLE groupex.asso ADD `pub` ENUM( 'public', 'private' ) DEFAULT 'public' NOT NULL AFTER `ax` ;
+