X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetlists.php;h=3013f6ed1037f889e08e9ec6db478db85710cc32;hb=92144f3e3b3399da3acbb7c80c096a0966870a69;hp=31ac9c3d7fed79b22c40a49162bd63609d47f23e;hpb=1490093c909c086ce8eba3c0f5c24b62ef20cfb3;p=platal.git

diff --git a/modules/xnetlists.php b/modules/xnetlists.php
index 31ac9c3..3013f6e 100644
--- a/modules/xnetlists.php
+++ b/modules/xnetlists.php
@@ -32,8 +32,9 @@ 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/trombi'    => $this->make_hook('trombi',    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),
 
             '%grp/lists/moderate'  => $this->make_hook('moderate',  AUTH_MDP),
             '%grp/lists/admin'     => $this->make_hook('admin',     AUTH_MDP),
@@ -91,9 +92,9 @@ class XnetListsModule extends ListsModule
             // prevent group admin from erasing aliases from other groups
             $alias = substr($alias, 0, strpos($alias, '@')).'@'.$globals->asso('mail_domain');
             XDB::query(
-                    'DELETE FROM  x4dat.virtual_redirect, x4dat.virtual
+                    'DELETE FROM  r, v
                            USING  x4dat.virtual AS v
-                       LEFT JOIN  x4dat.virtual_redirect USING(vid)
+                       LEFT JOIN  x4dat.virtual_redirect AS r USING(vid)
                            WHERE  v.alias={?}', $alias);
             $page->trig(Post::v('del_alias')." supprimé !");
         }
@@ -139,10 +140,9 @@ class XnetListsModule extends ListsModule
         }
 
         $new = $liste.'@'.$globals->asso('mail_domain');
-        $res = XDB::query('SELECT COUNT(*) FROM x4dat.virtual WHERE alias={?}', $new);
-        $n   = $res->fetchOneCell();
+        $res = XDB::query('SELECT alias FROM x4dat.virtual WHERE alias={?}', $new);
 
-        if ($n) {
+        if ($res->numRows()) {
             $page->trig('cet alias est déjà pris');
             return;
         }
@@ -152,9 +152,9 @@ class XnetListsModule extends ListsModule
         }
 
         $ret = $this->client->create_list(
-                    $liste, Post::v('desc'), Post::v('advertise'),
+                    $liste, utf8_decode(Post::v('desc')), Post::v('advertise'),
                     Post::v('modlevel'), Post::v('inslevel'),
-                    array(S::v('forlife')), array());
+                    array(S::v('forlife')), array(S::v('forlife')));
 
         $dom = strtolower($globals->asso("mail_domain"));
         $red = $dom.'_'.$liste;
@@ -213,7 +213,7 @@ class XnetListsModule extends ListsModule
                   "SELECT  if (m.origine='X',if (u.nom_usage<>'', u.nom_usage, u.nom) ,m.nom) AS nom,
                            if (m.origine='X',u.prenom,m.prenom) AS prenom,
                            if (m.origine='X',u.promo,'extérieur') AS promo,
-                           if (m.origine='X',CONCAT(a.alias, '@polytechnique.org'),m.email) AS email,
+                           if (m.origine='X',CONCAT(a.alias, '@{$globals->mail->domain}),m.email) AS email,
                            if (m.origine='X',FIND_IN_SET('femme', u.flags),0) AS femme,
                            m.perms='admin' AS admin,
                            m.origine='X' AS x
@@ -266,7 +266,7 @@ class XnetListsModule extends ListsModule
                                WHERE  alias={?}", "$alias@m4x.org", $lfull);
                    $page->trig("$alias@m4x.org ajouté");
                 } else {
-                    $page->trig("$mbox@polytechnique.org n'existe pas.");
+                    $page->trig("$mbox@{$globals->mail->domain} n'existe pas.");
                 }
             } else {
                 XDB::query(