X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetlists.php;h=1c59e10d5487a36f9c9f5c259f40f1e6e1c56b48;hb=0001ba7a34dc3b535407cb1b961781c3c69c0ccd;hp=7e90d3a540bc03b5441bd2758844e687a17ea814;hpb=832e6fcb12ba94ac0f678837d19aaaa62384756f;p=platal.git

diff --git a/modules/xnetlists.php b/modules/xnetlists.php
index 7e90d3a..1c59e10 100644
--- a/modules/xnetlists.php
+++ b/modules/xnetlists.php
@@ -32,6 +32,7 @@ class XnetListsModule extends ListsModule
             '%grp/lists/create'    => $this->make_hook('create',    AUTH_MDP, 'groupmember'),
 
             '%grp/lists/members'   => $this->make_hook('members',   AUTH_COOKIE),
+            '%grp/lists/csv'       => $this->make_hook('csv',       AUTH_COOKIE),
             '%grp/lists/annu'      => $this->make_hook('annu',      AUTH_COOKIE),
             '%grp/lists/archives'  => $this->make_hook('archives',  AUTH_COOKIE),
             '%grp/lists/archives/rss' => $this->make_hook('rss',    AUTH_PUBLIC),
@@ -233,37 +234,21 @@ class XnetListsModule extends ListsModule
         if (Env::has('add_member')) {
             S::assert_xsrf_token();
 
-            $add = Env::v('add_member');
-            if (strstr($add, '@')) {
-                list($mbox,$dom) = explode('@', strtolower($add));
-            } else {
-                $mbox = $add;
-                $dom = 'm4x.org';
+            $add = Env::t('add_member');
+            $user = User::getSilent($add);
+            if ($user) {
+                $add = $user->forlifeEmail();
+            } else if (!User::isForeignEmailAddress($add)) {
+                $add = null;
             }
-            if ($dom == 'polytechnique.org' || $dom == 'm4x.org') {
-                $res = XDB::query(
-                        "SELECT  a.alias, b.alias
-                           FROM  x4dat.aliases AS a
-                      LEFT JOIN  x4dat.aliases AS b ON (a.id=b.id AND b.type = 'a_vie')
-                          WHERE  a.alias={?} AND a.type!='homonyme'", $mbox);
-                if (list($alias, $blias) = $res->fetchOneRow()) {
-                    $alias = empty($blias) ? $alias : $blias;
-                    XDB::query(
-                        "INSERT INTO  x4dat.virtual_redirect (vid,redirect)
-                              SELECT  vid, {?}
-                                FROM  x4dat.virtual
-                               WHERE  alias={?}", "$alias@m4x.org", $lfull);
-                   $page->trigSuccess("$alias@m4x.org ajouté");
-                } else {
-                    $page->trigError("$mbox@{$globals->mail->domain} n'existe pas.");
-                }
+            if (!empty($add)) {
+                XDB::execute('INSERT INTO  x4dat.virtual_redirect (vid, redirect)
+                                   SELECT  vid, {?},
+                                     FROM  x4dat.virtual
+                                    WHERE  alias = {?}', strtolower($add), $lfull);
+                $page->trigSuccess($add . ' ajouté.');
             } else {
-                XDB::query(
-                        "INSERT INTO  x4dat.virtual_redirect (vid,redirect)
-                              SELECT  vid,{?}
-                                FROM  x4dat.virtual
-                               WHERE  alias={?}", "$mbox@$dom", $lfull);
-                $page->trigSuccess("$mbox@$dom ajouté");
+                $page->trigError($add . ' n\'existe pas.');
             }
         }