X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fxnetlists.php;h=7638917d40b00a6bfe0bd75864d9988d487e68f9;hb=c83168b1f1bf43e24bcf3a5f3fe272d10198ea2a;hp=c32b934e1a7aa9ec5b620a4a7aaa2e60b6783e51;hpb=d1ebc57a6035c4b43153dd85a34cfce19bc33026;p=platal.git

diff --git a/modules/xnetlists.php b/modules/xnetlists.php
index c32b934..7638917 100644
--- a/modules/xnetlists.php
+++ b/modules/xnetlists.php
@@ -63,6 +63,8 @@ class XnetListsModule extends ListsModule
         $page->useMenu();
         $page->assign('asso', $globals->asso());
         $page->setType($globals->asso('cat'));
+
+        return $globals->asso('mail_domain');
     }
 
     function handler_lists(&$page)
@@ -74,16 +76,16 @@ class XnetListsModule extends ListsModule
         $page->changeTpl('xnetlists/index.tpl');
 
         if (Get::has('del')) {
-            $this->client->unsubscribe(Get::get('del'));
+            $this->client->unsubscribe(Get::v('del'));
             pl_redirect('lists');
         }
         if (Get::has('add')) {
-            $this->client->subscribe(Get::get('add'));
+            $this->client->subscribe(Get::v('add'));
             pl_redirect('lists');
         }
 
         if (Post::has('del_alias') && may_update()) {
-            $alias = Post::get('del_alias');
+            $alias = Post::v('del_alias');
             // prevent group admin from erasing aliases from other groups
             $alias = substr($alias, 0, strpos($alias, '@')).'@'.$globals->asso('mail_domain');
             XDB::query(
@@ -91,7 +93,7 @@ class XnetListsModule extends ListsModule
                            USING  x4dat.virtual AS v
                        LEFT JOIN  x4dat.virtual_redirect USING(vid)
                            WHERE  v.alias={?}', $alias);
-            $page->trig(Post::get('del_alias')." supprimé !");
+            $page->trig(Post::v('del_alias')." supprimé !");
         }
 
         $listes = $this->client->get_lists();
@@ -122,31 +124,34 @@ class XnetListsModule extends ListsModule
         }
 
         if (!Post::has('liste')) {
-            $page->trig_run('champs «addresse souhaitée» vide');
+            $page->trig('champs «addresse souhaitée» vide');
+            return;
         }
 
-        $liste = Post::get('liste');
+        $liste = Post::v('liste');
 
         if (!preg_match("/^[a-zA-Z0-9\-]*$/", $liste)) {
-            $page->trig_run('le nom de la liste ne doit contenir que des lettres, chiffres et tirets');
+            $page->trig('le nom de la liste ne doit contenir que des lettres, chiffres et tirets');
+            return;
         }
 
         $new = $liste.'@'.$globals->asso('mail_domain');
         $res = XDB::query('SELECT COUNT(*) FROM x4dat.virtual WHERE alias={?}', $new);
         $n   = $res->fetchOneCell();
 
-        if($n) {
-            $page->trig_run('cet alias est déjà pris');
+        if ($n) {
+            $page->trig('cet alias est déjà pris');
+            return;
         }
-        if(!Post::get('desc')) {
-            $page->trig_run('le sujet est vide');
+        if (!Post::v('desc')) {
+            $page->trig('le sujet est vide');
+            return;
         }
 
-        require_once('platal/xmlrpc-client.inc.php');
-        require_once('lists.inc.php');
+        require_once 'lists.inc.php';
         $ret = $this->client->create_list(
-                    $liste, Post::get('desc'), Post::get('advertise'),
-                    Post::get('modlevel'), Post::get('inslevel'),
+                    $liste, Post::v('desc'), Post::v('advertise'),
+                    Post::v('modlevel'), Post::v('inslevel'),
                     array(S::v('forlife')), array());
 
         $dom = strtolower($globals->asso("mail_domain"));
@@ -190,7 +195,7 @@ class XnetListsModule extends ListsModule
         $page->changeTpl('xnetlists/sync.tpl');
 
         if (Env::has('add')) {
-            $this->client->mass_subscribe($liste, array_keys(Env::getMixed('add')));
+            $this->client->mass_subscribe($liste, array_keys(Env::v('add')));
         }
 
         list(,$members) = $this->client->get_members($liste);
@@ -201,11 +206,11 @@ class XnetListsModule extends ListsModule
         $not_in_group_ext = array();
 
         $ann = XDB::iterator(
-                  "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',FIND_IN_SET('femme', u.flags),0) AS femme,
+                  "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',FIND_IN_SET('femme', u.flags),0) AS femme,
                            m.perms='admin' AS admin,
                            m.origine='X' AS x
                      FROM  groupex.membres AS m
@@ -233,14 +238,14 @@ class XnetListsModule extends ListsModule
         new_groupadmin_page('xnet/groupe/alias-admin.tpl');
 
         if (Env::has('add_member')) {
-            $add = Env::get('add_member');
+            $add = Env::v('add_member');
             if (strstr($add, '@')) {
                 list($mbox,$dom) = explode('@', strtolower($add));
             } else {
                 $mbox = $add;
                 $dom = 'm4x.org';
             }
-            if($dom == 'polytechnique.org' || $dom == 'm4x.org') {
+            if ($dom == 'polytechnique.org' || $dom == 'm4x.org') {
                 $res = XDB::query(
                         "SELECT  a.alias, b.alias
                            FROM  x4dat.aliases AS a
@@ -272,7 +277,7 @@ class XnetListsModule extends ListsModule
                     "DELETE FROM  x4dat.virtual_redirect
                            USING  x4dat.virtual_redirect
                       INNER JOIN  x4dat.virtual USING(vid)
-                           WHERE  redirect={?} AND alias={?}", Env::get('del_member'), $lfull);
+                           WHERE  redirect={?} AND alias={?}", Env::v('del_member'), $lfull);
             pl_redirect('alias/admin/'.$lfull);
         }
 
@@ -299,7 +304,7 @@ class XnetListsModule extends ListsModule
             $page->trig('champs «addresse souhaitée» vide');
             return;
         }
-        $liste = Post::get('liste');
+        $liste = Post::v('liste');
         if (!preg_match("/^[a-zA-Z0-9\-\.]*$/", $liste)) {
             $page->trig('le nom de l\'alias ne doit contenir que des lettres,'
                         .' chiffres, tirets et points');
@@ -309,7 +314,7 @@ class XnetListsModule extends ListsModule
         $new = $liste.'@'.$globals->asso('mail_domain');
         $res = XDB::query('SELECT COUNT(*) FROM x4dat.virtual WHERE alias={?}', $new);
         $n   = $res->fetchOneCell();
-        if($n) {
+        if ($n) {
             $page->trig('cet alias est déjà pris');
             return;
         }