pending commit, finished during MQ/S download ...

[platal.git] / modules / xnetlists.php

diff --git a/modules/xnetlists.php b/modules/xnetlists.php
index b284fc9..6f25969 100644 (file)
--- a/modules/xnetlists.php
+++ b/modules/xnetlists.php
@@ -57,8 +57,7 @@ class XnetListsModule extends ListsModule
 
         require_once 'lists.inc.php';
 
-        $this->client =& lists_xmlrpc(Session::getInt('uid'),
-                                      Session::get('password'),
+        $this->client =& lists_xmlrpc(S::v('uid'), S::v('password'),
                                       $globals->asso('mail_domain'));
 
         $page->useMenu();
@@ -87,7 +86,7 @@ class XnetListsModule extends ListsModule
             $alias = Post::get('del_alias');
             // prevent group admin from erasing aliases from other groups
             $alias = substr($alias, 0, strpos($alias, '@')).'@'.$globals->asso('mail_domain');
-            $globals->xdb->query(
+            XDB::query(
                     'DELETE FROM  x4dat.virtual_redirect, x4dat.virtual
                            USING  x4dat.virtual AS v
                        LEFT JOIN  x4dat.virtual_redirect USING(vid)
@@ -98,7 +97,7 @@ class XnetListsModule extends ListsModule
         $listes = $this->client->get_lists();
         $page->assign('listes',$listes);
 
-        $alias  = $globals->xdb->iterator(
+        $alias  = XDB::iterator(
                 'SELECT  alias,type
                    FROM  x4dat.virtual
                   WHERE  alias
@@ -133,7 +132,7 @@ class XnetListsModule extends ListsModule
         }
 
         $new = $liste.'@'.$globals->asso('mail_domain');
-        $res = $globals->xdb->query('SELECT COUNT(*) FROM x4dat.virtual WHERE alias={?}', $new);
+        $res = XDB::query('SELECT COUNT(*) FROM x4dat.virtual WHERE alias={?}', $new);
         $n   = $res->fetchOneCell();
 
         if($n) {
@@ -148,7 +147,7 @@ class XnetListsModule extends ListsModule
         $ret = $this->client->create_list(
                     $liste, Post::get('desc'), Post::get('advertise'),
                     Post::get('modlevel'), Post::get('inslevel'),
-                    array(Session::get('forlife')), array());
+                    array(S::v('forlife')), array());
 
         $dom = strtolower($globals->asso("mail_domain"));
         $red = $dom.'_'.$liste;
@@ -158,24 +157,24 @@ class XnetListsModule extends ListsModule
                         ."<a href='mailto:support@m4x.org'>support@m4x.org</a>");
             return;
         }
-        $globals->xdb->execute('INSERT INTO x4dat.virtual (alias,type)
+        XDB::execute('INSERT INTO x4dat.virtual (alias,type)
                                 VALUES({?},{?})', $liste.'@'.$dom, 'list');
-        $globals->xdb->execute('INSERT INTO x4dat.virtual_redirect (vid,redirect)
+        XDB::execute('INSERT INTO x4dat.virtual_redirect (vid,redirect)
                                 VALUES ({?}, {?})', mysql_insert_id(),
                                "$red+post@listes.polytechnique.org");
-        $globals->xdb->execute('INSERT INTO x4dat.virtual (alias,type)
+        XDB::execute('INSERT INTO x4dat.virtual (alias,type)
                                 VALUES({?},{?})', $liste.'-owner@'.$dom, 'list');
-        $globals->xdb->execute('INSERT INTO x4dat.virtual_redirect (vid,redirect)
+        XDB::execute('INSERT INTO x4dat.virtual_redirect (vid,redirect)
                                 VALUES ({?}, {?})', mysql_insert_id(),
                                "$red+owner@listes.polytechnique.org");
-        $globals->xdb->execute('INSERT INTO x4dat.virtual (alias,type)
+        XDB::execute('INSERT INTO x4dat.virtual (alias,type)
                                 VALUES({?},{?})', $liste.'-admin@'.$dom, 'list');
-        $globals->xdb->execute('INSERT INTO x4dat.virtual_redirect (vid,redirect)
+        XDB::execute('INSERT INTO x4dat.virtual_redirect (vid,redirect)
                                 VALUES ({?}, {?})', mysql_insert_id(),
                                "$red+admin@listes.polytechnique.org");
-        $globals->xdb->execute('INSERT INTO x4dat.virtual (alias,type)
+        XDB::execute('INSERT INTO x4dat.virtual (alias,type)
                                 VALUES({?},{?})', $liste.'-bounces@'.$dom, 'list');
-        $globals->xdb->execute('INSERT INTO x4dat.virtual_redirect (vid,redirect)
+        XDB::execute('INSERT INTO x4dat.virtual_redirect (vid,redirect)
                                 VALUES ({?}, {?})', mysql_insert_id(),
                                 "$red+bounces@listes.polytechnique.org");
 
@@ -202,7 +201,7 @@ class XnetListsModule extends ListsModule
         $not_in_group_x = array();
         $not_in_group_ext = array();
 
-        $ann = $globals->xdb->iterator(
+        $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,
@@ -228,8 +227,6 @@ class XnetListsModule extends ListsModule
 
     function handler_aadmin(&$page, $lfull = null)
     {
-        global $globals;
-
         if (is_null($lfull)) {
             return PL_NOT_FOUND;
         }
@@ -245,14 +242,14 @@ class XnetListsModule extends ListsModule
                 $dom = 'm4x.org';
             }
             if($dom == 'polytechnique.org' || $dom == 'm4x.org') {
-                $res = $globals->xdb->query(
+                $res = XDB::query(
                         "SELECT  a.alias, b.alias
                            FROM  x4dat.aliases AS a
                       LEFT JOIN  x4dat.aliases AS b ON (a.id=b.id AND b.type = 'a_vie')
                           WHERE  a.alias={?} AND a.type!='homonyme'", $mbox);
                 if (list($alias, $blias) = $res->fetchOneRow()) {
                     $alias = empty($blias) ? $alias : $blias;
-                    $globals->xdb->query(
+                    XDB::query(
                         "INSERT INTO  x4dat.virtual_redirect (vid,redirect)
                               SELECT  vid, {?}
                                 FROM  x4dat.virtual
@@ -262,7 +259,7 @@ class XnetListsModule extends ListsModule
                     $page->trig("$mbox@polytechnique.org n'existe pas.");
                 }
             } else {
-                $globals->xdb->query(
+                XDB::query(
                         "INSERT INTO  x4dat.virtual_redirect (vid,redirect)
                               SELECT  vid,{?}
                                 FROM  x4dat.virtual
@@ -272,7 +269,7 @@ class XnetListsModule extends ListsModule
         }
 
         if (Env::has('del_member')) {
-            $globals->xdb->query(
+            XDB::query(
                     "DELETE FROM  x4dat.virtual_redirect
                            USING  x4dat.virtual_redirect
                       INNER JOIN  x4dat.virtual USING(vid)
@@ -280,7 +277,7 @@ class XnetListsModule extends ListsModule
             redirect("?liste=$lfull");
         }
 
-        $res = $globals->xdb->iterator(
+        $res = XDB::iterator(
                 "SELECT  redirect
                    FROM  x4dat.virtual_redirect AS vr
              INNER JOIN  x4dat.virtual          AS v  USING(vid)
@@ -311,14 +308,14 @@ class XnetListsModule extends ListsModule
         }
 
         $new = $liste.'@'.$globals->asso('mail_domain');
-        $res = $globals->xdb->query('SELECT COUNT(*) FROM x4dat.virtual WHERE alias={?}', $new);
+        $res = XDB::query('SELECT COUNT(*) FROM x4dat.virtual WHERE alias={?}', $new);
         $n   = $res->fetchOneCell();
         if($n) {
             $page->trig('cet alias est déjà pris');
             return;
         }
 
-        $globals->xdb->query('INSERT INTO x4dat.virtual (alias,type) VALUES({?}, "user")', $new);
+        XDB::query('INSERT INTO x4dat.virtual (alias,type) VALUES({?}, "user")', $new);
 
         global $platal;
         redirect(smarty_function_rel()."/{$platal->ns}alias/admin/$new");