Backport

[platal.git] / modules / xnetgrp.php

diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php
index 2e1e563..a3b54f1 100644 (file)
--- a/modules/xnetgrp.php
+++ b/modules/xnetgrp.php
@@ -125,7 +125,7 @@ class XnetGrpModule extends PLModule
             header('Last-Modified:' . gmdate('D, d M Y H:i:s') . ' GMT');
             header('Cache-Control: no-cache, must-revalidate');
             header('Pragma: no-cache');
-            readfile(dirname(__FILE__).'/../htdocs.net/images/dflt_carre.jpg');
+            readfile(dirname(__FILE__).'/../htdocs/images/dflt_carre.jpg');
         }
 
         exit;
@@ -309,7 +309,7 @@ class XnetGrpModule extends PLModule
                            IF(m.origine='X',u.promo,'extérieur') AS promo,
                            IF(m.origine='X',u.promo,'') AS promo_o,
                            IF(m.origine='X',a.alias,m.email) AS email,
-                           IF(m.origine='X',FIND_IN_SET('femme', u.flags),0) AS femme,
+                           IF(m.origine='X',FIND_IN_SET('femme', u.flags), m.sexe) AS femme,
                            m.perms='admin' AS admin,
                            m.origine='X' AS x,
                            m.uid
@@ -317,6 +317,7 @@ class XnetGrpModule extends PLModule
                 LEFT JOIN  auth_user_md5   AS u ON ( u.user_id = m.uid )
                 LEFT JOIN  aliases         AS a ON ( a.id = m.uid AND a.type='a_vie' )
                     WHERE  m.asso_id = {?} $ini
+                           AND (m.origine = 'ext' OR u.perms != 'pending')
                  ORDER BY  $tri
                     LIMIT  {?},{?}", $globals->asso('id'), $ofs*NB_PER_PAGE, NB_PER_PAGE);
 
@@ -593,7 +594,6 @@ class XnetGrpModule extends PLModule
                             FROM  auth_user_md5 AS u
                       INNER JOIN  aliases       AS a ON (u.user_id = a.id)
                            WHERE  a.alias={?}', $globals->asso('id'), $forlife);
-                global $platal;
                 pl_redirect("member/$email");
             } else {
                 $page->trig($email." n'est pas un alias polytechnique.org valide");
@@ -605,7 +605,6 @@ class XnetGrpModule extends PLModule
                 XDB::execute('INSERT INTO  groupex.membres (uid,asso_id,origine,email)
                                         VALUES({?},{?},"ext",{?})', $uid,
                                         $globals->asso('id'), $email);
-                global $platal;
                 pl_redirect("member/$email");
             } else {
                 $page->trig("« <strong>$email</strong> » n'est pas une adresse mail valide");
@@ -684,13 +683,14 @@ class XnetGrpModule extends PLModule
         if (Post::has('change')) {
             if ($user['origine'] != 'X') {
                 XDB::query('UPDATE groupex.membres
-                                         SET prenom={?}, nom={?}, email={?}
-                                       WHERE uid={?} AND asso_id={?}',
-                                     Post::v('prenom'), Post::v('nom'),
-                                     Post::v('email'), $user['uid'],
-                                     $globals->asso('id'));
+                               SET prenom={?}, nom={?}, email={?}, sexe={?}
+                             WHERE uid={?} AND asso_id={?}',
+                           Post::v('prenom'), Post::v('nom'),
+                           Post::v('email'), Post::v('sexe'),
+                           $user['uid'], $globals->asso('id'));
                 $user['nom']    = Post::v('nom');
                 $user['prenom'] = Post::v('prenom');
+                $user['sexe']   = Post::v('sexe');
                 $user['email']  = Post::v('email');
                 $user['email2'] = Post::v('email');
             }
@@ -698,9 +698,9 @@ class XnetGrpModule extends PLModule
             $perms = Post::i('is_admin');
             if ($user['perms'] != $perms) {
                 XDB::query('UPDATE groupex.membres SET perms={?}
-                                      WHERE uid={?} AND asso_id={?}',
-                                      $perms ? 'admin' : 'membre',
-                                      $user['uid'], $globals->asso('id'));
+                             WHERE uid={?} AND asso_id={?}',
+                            $perms ? 'admin' : 'membre',
+                            $user['uid'], $globals->asso('id'));
                 $user['perms'] = $perms;
                 $page->trig('permissions modifiées');
             }