SQL upgrade for my last commit
[platal.git] / modules / xnetlists.php
index 6f25969..23b114f 100644 (file)
@@ -28,23 +28,23 @@ 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),
+            '%grp/lists/create'    => $this->make_hook('create',    AUTH_MDP),
 
-            'grp/lists/members'   => $this->make_hook('members',   AUTH_COOKIE),
-            'grp/lists/archives'  => $this->make_hook('archives',  AUTH_COOKIE),
+            '%grp/lists/members'   => $this->make_hook('members',   AUTH_COOKIE),
+            '%grp/lists/archives'  => $this->make_hook('archives',  AUTH_COOKIE),
 
-            'grp/lists/moderate'  => $this->make_hook('moderate',  AUTH_MDP),
-            'grp/lists/admin'     => $this->make_hook('admin',     AUTH_MDP),
-            'grp/lists/options'   => $this->make_hook('options',   AUTH_MDP),
-            'grp/lists/delete'    => $this->make_hook('delete',    AUTH_MDP),
+            '%grp/lists/moderate'  => $this->make_hook('moderate',  AUTH_MDP),
+            '%grp/lists/admin'     => $this->make_hook('admin',     AUTH_MDP),
+            '%grp/lists/options'   => $this->make_hook('options',   AUTH_MDP),
+            '%grp/lists/delete'    => $this->make_hook('delete',    AUTH_MDP),
 
-            'grp/lists/soptions'  => $this->make_hook('soptions',  AUTH_MDP),
-            'grp/lists/check'     => $this->make_hook('check',     AUTH_MDP),
-            'grp/lists/sync'      => $this->make_hook('sync',      AUTH_MDP),
+            '%grp/lists/soptions'  => $this->make_hook('soptions',  AUTH_MDP),
+            '%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),
+            '%grp/alias/create'    => $this->make_hook('acreate',   AUTH_MDP),
 
             /* hack: lists uses that */
             'profile' => $this->make_hook('profile', AUTH_PUBLIC),
@@ -55,14 +55,16 @@ 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 +76,16 @@ class XnetListsModule extends ListsModule
         $page->changeTpl('xnetlists/index.tpl');
 
         if (Get::has('del')) {
-            $this->client->unsubscribe(Get::get('del'));
-            redirect('lists');
+            $this->client->unsubscribe(Get::v('del'));
+            pl_redirect('lists');
         }
         if (Get::has('add')) {
-            $this->client->subscribe(Get::get('add'));
-            redirect('lists');
+            $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,33 @@ 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');
         $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"));
@@ -178,8 +182,7 @@ class XnetListsModule extends ListsModule
                                 VALUES ({?}, {?})', mysql_insert_id(),
                                 "$red+bounces@listes.polytechnique.org");
 
-        global $platal;
-        redirect(smarty_function_rel().'/'.$platal->ns.'lists/admin/'.$liste);
+        pl_redirect('lists/admin/'.$liste);
     }
 
     function handler_sync(&$page, $liste = null)
@@ -191,7 +194,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);
@@ -202,11 +205,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
@@ -234,14 +237,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
@@ -273,8 +276,8 @@ 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);
-            redirect("?liste=$lfull");
+                           WHERE  redirect={?} AND alias={?}", Env::v('del_member'), $lfull);
+            pl_redirect('alias/admin/'.$lfull);
         }
 
         $res = XDB::iterator(
@@ -300,7 +303,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');
@@ -310,20 +313,19 @@ 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;
         }
 
         XDB::query('INSERT INTO x4dat.virtual (alias,type) VALUES({?}, "user")', $new);
 
-        global $platal;
-        redirect(smarty_function_rel()."/{$platal->ns}alias/admin/$new");
+        pl_redirect("alias/admin/$new");
     }
 
     function handler_profile(&$page, $user = null)
     {
-        redirect('https://www.polytechnique.org/profile/'.$user);
+        http_redirect('https://www.polytechnique.org/profile/'.$user);
     }
 }