Closes #700: Encoding issues with list descriptions

[platal.git] / modules / xnetlists.php

diff --git a/modules/xnetlists.php b/modules/xnetlists.php
index 5d3049e..3013f6e 100644 (file)
--- a/modules/xnetlists.php
+++ b/modules/xnetlists.php
@@ -28,12 +28,13 @@ class XnetListsModule extends ListsModule
     function handlers()
     {
         return array(
-            '%grp/lists'           => $this->make_hook('lists',     AUTH_MDP),
-            '%grp/lists/create'    => $this->make_hook('create',    AUTH_MDP),
+            '%grp/lists'           => $this->make_hook('lists',     AUTH_MDP, 'groupmember'),
+            '%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),
@@ -44,8 +45,8 @@ class XnetListsModule extends ListsModule
             '%grp/lists/check'     => $this->make_hook('check',     AUTH_MDP),
             '%grp/lists/sync'      => $this->make_hook('sync',      AUTH_MDP),
 
-            '%grp/alias/admin'     => $this->make_hook('aadmin',    AUTH_MDP),
-            '%grp/alias/create'    => $this->make_hook('acreate',   AUTH_MDP),
+            '%grp/alias/admin'     => $this->make_hook('aadmin',    AUTH_MDP, 'groupadmin'),
+            '%grp/alias/create'    => $this->make_hook('acreate',   AUTH_MDP, 'groupadmin'),
 
             /* hack: lists uses that */
             'profile' => $this->make_hook('profile', AUTH_PUBLIC),
@@ -75,8 +76,7 @@ class XnetListsModule extends ListsModule
             return PL_NOT_FOUND;
         }
         $this->prepare_client($page);
-
-        new_group_page('xnetlists/index.tpl');
+        $page->changeTpl('xnetlists/index.tpl');
 
         if (Get::has('del')) {
             $this->client->unsubscribe(Get::v('del'));
@@ -92,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é !");
         }
@@ -121,7 +121,6 @@ class XnetListsModule extends ListsModule
             return PL_NOT_FOUND;
         }
         $this->prepare_client($page);
-
         $page->changeTpl('xnetlists/create.tpl');
 
         if (!Post::has('submit')) {
@@ -141,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;
         }
@@ -154,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;
@@ -198,7 +196,6 @@ class XnetListsModule extends ListsModule
             return PL_NOT_FOUND;
         }
         $this->prepare_client($page);
-
         $page->changeTpl('xnetlists/sync.tpl');
 
         if (Env::has('add')) {
@@ -216,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
@@ -244,8 +241,7 @@ class XnetListsModule extends ListsModule
         if (!$globals->asso('mail_domain') || is_null($lfull)) {
             return PL_NOT_FOUND;
         }
-
-        new_groupadmin_page('xnetlists/alias-admin.tpl');
+        $page->changeTpl('xnetlists/alias-admin.tpl');
 
         if (Env::has('add_member')) {
             $add = Env::v('add_member');
@@ -270,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(
@@ -301,8 +297,8 @@ class XnetListsModule extends ListsModule
                          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.aliases          AS a  ON(vr.redirect = CONCAT(a.alias, '@', {?})
+                                                        OR vr.redirect = CONCAT(a.alias, '@', {?}))
               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 = {?})
@@ -320,7 +316,7 @@ class XnetListsModule extends ListsModule
         if (!$globals->asso('mail_domain')) {
             return PL_NOT_FOUND;
         }
-        new_groupadmin_page('xnetlists/alias-create.tpl');
+        $page->changeTpl('xnetlists/alias-create.tpl');
 
         if (!Post::has('submit')) {
             return;