X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetlists.php;h=299d4cd50ecb70839e914c7ef2072fbd7b696463;hb=1d10d3fd659fa8eb7c663d6bb599bc8bbc0feeb3;hp=23b114ff22f0113f177052a4adaa062a852ac7df;hpb=9bb8bf21cfc5b5f47805cd54d64cfeae75ce1de3;p=platal.git

diff --git a/modules/xnetlists.php b/modules/xnetlists.php
index 23b114f..299d4cd 100644
--- a/modules/xnetlists.php
+++ b/modules/xnetlists.php
@@ -60,7 +60,6 @@ class XnetListsModule extends ListsModule
         $this->client = new MMList(S::v('uid'), S::v('password'),
                                    $globals->asso('mail_domain'));
 
-        $page->useMenu();
         $page->assign('asso', $globals->asso());
         $page->setType($globals->asso('cat'));
 
@@ -71,6 +70,9 @@ class XnetListsModule extends ListsModule
     {
         global $globals;
 
+        if (!$globals->asso('mail_domain')) {
+            return PL_NOT_FOUND;
+        }
         $this->prepare_client($page);
 
         $page->changeTpl('xnetlists/index.tpl');
@@ -114,6 +116,9 @@ class XnetListsModule extends ListsModule
     {
         global $globals;
 
+        if (!$globals->asso('mail_domain')) {
+            return PL_NOT_FOUND;
+        }
         $this->prepare_client($page);
 
         $page->changeTpl('xnetlists/create.tpl');
@@ -164,22 +169,22 @@ class XnetListsModule extends ListsModule
         XDB::execute('INSERT INTO x4dat.virtual (alias,type)
                                 VALUES({?},{?})', $liste.'@'.$dom, 'list');
         XDB::execute('INSERT INTO x4dat.virtual_redirect (vid,redirect)
-                                VALUES ({?}, {?})', mysql_insert_id(),
+                                VALUES ({?}, {?})', XDB::insertId(),
                                "$red+post@listes.polytechnique.org");
         XDB::execute('INSERT INTO x4dat.virtual (alias,type)
                                 VALUES({?},{?})', $liste.'-owner@'.$dom, 'list');
         XDB::execute('INSERT INTO x4dat.virtual_redirect (vid,redirect)
-                                VALUES ({?}, {?})', mysql_insert_id(),
+                                VALUES ({?}, {?})', XDB::insertId(),
                                "$red+owner@listes.polytechnique.org");
         XDB::execute('INSERT INTO x4dat.virtual (alias,type)
                                 VALUES({?},{?})', $liste.'-admin@'.$dom, 'list');
         XDB::execute('INSERT INTO x4dat.virtual_redirect (vid,redirect)
-                                VALUES ({?}, {?})', mysql_insert_id(),
+                                VALUES ({?}, {?})', XDB::insertId(),
                                "$red+admin@listes.polytechnique.org");
         XDB::execute('INSERT INTO x4dat.virtual (alias,type)
                                 VALUES({?},{?})', $liste.'-bounces@'.$dom, 'list');
         XDB::execute('INSERT INTO x4dat.virtual_redirect (vid,redirect)
-                                VALUES ({?}, {?})', mysql_insert_id(),
+                                VALUES ({?}, {?})', XDB::insertId(),
                                 "$red+bounces@listes.polytechnique.org");
 
         pl_redirect('lists/admin/'.$liste);
@@ -189,6 +194,9 @@ class XnetListsModule extends ListsModule
     {
         global $globals;
 
+        if (!$globals->asso('mail_domain')) {
+            return PL_NOT_FOUND;
+        }
         $this->prepare_client($page);
 
         $page->changeTpl('xnetlists/sync.tpl');
@@ -199,7 +207,7 @@ class XnetListsModule extends ListsModule
 
         list(,$members) = $this->client->get_members($liste);
         $mails = array_map(create_function('$arr', 'return $arr[1];'), $members);
-        $subscribers = array_unique(array_merge($subscribers, $mails));
+        $subscribers = array_unique($mails);
 
         $not_in_group_x = array();
         $not_in_group_ext = array();
@@ -215,12 +223,13 @@ class XnetListsModule extends ListsModule
                      FROM  groupex.membres AS m
                 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 = {?}", $globals->asso('id'));
+                    WHERE  m.asso_id = {?}
+                 ORDER BY  promo, nom, prenom", $globals->asso('id'));
 
         $not_in_list = array();
 
         while ($tmp = $ann->next()) {
-            if (!in_array($tmp['email'], $subscribers)) {
+            if (!in_array(strtolower($tmp['email']), $subscribers)) {
                 $not_in_list[] = $tmp;
             }
         }
@@ -230,7 +239,9 @@ class XnetListsModule extends ListsModule
 
     function handler_aadmin(&$page, $lfull = null)
     {
-        if (is_null($lfull)) {
+        global $globals;
+
+        if (!$globals->asso('mail_domain') || is_null($lfull)) {
             return PL_NOT_FOUND;
         }
 
@@ -280,12 +291,25 @@ class XnetListsModule extends ListsModule
             pl_redirect('alias/admin/'.$lfull);
         }
 
+        global $globals;
         $res = XDB::iterator(
-                "SELECT  redirect
+                "SELECT  redirect,
+                         IF(u.nom IS NOT NULL, IF(u.nom_usage<>'', u.nom_usage, u.nom), m.nom) AS nom,
+                         IF(u.prenom IS NOT NULL, u.prenom, m.prenom) AS prenom,
+                         IF(u.promo IS NOT NULL, u.promo, 'extérieur') AS promo,
+                         IF(m2.perms, m2.perms = 'admin', m.perms = 'admin') AS admin,
+                         a.alias
                    FROM  x4dat.virtual_redirect AS vr
              INNER JOIN  x4dat.virtual          AS v  USING(vid)
+              LEFT JOIN  x4dat.aliases          AS a  ON(vr.redirect = CONCAT(a.alias, CONCAT('@', {?}))
+                                                        OR vr.redirect = CONCAT(a.alias, CONCAT('@', {?})))
+              LEFT JOIN  x4dat.auth_user_md5    AS u  ON(a.id = u.user_id)
+              LEFT JOIN  groupex.membres        AS m2 ON(u.user_id = m2.uid AND m2.asso_id = {?})
+              LEFT JOIN  groupex.membres        AS m  ON(m.email = vr.redirect AND m.asso_id = {?})
                   WHERE  v.alias={?}
-               ORDER BY  redirect", $lfull);
+               ORDER BY  redirect",
+               $globals->mail->domain, $globals->mail->domain2,
+               $globals->asso('id'), $globals->asso('id'), $lfull);
         $page->assign('mem', $res);
     }
 
@@ -293,6 +317,9 @@ class XnetListsModule extends ListsModule
     {
         global $globals;
 
+        if (!$globals->asso('mail_domain')) {
+            return PL_NOT_FOUND;
+        }
         new_groupadmin_page('xnet/groupe/alias-create.tpl');
 
         if (!Post::has('submit')) {