Fix RSS encoding, add a disclaimer for xnet announces...
[platal.git] / modules / xnetgrp.php
index 650d903..51662f1 100644 (file)
@@ -34,12 +34,19 @@ function get_infos($email)
     }
 
     $res = XDB::query(
-            "SELECT  uid, nom, prenom, email, email AS email2, perms='admin', origine
+            "SELECT  uid, nom, prenom, email, email AS email2, perms='admin', origine, sexe
                FROM  groupex.membres
               WHERE  $field = {?} AND asso_id = {?}", $email, $globals->asso('id'));
 
     if ($res->numRows()) {
-        return $res->fetchOneAssoc();
+        $user = $res->fetchOneAssoc();
+        if ($user['origine'] == 'X') {
+            $res = XDB::query("SELECT nom, prenom, promo, FIND_IN_SET(flags, 'femme') AS sexe
+                                 FROM auth_user_md5
+                                WHERE user_id = {?}", $user['uid']);
+            $user = array_merge($user, $res->fetchOneAssoc());
+        }
+        return $user;                        
     } elseif ($dom == 'polytechnique.org' || $dom == 'm4x.org') {
         $res = XDB::query(
                 "SELECT  user_id AS uid, u.promo,
@@ -47,7 +54,8 @@ function get_infos($email)
                          u.prenom, b.alias,
                          CONCAT(b.alias, '@m4x.org') AS email,
                          CONCAT(b.alias, '@polytechnique.org') AS email2,
-                         m.perms='admin' AS perms, m.origine
+                         m.perms='admin' AS perms, m.origine,
+                         FIND_IN_SET(u.flags, 'femme') AS sexe
                    FROM  auth_user_md5   AS u
              INNER JOIN  aliases         AS a ON ( u.user_id = a.id AND a.type != 'homonyme' )
              INNER JOIN  aliases         AS b ON ( u.user_id = b.id AND b.type = 'a_vie' )
@@ -65,40 +73,105 @@ class XnetGrpModule extends PLModule
     function handlers()
     {
         return array(
-            'grp'            => $this->make_hook('index',     AUTH_PUBLIC),
-            'grp/asso.php'   => $this->make_hook('index',     AUTH_PUBLIC),
-            'grp/logo'       => $this->make_hook('logo',      AUTH_PUBLIC),
-            'grp/edit'       => $this->make_hook('edit',      AUTH_MDP),
-            'grp/mail'       => $this->make_hook('mail',      AUTH_MDP),
-            'grp/annuaire'   => $this->make_hook('annuaire',  AUTH_MDP),
-            'grp/subscribe'  => $this->make_hook('subscribe', AUTH_MDP),
-            'grp/paiement'   => $this->make_hook('paiement',  AUTH_MDP),
-
-            'grp/admin/annuaire'
+            '%grp'                => $this->make_hook('index',     AUTH_PUBLIC),
+            '%grp/asso.php'       => $this->make_hook('index',     AUTH_PUBLIC),
+            '%grp/logo'           => $this->make_hook('logo',      AUTH_PUBLIC),
+            '%grp/edit'           => $this->make_hook('edit',      AUTH_MDP),
+            '%grp/mail'           => $this->make_hook('mail',      AUTH_MDP),
+            '%grp/annuaire'       => $this->make_hook('annuaire',  AUTH_MDP),
+            '%grp/annuaire/vcard' => $this->make_hook('vcard',     AUTH_MDP),
+            '%grp/trombi'         => $this->make_hook('trombi',    AUTH_MDP),
+            '%grp/subscribe'      => $this->make_hook('subscribe', AUTH_MDP),
+            '%grp/unsubscribe'    => $this->make_hook('unsubscribe', AUTH_MDP),
+
+            '%grp/change_rights'  => $this->make_hook('change_rights', AUTH_MDP),
+
+            '%grp/admin/annuaire'
                  => $this->make_hook('admin_annuaire', AUTH_MDP),
 
-            'grp/member'
+            '%grp/member'
                  => $this->make_hook('admin_member', AUTH_MDP),
-            'grp/member/new'
+            '%grp/member/new'
                  => $this->make_hook('admin_member_new', AUTH_MDP),
-            'grp/member/del'
+            '%grp/member/new/ajax'
+                 => $this->make_hook('admin_member_new_ajax', AUTH_MDP, '', NO_AUTH),         
+            '%grp/member/del'
                  => $this->make_hook('admin_member_del', AUTH_MDP),
+
+            '%grp/rss'             => $this->make_hook('rss', AUTH_PUBLIC),         
+            '%grp/announce/new'    => $this->make_hook('edit_announce', AUTH_MDP),
+            '%grp/announce/edit'   => $this->make_hook('edit_announce', AUTH_MDP),
+            '%grp/admin/announces' => $this->make_hook('admin_announce', AUTH_MDP),
         );
     }
 
     function handler_index(&$page, $arg = null)
     {
-        global $globals;
+        global $globals, $platal;
 
         if (!is_null($arg)) {
             return PL_NOT_FOUND;
         }
 
-        $page->changeTpl('xnet/groupe/asso.tpl');
-        $page->useMenu();
-        $page->setType($globals->asso('cat'));
-        $page->assign('is_member', is_member());
-        $page->assign('logged', S::logged());
+        new_group_open_page('xnet/groupe/asso.tpl');
+
+        if (S::logged()) {
+            if (Env::has('read')) {
+                XDB::query('DELETE r.*
+                              FROM groupex.announces_read AS r
+                        INNER JOIN groupex.announces AS a ON a.id = r.announce_id
+                             WHERE peremption < CURRENT_DATE()');       
+                XDB::query('INSERT INTO groupex.announces_read
+                                 VALUES ({?}, {?})',
+                            Env::i('read'), S::i('uid'));
+                pl_redirect("");
+            }
+            if (Env::has('unread')) {
+                XDB::query('DELETE FROM groupex.announces_read
+                                  WHERE announce_id={?} AND user_id={?}',
+                            Env::i('unread'), S::i('uid'));
+                pl_redirect("#art" . Env::i('unread'));
+            }
+            $arts = XDB::iterator("SELECT a.*, u.nom, u.prenom, u.promo, l.alias AS forlife
+                                     FROM groupex.announces AS a
+                               INNER JOIN auth_user_md5 AS u USING(user_id)
+                               INNER JOIN aliases AS l ON (u.user_id = l.id AND l.type = 'a_vie')
+                                LEFT JOIN groupex.announces_read AS r ON (r.user_id = {?} AND r.announce_id = a.id)
+                                    WHERE asso_id = {?} AND peremption >= CURRENT_DATE()
+                                          AND (promo_min = 0 OR promo_min <= {?})
+                                          AND (promo_max = 0 OR promo_max >= {?})
+                                          AND r.announce_id IS NULL
+                                 ORDER BY a.peremption",
+                                   S::i('uid'), $globals->asso('id'), S::i('promo'), S::i('promo'));
+            $index = XDB::iterator("SELECT a.id, a.titre, r.user_id IS NULL AS nonlu
+                                      FROM groupex.announces AS a
+                                 LEFT JOIN groupex.announces_read AS r ON (a.id = r.announce_id AND r.user_id = {?})
+                                     WHERE asso_id = {?} AND peremption >= CURRENT_DATE()
+                                           AND (promo_min = 0 OR promo_min <= {?})
+                                           AND (promo_max = 0 OR promo_max >= {?})
+                                  ORDER BY a.peremption",
+                                   S::i('uid'), $globals->asso('id'), S::i('promo'), S::i('promo'));
+            $page->assign('article_index', $index);
+        } else {
+            $arts = XDB::iterator("SELECT a.*, u.nom, u.prenom, u.promo
+                                     FROM groupex.announces AS a
+                               INNER JOIN auth_user_md5 AS u USING(user_id)
+                                    WHERE asso_id = {?} AND peremption >= CURRENT_DATE()
+                                          AND FIND_IN_SET(a.flags, 'public')",
+                                  $globals->asso('id'));
+        }
+
+        if (!S::has('core_rss_hash')) {
+            $page->setRssLink("Polytechnique.net :: {$globals->asso("nom")} :: News publiques",
+                              "rss/rss.xml");
+        } else {
+            $page->setRssLink("Polytechnique.net :: {$globals->asso("nom")} :: News",
+                              'rss/'.S::v('forlife') .'/'.S::v('core_rss_hash').'/rss.xml');
+        }
+
+        require_once('url_catcher.inc.php');
+        $page->register_modifier('url_catcher', 'url_catcher');
+        $page->assign('articles', $arts);
 
         $page->assign('asso', $globals->asso());
     }
@@ -108,8 +181,8 @@ class XnetGrpModule extends PLModule
         global $globals;
 
         $res = XDB::query("SELECT logo, logo_mime
-                                       FROM groupex.asso WHERE id = {?}",
-                                    $globals->asso('id'));
+                             FROM groupex.asso WHERE id = {?}",
+                          $globals->asso('id'));
         list($logo, $logo_mime) = $res->fetchOneRow();
 
         if (!empty($logo)) {
@@ -125,7 +198,7 @@ class XnetGrpModule extends PLModule
             header('Last-Modified:' . gmdate('D, d M Y H:i:s') . ' GMT');
             header('Cache-Control: no-cache, must-revalidate');
             header('Pragma: no-cache');
-            readfile(dirname(__FILE__).'/../htdocs.net/images/dflt_carre.jpg');
+            readfile(dirname(__FILE__).'/../htdocs/images/dflt_carre.jpg');
         }
 
         exit;
@@ -139,39 +212,42 @@ class XnetGrpModule extends PLModule
 
         if (Post::has('submit')) {
             if (S::has_perms()) {
-                if (Post::get('mail_domain') && (strstr(Post::get('mail_domain'), '.') === false)) {
-                    $page->trig_run("le domaine doit être un FQDN (aucune modif effectuée) !!!");
+                if (Post::v('mail_domain') && (strstr(Post::v('mail_domain'), '.') === false)) {
+                    $page->trig("le domaine doit être un FQDN (aucune modif effectuée) !!!");
+                    return;
                 }
                 XDB::execute(
                     "UPDATE  groupex.asso
                         SET  nom={?}, diminutif={?}, cat={?}, dom={?},
                              descr={?}, site={?}, mail={?}, resp={?},
                              forum={?}, mail_domain={?}, ax={?}, pub={?},
-                             sub_url={?}, inscriptible={?}
+                             sub_url={?}, inscriptible={?}, unsub_url={?}
                       WHERE  id={?}",
-                      Post::get('nom'), Post::get('diminutif'),
-                      Post::get('cat'), Post::getInt('dom'),
-                      Post::get('descr'), Post::get('site'),
-                      Post::get('mail'), Post::get('resp'),
-                      Post::get('forum'), Post::get('mail_domain'),
+                      Post::v('nom'), Post::v('diminutif'),
+                      Post::v('cat'), Post::i('dom'),
+                      Post::v('descr'), Post::v('site'),
+                      Post::v('mail'), Post::v('resp'),
+                      Post::v('forum'), Post::v('mail_domain'),
                       Post::has('ax'), Post::has('pub')?'private':'public',
-                      Post::get('sub_url'), Post::get('inscriptible'),
-                      $globals->asso('id'));
-                if (Post::get('mail_domain')) {
+                      Post::v('sub_url'), Post::v('inscriptible'),
+                      Post::v('unsub_url'),$globals->asso('id'));
+                if (Post::v('mail_domain')) {
                     XDB::execute('INSERT INTO virtual_domains (domain) VALUES({?})',
-                                           Post::get('mail_domain'));
+                                           Post::v('mail_domain'));
                 }
             } else {
                 XDB::execute(
                     "UPDATE  groupex.asso
                         SET  descr={?}, site={?}, mail={?}, resp={?},
-                             forum={?}, ax={?}, pub= {?}, sub_url={?}
+                             forum={?}, ax={?}, pub= {?}, sub_url={?},
+                             unsub_url={?}
                       WHERE  id={?}",
-                      Post::get('descr'), Post::get('site'),
-                      Post::get('mail'), Post::get('resp'),
-                      Post::get('forum'), Post::has('ax'),
+                      Post::v('descr'), Post::v('site'),
+                      Post::v('mail'), Post::v('resp'),
+                      Post::v('forum'), Post::has('ax'),
                       Post::has('pub')?'private':'public',
-                      Post::get('sub_url'), $globals->asso('id'));
+                      Post::v('sub_url'), Post::v('unsub_url'),
+                      $globals->asso('id'));
             }
 
             if ($_FILES['logo']['name']) {
@@ -183,7 +259,7 @@ class XnetGrpModule extends PLModule
                                         $globals->asso('id'));
             }
 
-            redirect('../'.Post::get('diminutif', $globals->asso('diminutif')).'/edit');
+            pl_redirect('../'.Post::v('diminutif', $globals->asso('diminutif')).'/edit');
         }
 
         if (S::has_perms()) {
@@ -197,24 +273,22 @@ class XnetGrpModule extends PLModule
     {
         global $globals;
 
-        require_once 'lists.inc.php';
-
         new_groupadmin_page('xnet/groupe/mail.tpl');
-        $client =& lists_xmlrpc(S::v('uid'),
-                                S::v('password'),
-                                $globals->asso('mail_domain'));
-        $page->assign('listes', $client->get_lists());
+        $mmlist = new MMList(S::v('uid'), S::v('password'),
+                           $globals->asso('mail_domain'));
+        $page->assign('listes', $mmlist->get_lists());
 
         if (Post::has('send')) {
-            $from  = Post::get('from');
-            $sujet = Post::get('sujet');
-            $body  = Post::get('body');
+            $from  = Post::v('from');
+            $sujet = Post::v('sujet');
+            $body  = Post::v('body');
 
-            $mls = array_keys(Env::getMixed('ml', array()));
+            $mls = array_keys(Env::v('ml', array()));
+            $mbr = array_keys(Env::v('membres', array()));
 
-            require_once 'xnet/mail.inc.php';
-            $tos = get_all_redirects(Post::has('membres'), $mls, $client);
-            send_xnet_mails($from, $sujet, $body, $tos, Post::get('replyto'));
+            require_once dirname(__FILE__) . '/xnetgrp/mail.inc.php';
+            $tos = get_all_redirects($mbr,  $mls, $mmlist);
+            send_xnet_mails($from, $sujet, $body, $tos, Post::v('replyto'), $_FILES['uploaded']);
             $page->kill("Mail envoyé !");
             $page->assign('sent', true);
         }
@@ -223,60 +297,55 @@ class XnetGrpModule extends PLModule
     function handler_annuaire(&$page)
     {
         global $globals;
+        new_annu_page('xnet/groupe/annuaire.tpl');
 
-        define('NB_PER_PAGE', 25);
-
-        if ($globals->asso('pub') == 'public') {
-            new_group_page('xnet/groupe/annuaire.tpl');
-        } else {
-            new_groupadmin_page('xnet/groupe/annuaire.tpl');
-        }
-
-        $page->assign('admin', may_update());
-
-        switch (Env::get('order')) {
+        $sort = Env::v('order');
+        switch (Env::v('order')) {
             case 'promo'    : $group = 'promo';    $tri = 'promo_o DESC, nom, prenom'; break;
             case 'promo_inv': $group = 'promo';    $tri = 'promo_o, nom, prenom'; break;
             case 'alpha_inv': $group = 'initiale'; $tri = 'nom DESC, prenom DESC, promo'; break;
-            default         : $group = 'initiale'; $tri = 'nom, prenom, promo';
+            default         : $group = 'initiale'; $tri = 'nom, prenom, promo'; $sort = 'alpha';
         }
+        $page->assign('sort', $sort);
 
-        if ($group == 'initiale')
+        if ($group == 'initiale') {
             $res = XDB::iterRow(
                         'SELECT  UPPER(SUBSTRING(
-                                     IF(m.origine="X", IF(u.nom_usage<>"", u.nom_usage, u.nom),m.nom),
+                                    IF(m.origine="X", IF(u.nom_usage<>"", u.nom_usage, u.nom),m.nom),
                                      1, 1)) as letter, COUNT(*)
                            FROM  groupex.membres AS m
                       LEFT JOIN  auth_user_md5   AS u ON ( u.user_id = m.uid )
                           WHERE  asso_id = {?}
                        GROUP BY  letter
                        ORDER BY  letter', $globals->asso('id'));
-        else
+        } else {
             $res = XDB::iterRow(
-                        'SELECT  IF(m.origine="X",u.promo,"extérieur") AS promo,
+                        'SELECT  IF(m.origine="X",u.promo,
+                                    IF(m.origine="ext", "extérieur", "personne morale")) AS promo,
                                  COUNT(*), IF(m.origine="X",u.promo,"") AS promo_o
                            FROM  groupex.membres AS m
                       LEFT JOIN  auth_user_md5   AS u ON ( u.user_id = m.uid )
                           WHERE  asso_id = {?}
                        GROUP BY  promo
                        ORDER BY  promo_o DESC', $globals->asso('id'));
-
+        }
         $alphabet = array();
         $nb_tot = 0;
         while (list($char, $nb) = $res->next()) {
             $alphabet[] = $char;
             $nb_tot += $nb;
-            if (Env::has($group) && $char == strtoupper(Env::get($group))) {
+            if (Env::has($group) && $char == strtoupper(Env::v($group))) {
                 $tot = $nb;
             }
         }
         $page->assign('group', $group);
-        $page->assign('request_group', Env::get($group));
+        $page->assign('request_group', Env::v($group));
+        $page->assign('only_admin', Env::has('admin'));
         $page->assign('alphabet', $alphabet);
         $page->assign('nb_tot',   $nb_tot);
 
-        $ofs   = Env::getInt('offset');
-        $tot   = Env::get($group) ? $tot : $nb_tot;
+        $ofs   = Env::i('offset');
+        $tot   = Env::v($group) ? $tot : $nb_tot;
         $nbp   = intval(($tot-1)/NB_PER_PAGE);
         $links = array();
         if ($ofs) {
@@ -296,42 +365,93 @@ class XnetGrpModule extends PLModule
         if (Env::has('initiale')) {
             $ini = 'AND IF(m.origine="X",
                            IF(u.nom_usage<>"", u.nom_usage, u.nom),
-                           m.nom) LIKE "'.addslashes(Env::get('initiale')).'%"';
+                           m.nom) LIKE "'.addslashes(Env::v('initiale')).'%"';
         } elseif (Env::has('promo')) {
-            $ini = 'AND IF(m.origine="X", u.promo, "extérieur") = "'
-                 .addslashes(Env::get('promo')).'"';
+            $ini = 'AND IF(m.origine="X", u.promo, IF(m.origine="ext", "extérieur", "personne morale")) = "'
+                 .addslashes(Env::v('promo')).'"';
+        } elseif (Env::has('admin')) {
+            $ini = 'AND m.perms = "admin"';
         }
 
         $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', u.promo, IF(m.origine='ext', 'extérieur', 'personne morale')) AS promo,
                            IF(m.origine='X',u.promo,'') AS promo_o,
-                           IF(m.origine='X',a.alias,m.email) AS email,
-                           IF(m.origine='X',FIND_IN_SET('femme', u.flags),0) AS femme,
+                           IF(m.origine='X' AND u.perms != 'pending',a.alias,m.email) AS email,
+                           IF(m.origine='X',FIND_IN_SET('femme', u.flags), m.sexe) AS femme,
                            m.perms='admin' AS admin,
                            m.origine='X' AS x,
+                           u.perms!='pending' AS inscrit,
                            m.uid
                      FROM  groupex.membres AS m
                 LEFT JOIN  auth_user_md5   AS u ON ( u.user_id = m.uid )
                 LEFT JOIN  aliases         AS a ON ( a.id = m.uid AND a.type='a_vie' )
                     WHERE  m.asso_id = {?} $ini
+                           AND (m.origine != 'X' OR u.perms != 'pending' OR m.email IS NOT NULL)
                  ORDER BY  $tri
                     LIMIT  {?},{?}", $globals->asso('id'), $ofs*NB_PER_PAGE, NB_PER_PAGE);
-
         $page->assign('ann', $ann);
     }
 
-    function handler_subscribe(&$page, $u = null)
+    function handler_trombi(&$page, $num = 1)
     {
         global $globals;
+        new_annu_page('xnet/groupe/trombi.tpl');
+        
+        $page->assign('urlmainsite', "https://www.polytechnique.org/");
+        $trombi = new Trombi(array($this, '_trombi_getlist'));
+        $trombi->hidePromo();
+        $trombi->setAdmin();
+        $page->assign_by_ref('trombi', $trombi);
+    }
 
-        $page->changeTpl('xnet/groupe/inscrire.tpl');
+    function _trombi_getlist($offset, $limit)
+    {
+        global $globals;
+        $where  = "WHERE m.asso_id= '".addslashes($globals->asso('id'))."'";
 
-        $page->useMenu();
-        $page->setType($globals->asso('cat'));
-        $page->assign('asso', $globals->asso());
-        $page->assign('admin', may_update());
+        $res = XDB::query(
+                "SELECT  COUNT(*)
+                   FROM  auth_user_md5 AS u
+             RIGHT JOIN  photo         AS p ON u.user_id=p.uid
+             INNER JOIN  groupex.membres AS m ON (m.uid = u.user_id)
+             $where");
+        $pnb = $res->fetchOneCell();
+        
+        $res = XDB::query("SELECT  promo, user_id, a.alias AS forlife,
+                         IF (nom_usage='', u.nom, nom_usage) AS nom, u.prenom
+                   FROM  photo         AS p
+             INNER JOIN  auth_user_md5 AS u ON u.user_id=p.uid
+             INNER JOIN  aliases       AS a ON ( u.user_id=a.id AND a.type='a_vie' )
+             INNER JOIN  groupex.membres AS m ON (m.uid = u.user_id)
+                  $where
+               ORDER BY  promo, u.nom, u.prenom LIMIT {?}, {?}", $offset*$limit, $limit);
+        
+        return array($pnb, $res->fetchAllAssoc());
+    }
+    
+    function handler_vcard(&$page, $photos = null)
+    {
+        global $globals;
+
+        if (($globals->asso('pub') == 'public' && is_member()) || may_update()) {
+            $res = XDB::query('SELECT uid
+                                 FROM groupex.membres
+                                WHERE asso_id = {?}', $globals->asso('id'));
+            require_once('vcard.inc.php');
+            $vcard = new VCard($res->fetchColumn(), $photos == 'photos', 'Membre du groupe ' . $globals->asso('nom'));
+            $vcard->do_page($page);
+        } else {
+            return PL_NOTALLOWED;
+        }
+    }
+
+    function handler_subscribe(&$page, $u = null)
+    {
+        global $globals;
+
+        new_group_open_page('xnet/groupe/inscrire.tpl');
 
         if (!$globals->asso('inscriptible'))
                 $page->kill("Il n'est pas possible de s'inscire en ligne à ce "
@@ -355,15 +475,15 @@ class XnetGrpModule extends PLModule
                                             $u, $globals->asso('id'));
                 $n   = $res->fetchOneCell();
                 if ($n) {
-                    $page->trig_run("$prenom $nom est déjà membre du groupe !");
+                    $page->kill("$prenom $nom est déjà membre du groupe !");
+                    return;
                 }
                 elseif (Env::has('accept'))
                 {
                     XDB::execute("INSERT INTO groupex.membres
-                                            VALUES ({?}, {?}, 'membre', 'X', NULL, NULL, NULL, NULL)",
+                                            VALUES ({?}, {?}, 'membre', 'X', NULL, NULL, NULL, NULL, NULL)",
                                             $globals->asso('id'), $uid);
-                    require_once 'diogenes/diogenes.hermes.inc.php';
-                    $mailer = new HermesMailer();
+                    $mailer = new PlMailer();
                     $mailer->addTo("$u@polytechnique.org");
                     $mailer->setFrom('"'.S::v('prenom').' '.S::v('nom')
                                      .'" <'.S::v('forlife').'@polytechnique.org>');
@@ -381,13 +501,12 @@ class XnetGrpModule extends PLModule
                 }
                 elseif (Env::has('refuse'))
                 {
-                    require_once 'diogenes/diogenes.hermes.inc.php';
-                    $mailer = new HermesMailer();
+                    $mailer = new PlMailer();
                     $mailer->addTo("$u@polytechnique.org");
                     $mailer->setFrom('"'.S::v('prenom').' '.S::v('nom')
                                      .'" <'.S::v('forlife').'@polytechnique.org>');
                     $mailer->setSubject('['.$globals->asso('nom').'] Demande d\'inscription annulée');
-                    $mailer->setTxtBody(Env::get('motif'));
+                    $mailer->setTxtBody(Env::v('motif'));
                     $mailer->send();
                     $page->kill("la demande $prenom $nom a bien été refusée");
                 } else {
@@ -440,103 +559,60 @@ class XnetGrpModule extends PLModule
                         ." résoudre ce problème.\n";
             }
 
-            require_once 'diogenes/diogenes.hermes.inc.php';
-            $mailer = new HermesMailer();
+            $mailer = new PlMailer();
             $mailer->addTo($to);
             $mailer->setFrom('"'.S::v('prenom').' '.S::v('nom')
                              .'" <'.S::v('forlife').'@polytechnique.org>');
             $mailer->setSubject('['.$globals->asso('nom').'] Demande d\'inscription');
-            $mailer->setTxtBody(Post::get('message').$append);
+            $mailer->setTxtBody(Post::v('message').$append);
             $mailer->send();
         }
     }
 
-    function handler_paiement(&$page)
+    function handler_change_rights(&$page)
     {
-        global $globals;
-
-        new_group_page('xnet/groupe/telepaiement.tpl');
-
-        $res = XDB::query(
-                "SELECT id, text
-                  FROM {$globals->money->mpay_tprefix}paiements
-                 WHERE asso_id = {?} AND NOT FIND_IN_SET(flags, 'old')
-              ORDER BY id DESC", $globals->asso('id'));
-        $tit = $res->fetchAllAssoc();
-        $page->assign('titres', $tit);
-
-        $order = Env::get('order', 'timestamp');
-        $orders = array('timestamp', 'nom', 'promo', 'montant');
-        if (!in_array($order, $orders)) {
-            $order = 'timestamp';
-        }
-        $inv_order = Env::get('order_inv', 0);
-        $page->assign('order', $order);
-        $page->assign('order_inv', !$inv_order);
-
-        if ($order == 'timestamp') {
-            $inv_order = !$inv_order;
-        }
-
-        if ($inv_order) {
-            $inv_order = ' DESC';
-        } else {
-            $inv_order = '';
-        }
-        if ($order == 'montant') {
-            $order = 'LENGTH(montant) '.$inv_order.', montant';
-        }
-
-        $orderby = 'ORDER BY '.$order.$inv_order;
-        if ($order != 'nom') {
-            $orderby .= ', nom'; $inv_order = '';
-        }
-        $orderby .= ', prenom'.$inv_order;
-        if ($order != 'timestamp') {
-            $orderby .= ', timestamp DESC';
-        }
-
-        if (may_update()) {
-            $trans = array();
-            foreach($tit as $foo) {
-                $pid = $foo['id'];
-                $res = XDB::query(
-                        "SELECT  IF(u.nom_usage<>'', u.nom_usage, u.nom) AS nom,
-                                 u.prenom, u.promo, a.alias, timestamp AS `date`, montant
-                           FROM  {$globals->money->mpay_tprefix}transactions AS t
-                     INNER JOIN  auth_user_md5  AS u ON ( t.uid = u.user_id )
-                     INNER JOIN  aliases        AS a ON ( t.uid = a.id AND a.type='a_vie' )
-                          WHERE  ref = {?} ".$orderby, $pid);
-                $trans[$pid] = $res->fetchAllAssoc();
-                $sum = 0;
-                foreach ($trans[$pid] as $i => $t) {
-                    $sum += strtr(substr($t['montant'], 0, strpos($t['montant'], 'EUR')), ',', '.');
-                }
-                $trans[$pid][] = array('nom' => 'somme totale',
-                                       'montant' => strtr($sum, '.', ',').' EUR');
+        if (Env::has('right') && (may_update() || S::has('suid'))) {
+            switch (Env::v('right')) {
+              case 'admin':              
+                XnetSession::killSuid();
+                break;
+              case 'anim':
+                XnetSession::doSelfSuid();
+                may_update(true);
+                is_member(true);
+                break;
+              case 'member':
+                XnetSession::doSelfSuid();  
+                may_update(false, true);
+                is_member(true);
+                break;
+              case 'logged':
+                XnetSession::doSelfSuid();
+                may_update(false, true);
+                is_member(false, true);
+                break;
             }
-            $page->assign('trans', $trans);
         }
+        pl_redirect("");
     }
 
     function handler_admin_annuaire(&$page)
     {
         global $globals;
 
-        require_once 'lists.inc.php';
         require_once 'xnet/mail.inc.php';
 
         new_groupadmin_page('xnet/groupe/annuaire-admin.tpl');
-        $client =& lists_xmlrpc(S::v('uid'), S::v('password'),
-                                $globals->asso('mail_domain'));
-        $lists  = $client->get_lists();
+        $mmlist = new MMList(S::v('uid'), S::v('password'),
+                             $globals->asso('mail_domain'));
+        $lists  = $mmlist->get_lists();
         if (!$lists) $lists = array();
         $listes = array_map(create_function('$arr', 'return $arr["list"];'), $lists);
 
         $subscribers = array();
 
         foreach ($listes as $list) {
-            list(,$members) = $client->get_members($list);
+            list(,$members) = $mmlist->get_members($list);
             $mails = array_map(create_function('$arr', 'return $arr[1];'), $members);
             $subscribers = array_unique(array_merge($subscribers, $mails));
         }
@@ -572,6 +648,7 @@ class XnetGrpModule extends PLModule
         global $globals;
 
         new_groupadmin_page('xnet/groupe/membres-add.tpl');
+        $page->addJsLink('ajax.js');
 
         if (is_null($email)) {
             return;
@@ -591,77 +668,158 @@ class XnetGrpModule extends PLModule
                             FROM  auth_user_md5 AS u
                       INNER JOIN  aliases       AS a ON (u.user_id = a.id)
                            WHERE  a.alias={?}', $globals->asso('id'), $forlife);
-                global $platal;
-                redirect("{$globals->baseurl}/{$platal->ns}member/$email");
+                pl_redirect("member/$email");
             } else {
                 $page->trig($email." n'est pas un alias polytechnique.org valide");
             }
         } else {
             if (isvalid_email($email)) {
-                $res = XDB::query('SELECT MAX(uid)+1 FROM groupex.membres');
-                $uid = max(intval($res->fetchOneCell()), 50001);
-                XDB::execute('INSERT INTO  groupex.membres (uid,asso_id,origine,email)
-                                        VALUES({?},{?},"ext",{?})', $uid,
-                                        $globals->asso('id'), $email);
-                global $platal;
-                redirect("{$globals->baseurl}/{$platal->ns}member/$email");
+                if (Env::v('x') && Env::has('userid') && Env::i('userid')) {
+                    $uid = Env::i('userid');
+                    $res = XDB::query("SELECT *
+                                         FROM auth_user_md5
+                                        WHERE user_id = {?} AND perms = 'pending'", $uid);
+                    if ($res->numRows() == 1) {
+                        XDB::execute('INSERT INTO groupex.membres (uid, asso_id, origine, email)
+                                           VALUES ({?}, {?}, "X", {?})',
+                                               $uid, $globals->asso('id'), $email);
+                        if (Env::v('market')) {
+                            $res   = XDB::query('SELECT COUNT(*)
+                                                   FROM register_marketing
+                                                  WHERE uid={?} AND email={?}', $uid, $email);
+                            if (!$res->fetchOneCell()) {
+                                XDB::execute("INSERT INTO  register_marketing (uid,sender,email,date,last,nb,type,hash)
+                                                   VALUES  ({?}, {?}, {?}, NOW(), 0, 0, {?}, '')",
+                                             $uid, S::v('uid'), $email, Env::v('market_from')); 
+                                require_once('validations.inc.php');
+                                $req = new MarkReq(S::v('uid'), $uid, $email, Env::v('market_from') == 'user');
+                                $req->submit();
+                            }            
+                        }
+                        pl_redirect("member/$email");
+                    }
+                    $page->trig("Utilisateur invalide");
+                } else {
+                    $res = XDB::query('SELECT MAX(uid)+1 FROM groupex.membres');
+                    $uid = max(intval($res->fetchOneCell()), 50001);
+                    XDB::execute('INSERT INTO  groupex.membres (uid,asso_id,origine,email)
+                                            VALUES({?},{?},"ext",{?})', $uid,
+                                            $globals->asso('id'), $email);
+                    pl_redirect("member/$email");
+                }
             } else {
                 $page->trig("« <strong>$email</strong> » n'est pas une adresse mail valide");
             }
         }
     }
 
-    function handler_admin_member_del(&$page, $user = null)
+    function handler_admin_member_new_ajax(&$page)
     {
-        global $globals;
-
-        new_groupadmin_page('xnet/groupe/membres-del.tpl');
-        $user = get_infos($user);
-        if (empty($user)) {
-            return PL_NOT_FOUND;
+        header('Content-Type: text/html; charset="iso-8859-15"');
+        $page->changeTpl('xnet/groupe/membres-new-search.tpl', NO_SKIN);
+        list($nom, $prenom) = str_replace(array('-', ' ', "'"), '%', array(Env::v('nom'), Env::v('prenom')));
+        $where = "perms = 'pending'";
+        if (!empty($nom)) {
+            $where .= " AND nom LIKE '%$nom%'";
         }
-        $page->assign('user', $user);
-
-        if (!Post::has('confirm')) {
+        if (!empty($prenom)) {
+            $where .= " AND prenom LIKE '%$prenom%'";
+        }
+        if (preg_match('/^[0-9]{4}$/', Env::v('promo'))) {
+            $where .= " AND promo = " . Env::i('promo');
+        } elseif (Env::has('promo')) {
             return;
         }
+        $res = XDB::iterator("SELECT user_id, nom, prenom, promo
+                                FROM auth_user_md5
+                               WHERE $where");
+        if ($res->total() < 30) {
+            $page->assign("choix", $res);
+        }
+    }
 
+    function unsubscribe(&$user)
+    {
+        global $globals, $page;
         XDB::execute(
                 "DELETE FROM  groupex.membres WHERE uid={?} AND asso_id={?}",
                 $user['uid'], $globals->asso('id'));
 
-        // don't unsubscribe email from list if other user use same email
         $user_same_email = get_infos($user['email']);
+        $domain = $globals->asso('mail_domain');
+
+        if (!$domain || !empty($user_same_email)) {
+            return true;
+        }
+
+        $mmlist = new MMList(S::v('uid'), S::v('password'), $domain);
+        $listes = $mmlist->get_lists($user['email2']);
 
-        if (($domain = $globals->asso('mail_domain')) && empty($user_same_email)) {
-
-            require 'lists.inc.php';
-            $client =& lists_xmlrpc(S::v('uid'), S::v('password'), $domain);
-            $listes = $client->get_lists($user['email2']);
-
-            foreach ($listes as $liste) {
-                if ($liste['sub'] == 2) {
-                    $client->mass_unsubscribe($liste['list'], Array($user['email2']));
-                    $page->trig("{$user['prenom']} {$user['nom']} a été"
-                                ." désinscrit de {$liste['list']}");
-                } elseif ($liste['sub']) {
-                    $page->trig("{$user['prenom']} {$user['nom']} a une"
-                                ." demande d'inscription en cours sur la"
-                                ." liste {$liste['list']}@ !");
+        $may_update = may_update();
+        $warning    = false;
+        foreach ($listes as $liste) {
+            if ($liste['sub'] == 2) {
+                if ($may_update) {
+                    $mmlist->mass_unsubscribe($liste['list'], Array($user['email2']));
+                } else {
+                    $mmlist->unsubscribe($liste['list']);
                 }
+            } elseif ($liste['sub']) {
+                $page->trig("{$user['prenom']} {$user['nom']} a une"
+                            ." demande d'inscription en cours sur la"
+                            ." liste {$liste['list']}@ !");
+                $warning = true;
             }
+        }
 
-            XDB::execute(
-                    "DELETE FROM  virtual_redirect
-                           USING  virtual_redirect
-                      INNER JOIN  virtual USING(vid)
-                           WHERE  redirect={?} AND alias LIKE {?}", $user['email'], '%@'.$domain);
-            if (mysql_affected_rows()) {
-                $page->trig("{$user['prenom']} {$user['nom']} a été désabonné des alias du groupe !");
-            }
+        XDB::execute(
+                "DELETE FROM  virtual_redirect
+                       USING  virtual_redirect
+                  INNER JOIN  virtual USING(vid)
+                       WHERE  redirect={?} AND alias LIKE {?}", $user['email'], '%@'.$domain);
+        return !$warning;
+    }
+
+    function handler_unsubscribe(&$page)
+    {
+        new_group_page('xnet/groupe/membres-del.tpl');
+        $user = get_infos(S::v('forlife'));
+        if (empty($user)) {
+            return PL_NOT_FOUND;
+        }
+        $page->assign('self', true);
+        $page->assign('user', $user);
+
+        if (!Post::has('confirm')) {
+            return;
+        }
+
+        if ($this->unsubscribe($user)) {
+            $page->trig('Vous avez été désinscrit du groupe avec succès');
+        } else {
+            $page->trig('Vous avez été désinscrit du groupe, mais des erreurs se sont produites lors des désinscriptions des alias et des mailing-lists.');
+        }
+        $page->assign('is_member', is_member(true));
+    }
+
+    function handler_admin_member_del(&$page, $user = null)
+    {
+        new_groupadmin_page('xnet/groupe/membres-del.tpl');
+        $user = get_infos($user);
+        if (empty($user)) {
+            return PL_NOT_FOUND;
         }
+        $page->assign('user', $user);
 
-        $page->trig("{$user['prenom']} {$user['nom']} a été retiré du groupe !");
+        if (!Post::has('confirm')) {
+            return;
+        }
+
+        if ($this->unsubscribe($user)) {
+            $page->trig("{$user['prenom']} {$user['nom']} a été désabonné du groupe !");
+        } else {
+            $page->trig("{$user['prenom']} {$user['nom']} a été désabonné du groupe, mais des erreurs subsistent !");
+        }
     }
 
     function handler_admin_member(&$page, $user)
@@ -675,71 +833,84 @@ class XnetGrpModule extends PLModule
             return PL_NOT_FOUND;
         }
 
-        require 'lists.inc.php';
-        $client =& lists_xmlrpc(S::v('uid'), S::v('password'),
-                                $globals->asso('mail_domain'));
+        $mmlist = new MMList(S::v('uid'), S::v('password'),
+                             $globals->asso('mail_domain'));
 
         if (Post::has('change')) {
+            $email_changed = ($user['origine'] != 'X' && strtolower($user['email']) != strtolower(Post::v('email')));
+            $from_email = $user['email'];
             if ($user['origine'] != 'X') {
+                $user['nom']     = Post::v('nom');
+                $user['prenom']  = (Post::v('origine') == 'ext') ? Post::v('prenom') : '';
+                $user['sexe']    = (Post::v('origine') == 'ext') ? Post::v('sexe') : 0;
+                $user['origine'] = Post::v('origine');
                 XDB::query('UPDATE groupex.membres
-                                         SET prenom={?}, nom={?}, email={?}
-                                       WHERE uid={?} AND asso_id={?}',
-                                     Post::get('prenom'), Post::get('nom'),
-                                     Post::get('email'), $user['uid'],
-                                     $globals->asso('id'));
-                $user['nom']    = Post::get('nom');
-                $user['prenom'] = Post::get('prenom');
-                $user['email']  = Post::get('email');
-                $user['email2'] = Post::get('email');
+                               SET prenom={?}, nom={?}, email={?}, sexe={?}, origine={?}
+                             WHERE uid={?} AND asso_id={?}',
+                           $user['prenom'], $user['nom'], Post::v('email'),
+                           $user['sexe'], $user['origine'], $user['uid'],
+                           $globals->asso('id'));
+                $user['email']   = Post::v('email');
+                $user['email2']  = Post::v('email');
             }
 
-            $perms = Post::getInt('is_admin');
+            $perms = Post::i('is_admin');
             if ($user['perms'] != $perms) {
                 XDB::query('UPDATE groupex.membres SET perms={?}
-                                      WHERE uid={?} AND asso_id={?}',
-                                      $perms ? 'admin' : 'membre',
-                                      $user['uid'], $globals->asso('id'));
+                             WHERE uid={?} AND asso_id={?}',
+                            $perms ? 'admin' : 'membre',
+                            $user['uid'], $globals->asso('id'));
                 $user['perms'] = $perms;
                 $page->trig('permissions modifiées');
             }
 
-            foreach (Env::getMixed('ml1', array()) as $ml => $state) {
+            foreach (Env::v('ml1', array()) as $ml => $state) {
                 $ask = empty($_REQUEST['ml2'][$ml]) ? 0 : 2;
-                if ($ask == $state) continue;
+                if ($ask == $state) {
+                    if ($state && $email_changed) {
+                        $mmlist->replace_email($ml, $from_email, $user['email2']);
+                        $page->trig("L'abonnement de {$user['prenom']} {$user['nom']} à $ml@ a été mis à jour");
+                    }
+                    continue;
+                }
                 if ($state == '1') {
                     $page->trig("{$user['prenom']} {$user['nom']} a "
                                ."actuellement une demande d'inscription en "
                                ."cours sur <strong>$ml@</strong> !!!");
                 } elseif ($ask) {
-                    $client->mass_subscribe($ml, Array($user['email2']));
+                    $mmlist->mass_subscribe($ml, Array($user['email2']));
                     $page->trig("{$user['prenom']} {$user['nom']} a été abonné à $ml@");
                 } else {
-                    $client->mass_unsubscribe($ml, Array($user['email2']));
+                    if ($email_changed) {
+                        $mmlist->mass_unsubscribe($ml, Array($from_email));
+                    } else {
+                        $mmlist->mass_unsubscribe($ml, Array($user['email2']));
+                    }
                     $page->trig("{$user['prenom']} {$user['nom']} a été désabonné de $ml@");
                 }
             }
 
-            foreach (Env::getMixed('ml3', array()) as $ml => $state) {
+            foreach (Env::v('ml3', array()) as $ml => $state) {
                 $ask = !empty($_REQUEST['ml4'][$ml]);
                 if($state == $ask) continue;
                 if($ask) {
                     XDB::query("INSERT INTO  virtual_redirect (vid,redirect)
-                                               SELECT  vid,{?} FROM virtual WHERE alias={?}",
-                                         $user['email'], $ml);
+                                     SELECT  vid,{?} FROM virtual WHERE alias={?}",
+                               $user['email'], $ml);
                     $page->trig("{$user['prenom']} {$user['nom']} a été abonné à $ml");
                 } else {
                     XDB::query("DELETE FROM  virtual_redirect
-                                                USING  virtual_redirect
-                                           INNER JOIN  virtual USING(vid)
-                                                WHERE  redirect={?} AND alias={?}",
-                                         $user['email'], $ml);
+                                      USING  virtual_redirect
+                                 INNER JOIN  virtual USING(vid)
+                                      WHERE  redirect={?} AND alias={?}",
+                               $user['email'], $ml);
                     $page->trig("{$user['prenom']} {$user['nom']} a été désabonné de $ml");
                 }
             }
         }
 
         $page->assign('user', $user);
-        $listes = $client->get_lists($user['email2']);
+        $listes = $mmlist->get_lists($user['email2']);
         $page->assign('listes', $listes);
 
         $res = XDB::query(
@@ -750,6 +921,182 @@ class XnetGrpModule extends PLModule
                 $user['email'], '%@'.$globals->asso('mail_domain'));
         $page->assign('alias', $res->fetchAllAssoc());
     }
+
+    function handler_rss(&$page, $user = null, $hash = null)
+    {
+        global $globals;
+        require_once('rss.inc.php');
+        require_once('url_catcher.inc.php');
+        $uid = init_rss('xnet/groupe/announce-rss.tpl', $user, $hash, false);
+        $page->register_modifier('url_catcher', 'url_catcher');
+
+        if ($uid) {
+            $rss = XDB::iterator("SELECT a.id, a.titre, a.texte, a.contacts, a.create_date,
+                                         IF(u2.nom_usage != '', u2.nom_usage, u2.nom) AS nom, u2.prenom, u2.promo
+                                   FROM auth_user_md5 AS u
+                             INNER JOIN groupex.announces AS a ON ( (a.promo_min = 0 OR a.promo_min <= u.promo)
+                                                                  AND (a.promo_max = 0 OR a.promo_max <= u.promo))
+                             INNER JOIN auth_user_md5 AS u2 ON (u2.user_id = a.user_id)
+                             WHERE u.user_id = {?} AND peremption >= NOW() AND a.asso_id = {?}",
+                                   $uid, $globals->asso('id'));
+        } else {
+            $rss = XDB::iterator("SELECT a.id, a.titre, a.texte, a.create_date,
+                                         IF(u.nom_usage != '', u.nom_usage, u.nom) AS nom, u.prenom, u.promo
+                                    FROM groupex.announces AS a
+                             INNER JOIN auth_user_md5 AS u USING(user_id)
+                             WHERE FIND_IN_SET(a.flags, 'public') AND peremption >= NOW() AND a.asso_id = {?}",
+                                  $globals->asso('id'));
+        }
+        $page->assign('asso', $globals->asso());
+        $page->assign('rss', $rss);
+    }
+
+    function handler_edit_announce(&$page, $aid = null)
+    {
+        global $globals, $platal;
+        new_groupadmin_page('xnet/groupe/announce-edit.tpl');
+        $page->assign('new', is_null($aid));
+        $art = array();
+
+        if (Post::v('valid') == 'Visualiser' || Post::v('valid') == 'Enregistrer') {
+            if (!is_null($aid)) {
+                $art['id'] = $aid;
+            }
+            $art['titre']      = Post::v('titre');
+            $art['texte']      = Post::v('texte');
+            $art['contacts']   = Post::v('contacts');
+            $art['promo_min']  = Post::i('promo_min');
+            $art['promo_max']  = Post::i('promo_max');
+            $art['nom']        = S::v('nom');
+            $art['prenom']     = S::v('prenom');
+            $art['promo']      = S::v('promo');
+            $art['forlife']    = S::v('forlife');
+            $art['peremption'] = Post::v('peremption');
+            $art['public']     = Post::has('public');
+            $art['xorg']       = Post::has('xorg');
+            $art['nl']         = Post::has('nl');
+            $art['event']      = Post::v('event');
+
+            $art['contact_html'] = $art['contacts'];
+            if ($art['event']) {
+                $art['contact_html'] .= "\n{$globals->baseurl}/{$platal->ns}events/sub/{$art['event']}";
+            }
+
+            if (!$art['public'] &&
+                (($art['promo_min'] > $art['promo_max'] && $art['promo_max'] != 0) ||
+                 ($art['promo_min'] != 0 && ($art['promo_min'] <= 1900 || $art['promo_min'] >= 2020)) ||
+                 ($art['promo_max'] != 0 && ($art['promo_max'] <= 1900 || $art['promo_max'] >= 2020))))
+            {
+                $page->trig("L'intervalle de promotions est invalide");
+                Post::kill('valid');
+            }
+        }
+
+        if (Post::v('valid') == 'Enregistrer') {
+            $promo_min = ($art['public'] ? 0 : $art['promo_min']);
+            $promo_max = ($art['public'] ? 0 : $art['promo_max']);
+            if (is_null($aid)) {
+                XDB::query("INSERT INTO groupex.announces
+                                 (user_id, asso_id, create_date, titre, texte, contacts,
+                                   peremption, promo_min, promo_max, flags)
+                            VALUES ({?}, {?}, NOW(), {?}, {?}, {?}, {?}, {?}, {?}, {?})",
+                           S::i('uid'), $globals->asso('id'), $art['titre'], $art['texte'], $art['contact_html'],
+                           $art['peremption'], $promo_min, $promo_max, $art['public'] ? 'public' : '');
+                $aid = XDB::insertId();
+                if ($art['xorg']) {
+                    require_once('validations.inc.php');
+                    require_once('url_catcher.inc.php');
+                    $article = new EvtReq("[{$globals->asso('nom')}] " . $art['titre'],
+                                    url_catcher($art['texte'] . (!empty($art['contact_html']) ? "\n\nContacts :\n" . $art['contact_html'] : "")),
+                                    $art['promo_min'], $art['promo_max'], $art['peremption'], "", S::v('uid'));
+                    $article->submit();
+                    $page->trig("L'affichage sur la page d'accueil de Polytechnique.org est en attente de validation");
+                }
+                if ($art['nl']) {
+                    require_once('validations.inc.php');
+                    $article = new NLReq(S::v('uid'), $globals->asso('nom') . " : " .$art['titre'],
+                                         $art['texte'], $art['contact_html']);
+                    $article->submit();
+                    $page->trig("La parution dans la Lettre Mensuelle est en attente de validation");
+                }
+            } else {
+                XDB::query("UPDATE groupex.announces
+                               SET titre={?}, texte={?}, contacts={?}, peremption={?},
+                                   promo_min={?}, promo_max={?}, flags={?}
+                             WHERE id={?} AND asso_id={?}",
+                           $art['titre'], $art['texte'], $art['contacts'], $art['peremption'],
+                           $promo_min, $promo_max,  $art['public'] ? 'public' : '',
+                           $art['id'], $globals->asso('id'));
+            }
+        }
+        if (Post::v('valid') == 'Enregistrer' || Post::v('valid') == 'Annuler') {
+            pl_redirect("");
+        } 
+
+        if (empty($art) && !is_null($aid)) {
+            $res = XDB::query("SELECT a.*, u.nom, u.prenom, u.promo, l.alias AS forlife,
+                                      FIND_IN_SET(a.flags, 'public') AS public
+                                 FROM groupex.announces AS a
+                           INNER JOIN auth_user_md5 AS u USING(user_id)
+                           INNER JOIN aliases AS l ON (l.id = u.user_id AND l.type = 'a_vie')
+                                WHERE asso_id = {?} AND a.id = {?}",
+                              $globals->asso('id'), $aid);
+            if ($res->numRows()) {
+                $art = $res->fetchOneAssoc();
+                $art['contact_html'] = $art['contacts'];
+            } else {
+                $page->kill("Aucun article correspond à l'identifiant indiqué");
+            }
+        }
+
+        $select = '';
+        for ($i = 1 ; $i < 30 ; $i++) {
+            $time    = time() + 3600 * 24 * $i;
+            $p_stamp = date('Ymd', $time);
+            $year    = date('Y',   $time);
+            $month   = date('m',   $time);
+            $day     = date('d',   $time);
+
+            $select .= "<option value=\"$p_stamp\"";
+            if ($p_stamp == strtr(@$art['peremption'], array("-" => ""))) {
+                $select .= " selected='selected'";
+            }
+            $select .= "> $day / $month / $year</option>\n";
+        }
+        $page->assign('select', $select);
+
+        if (is_null($aid)) {
+            $events = XDB::iterator("SELECT *
+                                      FROM groupex.evenements
+                                     WHERE asso_id = {?} AND archive = 0",
+                                   $globals->asso('id'));
+            if ($events->total()) {
+                $page->assign('events', $events);
+            }
+        } 
+
+        require_once('url_catcher.inc.php');
+        $art['contact_html'] = url_catcher($art['contact_html']);
+        $page->assign('art', $art);
+    }
+
+    function handler_admin_announce(&$page)
+    {
+        global $globals;
+        new_groupadmin_page('xnet/groupe/announce-admin.tpl');
+
+        if (Env::has('del')) {
+            XDB::execute("DELETE FROM groupex.announces
+                                WHERE id = {?} AND asso_id = {?}",
+                         Env::i('del'), $globals->asso('id'));
+        }
+        $res = XDB::iterator("SELECT a.id, a.titre, a.peremption, a.peremption < CURRENT_DATE() AS perime
+                                FROM groupex.announces AS a
+                                WHERE a.asso_id = {?}
+                             ORDER BY a.peremption DESC",
+                             $globals->asso('id'));
+        $page->assign('articles', $res);
+    }
 }
 
 ?>