X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetlists.php;h=cbadb490811a5bd8e9f4bd4c4b98e4f9142eeeac;hb=24bcf50c5f36f0770e2f7c279e7cd1077a4acead;hp=a534a5b5ef53c8beb16a01cde38ba9d27c616a2d;hpb=c9110c6c4f4d15c76c3353353bd91c48f9bb51d3;p=platal.git

diff --git a/modules/xnetlists.php b/modules/xnetlists.php
index a534a5b..cbadb49 100644
--- a/modules/xnetlists.php
+++ b/modules/xnetlists.php
@@ -55,14 +55,15 @@ class XnetListsModule extends ListsModule
     {
         global $globals;
 
-        require_once 'lists.inc.php';
+        require_once dirname(__FILE__).'/lists/lists.inc.php';
 
-        $this->client =& lists_xmlrpc(S::v('uid'), S::v('password'),
-                                      $globals->asso('mail_domain'));
+        $this->client = new MMList(S::v('uid'), S::v('password'),
+                                   $globals->asso('mail_domain'));
 
-        $page->useMenu();
         $page->assign('asso', $globals->asso());
         $page->setType($globals->asso('cat'));
+
+        return $globals->asso('mail_domain');
     }
 
     function handler_lists(&$page)
@@ -74,16 +75,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 +92,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();
@@ -126,7 +127,7 @@ class XnetListsModule extends ListsModule
             return;
         }
 
-        $liste = Post::get('liste');
+        $liste = Post::v('liste');
 
         if (!preg_match("/^[a-zA-Z0-9\-]*$/", $liste)) {
             $page->trig('le nom de la liste ne doit contenir que des lettres, chiffres et tirets');
@@ -141,16 +142,14 @@ class XnetListsModule extends ListsModule
             $page->trig('cet alias est déjà pris');
             return;
         }
-        if (!Post::get('desc')) {
+        if (!Post::v('desc')) {
             $page->trig('le sujet est vide');
             return;
         }
 
-        require_once 'platal/xmlrpc-client.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"));
@@ -194,7 +193,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);
@@ -237,7 +236,7 @@ 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 {
@@ -276,7 +275,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);
         }
 
@@ -303,7 +302,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');