Closes #700: Encoding issues with list descriptions

[platal.git] / modules / xnetlists.php

diff --git a/modules/xnetlists.php b/modules/xnetlists.php
index db9710b..3013f6e 100644 (file)
--- a/modules/xnetlists.php
+++ b/modules/xnetlists.php
@@ -34,6 +34,7 @@ class XnetListsModule extends ListsModule
             '%grp/lists/members'   => $this->make_hook('members',   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),
@@ -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(