X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetgrp.php;h=215f45b5fc7517a23c69b481817ba9af3994dbaa;hb=7996ae8cd41fbb3ccd748eaed71a50f866269c6e;hp=6c0a5da15805dabf53431c043d5e61256fc1f147;hpb=1fe46b8f16d9cc4762a387e3328a0db67574b25d;p=platal.git

diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php
index 6c0a5da..215f45b 100644
--- a/modules/xnetgrp.php
+++ b/modules/xnetgrp.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -66,50 +66,50 @@ class XnetGrpModule extends PLModule
 
         if (S::logged()) {
             if (Env::has('read')) {
-                XDB::query('DELETE #groupex#.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 ({?}, {?})',
+                XDB::query('DELETE  r.*
+                              FROM  group_announces_read AS r
+                        INNER JOIN  group_announces      AS a ON (a.id = r.announce_id)
+                             WHERE  expiration < CURRENT_DATE()');
+                XDB::query('INSERT INTO  group_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={?}',
+                XDB::query('DELETE FROM  group_announces_read
+                                  WHERE  announce_id = {?} AND uid = {?}',
                             Env::i('unread'), S::i('uid'));
                 pl_redirect("#art" . Env::i('unread'));
             }
             // XXX: Fix promo_min; promo_max
             $arts = XDB::iterator("SELECT  a.*, FIND_IN_SET('photo', a.flags) AS photo
-                                     FROM  #groupex#.announces AS a
-                                LEFT JOIN  #groupex#.announces_read AS r ON (r.user_id = {?} AND r.announce_id = a.id)
-                                    WHERE  asso_id = {?} AND peremption >= CURRENT_DATE()
+                                     FROM  group_announces      AS a
+                                LEFT JOIN  group_announces_read AS r ON (r.uid = {?} AND r.announce_id = a.id)
+                                    WHERE  asso_id = {?} AND expiration >= 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",
+                                 ORDER BY  a.expiration",
                                    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()
+            $index = XDB::iterator("SELECT  a.id, a.titre, r.uid IS NULL AS nonlu
+                                      FROM  group_announces      AS a
+                                 LEFT JOIN  group_announces_read AS r ON (a.id = r.announce_id AND r.uid = {?})
+                                     WHERE  asso_id = {?} AND expiration >= CURRENT_DATE()
                                             AND (promo_min = 0 OR promo_min <= {?})
                                             AND (promo_max = 0 OR promo_max >= {?})
-                                  ORDER BY  a.peremption",
+                                  ORDER BY  a.expiration",
                                    S::i('uid'), $globals->asso('id'), S::i('promo'), S::i('promo'));
             $page->assign('article_index', $index);
         } else {
-            $arts = XDB::iterator("SELECT  a.*, FIND_IN_SET('photo', a.flags) AS photo
-                                     FROM  #groupex#.announces AS a
-                                    WHERE  asso_id = {?} AND peremption >= CURRENT_DATE()
-                                           AND FIND_IN_SET('public', a.flags)",
+            $arts = XDB::iterator("SELECT  *, FIND_IN_SET('photo', flags) AS photo
+                                     FROM  group_announces
+                                    WHERE  asso_id = {?} AND expiration >= CURRENT_DATE()
+                                           AND FIND_IN_SET('public', flags)",
                                   $globals->asso('id'));
         }
         if (may_update()) {
             $subs_valid = XDB::query("SELECT  uid
-                                        FROM  #groupex#.membres_sub_requests
+                                        FROM  group_member_sub_requests
                                        WHERE  asso_id = {?}",
                                      $globals->asso('id'));
             $page->assign('requests', $subs_valid->numRows());
@@ -129,15 +129,7 @@ class XnetGrpModule extends PLModule
     function handler_logo(&$page)
     {
         global $globals;
-
-        $res = XDB::query("SELECT  logo, logo_mime
-                             FROM  #groupex#.asso
-                            WHERE  id = {?}",
-                          $globals->asso('id'));
-        list($logo, $logo_mime) = $res->fetchOneRow();
-
-        pl_cached_dynamic_content_headers(empty($logo) ? "image/jpeg" : $logo_mime);
-        exit;
+        $globals->asso()->getLogo()->send();
     }
 
     function handler_site(&$page)
@@ -171,13 +163,19 @@ class XnetGrpModule extends PLModule
             } else {
                 $site = "";
             }
-            if (S::has_perms()) {
+            if (S::admin()) {
+                $page->assign('super', true);
+
                 if (Post::v('mail_domain') && (strstr(Post::v('mail_domain'), '.') === false)) {
                     $page->trigError('Le domaine doit être un FQDN (aucune modification effectuée)&nbsp;!!!');
                     return;
                 }
+                if (Post::t('nom') == '' || Post::t('diminutif') == '') {
+                    $page->trigError('Ni le nom ni le diminutif du groupe ne peuvent être vide.');
+                    return;
+                }
                 XDB::execute(
-                    "UPDATE  #groupex#.asso
+                    "UPDATE  groups
                         SET  nom={?}, diminutif={?}, cat={?}, dom={?},
                              descr={?}, site={?}, mail={?}, resp={?},
                              forum={?}, mail_domain={?}, ax={?}, pub={?},
@@ -198,7 +196,7 @@ class XnetGrpModule extends PLModule
                 }
             } else {
                 XDB::execute(
-                    "UPDATE  #groupex#.asso
+                    "UPDATE  groups
                         SET  descr={?}, site={?}, mail={?}, resp={?},
                              forum={?}, pub= {?}, sub_url={?},
                              unsub_url={?},flags={?}
@@ -216,7 +214,7 @@ class XnetGrpModule extends PLModule
                 if (!$upload) {
                     $page->trigError("Impossible de télécharger le logo.");
                 } else {
-                    XDB::execute('UPDATE  #groupex#.asso
+                    XDB::execute('UPDATE  groups
                                      SET  logo = {?}, logo_mime = {?}
                                    WHERE  id = {?}', $upload->getContents(), $upload->contentType(),
                                  $globals->asso('id'));
@@ -224,11 +222,13 @@ class XnetGrpModule extends PLModule
                 }
             }
 
-            pl_redirect('../'.Post::v('diminutif', $globals->asso('diminutif')).'/edit');
+            pl_redirect('../' . Post::v('diminutif', $globals->asso('diminutif')) . '/edit');
         }
 
         if (S::admin()) {
-            $dom = XDB::iterator('SELECT * FROM #groupex#.dom ORDER BY nom');
+            $dom = XDB::iterator('SELECT  *
+                                    FROM  group_dom
+                                ORDER BY  nom');
             $page->assign('dom', $dom);
             $page->assign('super', true);
         }
@@ -290,21 +290,20 @@ class XnetGrpModule extends PLModule
     {
         global $globals;
 
-        if ($action == 'search') {
-            http_redirect("https://www.polytechnique.org/search/adv?rechercher=Chercher&groupex={$globals->asso('id')}"
-                        . "&cityid=" . Env::v('cityid') . "&mapid=" . Env::v('mapid'));
-        } else if ($action == 'geoloc' || $action == 'trombi') {
-            $view = new UserSet();
+        if ($action == 'trombi') {
+            __autoload('userset');
+            if ($action == 'trombi') {
+                $view = new ProfileSet(new UFC_Group($globals->asso('id')));
+            } else {
+                $view = new UserSet(new UFC_Group($globals->asso('id')));
+            }
             $view->addMod('trombi', 'Trombinoscope');
-            // TODO: Reactivate when the new map is completed.
-            // $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'annuaire/search'));
             $view->apply('annuaire', $page, $action, $subaction);
-            if ($action == 'geoloc' && $subaction) {
-                return;
-            }
+            $page->changeTpl('xnetgrp/annuaire.tpl');
+            return;
         }
-        $page->changeTpl('xnetgrp/annuaire.tpl');
 
+        $page->changeTpl('xnetgrp/annuaire.tpl');
         $sort = Env::s('order', 'directory_name');
         $ofs  = Env::i('offset');
         if ($ofs < 0) {
@@ -320,11 +319,11 @@ class XnetGrpModule extends PLModule
         }
 
         if (Env::b('admin')) {
-            $uf = $globals->asso()->getAdmins(null, $se);
+            $uf = $globals->asso()->getAdminsFilter(null, $se);
         } else {
-            $uf = $globals->asso()->getMembers(null, $se);
+            $uf = $globals->asso()->getMembersFilter(null, $se);
         }
-        $users = $uf->getUsers(NB_PER_PAGE, $ofs * NB_PER_PAGE);
+        $users = $uf->getUsers(new PlLimit(NB_PER_PAGE, $ofs * NB_PER_PAGE));
         $count = $uf->getTotalCount();
 
         $page->assign('pages', floor(($count + NB_PER_PAGE - 1) / NB_PER_PAGE));
@@ -348,7 +347,7 @@ class XnetGrpModule extends PLModule
     {
         global $globals;
         $vcard = new VCard($photos == 'photos', 'Membre du groupe ' . $globals->asso('nom'));
-        $vcard->addUsers($globals->asso()->getMembers()->getUIDs());
+        $vcard->addProfiles($globals->asso()->getMembersFilter()->getProfiles());
         $vcard->show();
     }
 
@@ -358,7 +357,7 @@ class XnetGrpModule extends PLModule
         if (is_null($filename)) {
             $filename = $globals->asso('diminutif') . '.csv';
         }
-        $users = $globals->asso()->getMembers(null, new UFO_Name('directory_name'))->getUsers();
+        $users = $globals->asso()->getMembersFilter(null, new UFO_Name('directory_name'))->getUsers();
         header('Content-Type: text/x-csv; charset=utf-8;');
         header('Pragma: ');
         header('Cache-Control: ');
@@ -370,7 +369,7 @@ class XnetGrpModule extends PLModule
     private function removeSubscriptionRequest($uid)
     {
         global $globals;
-        XDB::execute("DELETE FROM #groupex#.membres_sub_requests
+        XDB::execute("DELETE FROM group_member_sub_requests
                             WHERE asso_id = {?} AND uid = {?}",
                      $globals->asso('id'), $uid);
     }
@@ -379,7 +378,7 @@ class XnetGrpModule extends PLModule
     {
         global $globals;
         $this->removeSubscriptionRequest($user->id());
-        XDB::execute("INSERT IGNORE INTO  #groupex#.membres (asso_id, uid)
+        XDB::execute("INSERT IGNORE INTO  group_members (asso_id, uid)
                                   VALUES  ({?}, {?})",
                      $globals->asso('id'), $user->id());
         if (XDB::affectedRows() == 1) {
@@ -420,13 +419,13 @@ class XnetGrpModule extends PLModule
 
             // Retrieves the subscription status, and the reason.
             $res = XDB::query("SELECT  reason
-                                 FROM  #groupex#.membres_sub_requests
+                                 FROM  group_member_sub_requests
                                 WHERE  asso_id = {?} AND uid = {?}",
                               $globals->asso('id'), $user->id());
             $reason = ($res->numRows() ? $res->fetchOneCell() : null);
 
             $res = XDB::query("SELECT  COUNT(*)
-                                 FROM  #groupex#.membres
+                                 FROM  group_members
                                 WHERE  asso_id = {?} AND uid = {?}",
                               $globals->asso('id'), $user->id());
             $already_member = ($res->fetchOneCell() > 0);
@@ -464,7 +463,7 @@ class XnetGrpModule extends PLModule
         }
 
         $res = XDB::query("SELECT  uid
-                             FROM  #groupex#.membres_sub_requests
+                             FROM  group_member_sub_requests
                             WHERE  uid = {?} AND asso_id = {?}",
                          S::i('uid'), $globals->asso('id'));
         if ($res->numRows() != 0) {
@@ -475,15 +474,15 @@ class XnetGrpModule extends PLModule
         if (Post::has('inscrire')) {
             S::assert_xsrf_token();
 
-            XDB::execute("INSERT INTO  #groupex#.membres_sub_requests (asso_id, uid, ts, reason)
+            XDB::execute("INSERT INTO  group_member_sub_requests (asso_id, uid, ts, reason)
                                VALUES  ({?}, {?}, NOW(), {?})",
                          $globals->asso('id'), S::i('uid'), Post::v('message'));
             $res = XDB::query('SELECT  IF(m.email IS NULL,
                                           CONCAT(al.alias,"@polytechnique.org"),
                                            m.email)
-                                 FROM  #groupex#.membres AS m
-                           INNER JOIN  #x4dat#.aliases   AS al ON (al.type = "a_vie"
-                                                                 AND al.id = m.uid)
+                                 FROM  group_members AS m
+                           INNER JOIN  aliases   AS al ON (al.type = "a_vie"
+                                                                 AND al.uid = m.uid)
                                 WHERE  perms="admin" AND m.asso_id = {?}',
                              $globals->asso('id'));
             $emails = $res->fetchColumn();
@@ -539,8 +538,8 @@ class XnetGrpModule extends PLModule
         }
 
         $it = XDB::iterator('SELECT  s.uid, a.hruid, s.ts AS date
-                               FROM  #groupex#.membres_sub_requests AS s
-                         INNER JOIN  #x4dat#.accounts AS a ON(s.uid = a.uid)
+                               FROM  group_member_sub_requests AS s
+                         INNER JOIN  accounts AS a ON(s.uid = a.uid)
                               WHERE  s.asso_id = {?}
                            ORDER BY  s.ts',  $globals->asso('id'));
         $page->changeTpl('xnetgrp/subscribe-valid.tpl');
@@ -598,7 +597,7 @@ class XnetGrpModule extends PLModule
         $not_in_group_ext = array();
 
         foreach ($subscribers as $mail) {
-            $uf = new UserFilter(new UFC_And(new UFC_Group($globals->asso('id')),
+            $uf = new UserFilter(new PFC_And(new UFC_Group($globals->asso('id')),
                                              new UFC_Email($mail)));
             if ($uf->getTotalCount() == 0) {
                 if (User::isForeignEmailAddress($mail)) {
@@ -630,7 +629,7 @@ class XnetGrpModule extends PLModule
         if (!User::isForeignEmailAddress($email)) {
             $user = User::get($email);
             if ($user) {
-                XDB::execute("REPLACE INTO  #groupex#.membres (uid, asso_id, origine)
+                XDB::execute("REPLACE INTO  group_members (uid, asso_id, origine)
                                     VALUES  ({?}, {?}, 'X')",
                              $user->id(), $globals->asso('id'));
                 pl_redirect("member/" . $user->login());
@@ -649,7 +648,7 @@ class XnetGrpModule extends PLModule
                                 $market->add();
                             }
                         }
-                        XDB::execute('REPLACE INTO  #groupex#.membres (uid, asso_id, origine, email)
+                        XDB::execute('REPLACE INTO  group_members (uid, asso_id, origine, email)
                                             VALUES  ({?}, {?}, "X", {?})',
                                      $uid, $globals->asso('id'), $email);
                         $this->removeSubscriptionRequest($uid);
@@ -657,9 +656,9 @@ class XnetGrpModule extends PLModule
                     }
                     $page->trigError("Utilisateur invalide");
                 } else {
-                    $res = XDB::query('SELECT MAX(uid) + 1 FROM #groupex#.membres');
+                    $res = XDB::query('SELECT MAX(uid) + 1 FROM group_members');
                     $uid = max(intval($res->fetchOneCell()), 50001);
-                    XDB::execute('REPLACE INTO  #groupex#.membres (uid, asso_id, origine, email)
+                    XDB::execute('REPLACE INTO  group_members (uid, asso_id, origine, email)
                                         VALUES  ({?}, {?}, "ext", {?})',
                                  $uid, $globals->asso('id'), $email);
                     pl_redirect("member/$email");
@@ -683,18 +682,18 @@ class XnetGrpModule extends PLModule
         }
         if (empty($users)) {
             list($nom, $prenom) = str_replace(array('-', ' ', "'"), '%', array(Env::t('nom'), Env::t('prenom')));
-            $cond = new UFC_And(new UFC_Not(new UFC_Registered()));
+            $cond = new PFC_And(new PFC_Not(new UFC_Registered()));
             if (!empty($nom)) {
-                $cond->addChild(new UFC_Name(UserFilter::LASTNAME, $nom, UFC_Name::CONTAINS));
+                $cond->addChild(new UFC_Name(Profile::LASTNAME, $nom, UFC_Name::CONTAINS));
             }
             if (!empty($prenom)) {
-                $cond->addChild(new UFC_Name(UserFilter::FIRSTNAME, $prenom, UFC_Name::CONTAINS));
+                $cond->addChild(new UFC_Name(Profile::FIRSTNAME, $prenom, UFC_Name::CONTAINS));
             }
             if (Env::i('promo')) {
                 $cond->addChild(new UFC_Promo('=', UserFilter::GRADE_ING, Env::i('promo')));
             }
             $uf = new UserFilter($cond);
-            $users = $uf->getUsers(30);
+            $users = $uf->getUsers(new PlLimit(30));
             if ($uf->getTotalCount() > 30) {
                 $page->assign('too_many', true);
                 $users = array();
@@ -706,14 +705,15 @@ class XnetGrpModule extends PLModule
     function unsubscribe(PlUser &$user)
     {
         global $globals;
-        XDB::execute("DELETE FROM  #groupex#.membres
+        XDB::execute("DELETE FROM  group_members
                             WHERE  uid = {?} AND asso_id = {?}",
                      $user->id(), $globals->asso('id'));
 
         if ($globals->asso('notif_unsub')) {
             $mailer = new PlMailer('xnetgrp/unsubscription-notif.mail.tpl');
-            foreach ($globals->asso()->getMembers()->getUsers() as $user) {
-                $mailer->addTo($user);
+            $admins = $globals->asso()->iterAdmins();
+            while ($admin = $admins->next()) {
+                $mailer->addTo($admin);
             }
             $mailer->assign('group', $globals->asso('nom'));
             $mailer->assign('user', $user);
@@ -731,18 +731,20 @@ class XnetGrpModule extends PLModule
 
         $may_update = may_update();
         $warning    = false;
-        foreach ($listes as $liste) {
-            if ($liste['sub'] == 2) {
-                if ($may_update) {
-                    $mmlist->mass_unsubscribe($liste['list'], Array($user->forlifeEmail()));
-                } else {
-                    $mmlist->unsubscribe($liste['list']);
+        if (is_array($listes)) {
+            foreach ($listes as $liste) {
+                if ($liste['sub'] == 2) {
+                    if ($may_update) {
+                        $mmlist->mass_unsubscribe($liste['list'], Array($user->forlifeEmail()));
+                    } else {
+                        $mmlist->unsubscribe($liste['list']);
+                    }
+                } elseif ($liste['sub']) {
+                    Platal::page()->trigWarning($user->fullName() . " a une"
+                                               ." demande d'inscription en cours sur la"
+                                               ." liste {$liste['list']}@ !");
+                    $warning = true;
                 }
-            } elseif ($liste['sub']) {
-                Platal::page()->trigWarning($user->fullName() . " a une"
-                                           ." demande d'inscription en cours sur la"
-                                           ." liste {$liste['list']}@ !");
-                $warning = true;
             }
         }
 
@@ -802,23 +804,22 @@ class XnetGrpModule extends PLModule
 
     private function changeLogin(PlPage &$page, PlUser &$user, MMList &$mmlist, $login)
     {
-        require_once 'user.func.inc.php';
         // Search the uid of the user...
-        $res = XDB::query("SELECT  f.id, f.alias
+        $res = XDB::query("SELECT  f.uid, f.alias
                              FROM  aliases AS a
-                       INNER JOIN  aliases AS f ON (f.id = a.id AND f.type = 'a_vie')
+                       INNER JOIN  aliases AS f ON (f.uid = a.uid AND f.type = 'a_vie')
                             WHERE  a.alias = {?}",
                           $login);
         if ($res->numRows() == 0) {
-            $x = get_not_registered_user($login);
-            if (!$x) {
-                $page->trigError("Le login $login ne correspond à aucun X.");
+            $accounts = User::getPendingAccounts($login);
+            if (!$accounts) {
+                $page->trigError("L'identifiant $login ne correspond à aucun X.");
                 return false;
-            } else if (count($x) > 1) {
-                $page->trigError("Le login $login correspond a plusieurs camarades.");
+            } else if (count($accounts) > 1) {
+                $page->trigError("L'identifiant $login correspond à plusieurs camarades.");
                 return false;
             }
-            $uid = $x[0]['user_id'];
+            $uid = $accounts[0]['uid'];
             $sub = false;
         } else {
             list($uid, $login) = $res->fetchOneRow();
@@ -828,17 +829,17 @@ class XnetGrpModule extends PLModule
         // Check if the user is already in the group
         global $globals;
         $res = XDB::query("SELECT  uid, email
-                             FROM  #groupex#.membres
+                             FROM  group_members
                             WHERE  uid = {?} AND asso_id = {?}",
                           $uid, $globals->asso('id'));
         if ($res->numRows()) {
             list($uid, $email) = $res->fetchOneRow();
-            XDB::execute("DELETE FROM #groupex#.membres
+            XDB::execute("DELETE FROM group_members
                                 WHERE uid = {?}",
                          $user['uid']);
         } else {
             $email = $user['email'];
-            XDB::execute("UPDATE  #groupex#.membres
+            XDB::execute("UPDATE  group_members
                              SET  uid = {?}, origine = 'X'
                            WHERE  uid = {?} AND asso_id = {?}",
                          $uid, $user['uid'], $globals->asso('id'));
@@ -902,7 +903,7 @@ class XnetGrpModule extends PLModule
                 $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
+                XDB::query('UPDATE  group_members
                                SET  prenom = {?}, nom = {?}, email = {?}, sexe = {?}, origine = {?}
                              WHERE  uid = {?} AND asso_id = {?}',
                            $user['prenom'], $user['nom'], Post::v('email'),
@@ -916,7 +917,7 @@ class XnetGrpModule extends PLModule
             $perms = Post::i('is_admin');
             $comm  = Post::t('comm');
             if ($user['perms'] != $perms || $user['comm'] != $comm) {
-                XDB::query('UPDATE  #groupex#.membres
+                XDB::query('UPDATE  group_members
                                SET  perms = {?}, comm = {?}
                              WHERE  uid = {?} AND asso_id = {?}',
                             $perms ? 'admin' : 'membre', $comm,
@@ -1014,7 +1015,9 @@ class XnetGrpModule extends PLModule
 
     function handler_photo_announce(&$page, $eid = null) {
         if ($eid) {
-            $res = XDB::query("SELECT * FROM #groupex#.announces_photo WHERE eid = {?}", $eid);
+            $res = XDB::query('SELECT  *
+                                 FROM  group_announces_photo
+                                WHERE  eid = {?}', $eid);
             if ($res->numRows()) {
                 $photo = $res->fetchOneAssoc();
                 pl_cached_dynamic_content_headers("image/" . $photo['attachmime']);
@@ -1058,7 +1061,7 @@ class XnetGrpModule extends PLModule
             $art['prenom']     = S::v('prenom');
             $art['promo']      = S::v('promo');
             $art['hruid']      = S::user()->login();
-            $art['peremption'] = Post::v('peremption');
+            $art['expiration'] = Post::v('expiration');
             $art['public']     = Post::has('public');
             $art['xorg']       = Post::has('xorg');
             $art['nl']         = Post::has('nl');
@@ -1091,7 +1094,8 @@ class XnetGrpModule extends PLModule
             }
             $art['photo'] = $upload->exists() || Post::i('photo');
             if (Post::v('valid') == 'Pas d\'image' && !is_null($aid)) {
-                XDB::query("DELETE FROM #groupex#.announces_photo WHERE eid = {?}", $aid);
+                XDB::query('DELETE FROM  group_announces_photo
+                                  WHERE  eid = {?}', $aid);
                 $upload->rm();
                 Post::kill('valid');
                 $art['photo'] = false;
@@ -1120,23 +1124,22 @@ class XnetGrpModule extends PLModule
                     $post = $banana->post($globals->asso('forum'), null,
                                           $art['titre'], MiniWiki::wikiToText($fulltext, false, 0, 80));
                 }*/
-                XDB::query("INSERT INTO #groupex#.announces
-                                 (user_id, asso_id, create_date, titre, texte, contacts,
-                                   peremption, promo_min, promo_max, flags, post_id)
-                            VALUES ({?}, {?}, NOW(), {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})",
+                XDB::query('INSERT INTO  group_announces (uid, asso_id, create_date, titre, texte, contacts,
+                                                          expiration, promo_min, promo_max, flags, post_id)
+                                 VALUES  ({?}, {?}, NOW(), {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})',
                            S::i('uid'), $globals->asso('id'), $art['titre'], $art['texte'], $art['contact_html'],
-                           $art['peremption'], $promo_min, $promo_max, $flags, $post);
+                           $art['expiration'], $promo_min, $promo_max, $flags, $post);
                 $aid = XDB::insertId();
                 if ($art['photo']) {
                     list($imgx, $imgy, $imgtype) = $upload->imageInfo();
-                    XDB::execute("INSERT INTO #groupex#.announces_photo
-                                          SET eid = {?}, attachmime = {?}, x = {?}, y = {?}, attach = {?}",
+                    XDB::execute('INSERT INTO  group_announces_photo
+                                          SET  eid = {?}, attachmime = {?}, x = {?}, y = {?}, attach = {?}',
                                  $aid, $imgtype, $imgx, $imgy, $upload->getContents());
                 }
                 if ($art['xorg']) {
                     require_once('validations.inc.php');
                     $article = new EvtReq("[{$globals->asso('nom')}] " . $art['titre'], $fulltext,
-                                    $art['promo_min'], $art['promo_max'], $art['peremption'], "", S::user(),
+                                    $art['promo_min'], $art['promo_max'], $art['expiration'], "", S::user(),
                                     $upload);
                     $article->submit();
                     $page->trigWarning("L'affichage sur la page d'accueil de Polytechnique.org est en attente de validation.");
@@ -1151,16 +1154,16 @@ class XnetGrpModule extends PLModule
                     $page->trigWarning("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'],
+                XDB::query('UPDATE  group_announces
+                               SET  titre = {?}, texte = {?}, contacts = {?}, expiration = {?},
+                                    promo_min = {?}, promo_max = {?}, flags = {?}
+                             WHERE  id = {?} AND asso_id = {?}',
+                           $art['titre'], $art['texte'], $art['contacts'], $art['expiration'],
                            $promo_min, $promo_max,  $flags,
                            $art['id'], $globals->asso('id'));
                 if ($art['photo'] && $upload->exists()) {
                     list($imgx, $imgy, $imgtype) = $upload->imageInfo();
-                    XDB::execute("REPLACE INTO  #groupex#.announces_photo
+                    XDB::execute("REPLACE INTO  group_announces_photo
                                            SET  eid = {?}, attachmime = {?}, x = {?}, y = {?}, attach = {?}",
                                  $aid, $imgtype, $imgx, $imgy, $upload->getContents());
                     $upload->rm();
@@ -1172,10 +1175,10 @@ class XnetGrpModule extends PLModule
         }
 
         if (empty($art) && !is_null($aid)) {
-            $res = XDB::query("SELECT  a.*, FIND_IN_SET('public', a.flags) AS public,
-                                       FIND_IN_SET('photo', a.flags) AS photo
-                                 FROM  #groupex#.announces AS a
-                                WHERE  asso_id = {?} AND a.id = {?}",
+            $res = XDB::query("SELECT  *, FIND_IN_SET('public', flags) AS public,
+                                       FIND_IN_SET('photo', flags) AS photo
+                                 FROM  group_announces
+                                WHERE  asso_id = {?} AND id = {?}",
                               $globals->asso('id'), $aid);
             if ($res->numRows()) {
                 $art = $res->fetchOneAssoc();
@@ -1187,7 +1190,7 @@ class XnetGrpModule extends PLModule
 
         if (is_null($aid)) {
             $events = XDB::iterator("SELECT *
-                                      FROM #groupex#.evenements
+                                      FROM group_events
                                      WHERE asso_id = {?} AND archive = 0",
                                    $globals->asso('id'));
             if ($events->total()) {
@@ -1207,14 +1210,14 @@ class XnetGrpModule extends PLModule
 
         if (Env::has('del')) {
             S::assert_xsrf_token();
-            XDB::execute("DELETE  FROM #groupex#.announces
-                           WHERE  id = {?} AND asso_id = {?}",
+            XDB::execute('DELETE FROM  group_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",
+        $res = XDB::iterator('SELECT  id, titre, expiration, expiration < CURRENT_DATE() AS perime
+                                FROM  group_announces
+                               WHERE  asso_id = {?}
+                            ORDER BY  expiration DESC',
                              $globals->asso('id'));
         $page->assign('articles', $res);
     }