X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetgrp.php;h=4fc69a4d4b157ac80112d8ad0c3b2177dd2ef62a;hb=b62be36bc636e303764792a36165be27d5802675;hp=cb913060f1744a6356c79a6992fff6743d31d14b;hpb=c8d75c5837e2e9d9bc0e91d1cc03129c508c67ce;p=platal.git

diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php
index cb91306..4fc69a4 100644
--- a/modules/xnetgrp.php
+++ b/modules/xnetgrp.php
@@ -66,45 +66,45 @@ class XnetGrpModule extends PLModule
 
         if (S::logged()) {
             if (Env::has('read')) {
-                XDB::query('DELETE group_r.*
-                              FROM group_announces_read AS r
-                        INNER JOIN group_announces AS a ON a.id = r.announce_id
-                             WHERE peremption < CURRENT_DATE()');
-                XDB::query('INSERT INTO group_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 group_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  group_announces AS a
-                                LEFT JOIN  group_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  group_announces AS a
-                                 LEFT JOIN  group_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  group_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()) {
@@ -312,9 +312,9 @@ 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(new PlLimit(NB_PER_PAGE, $ofs * NB_PER_PAGE));
         $count = $uf->getTotalCount();
@@ -340,7 +340,7 @@ class XnetGrpModule extends PLModule
     {
         global $globals;
         $vcard = new VCard($photos == 'photos', 'Membre du groupe ' . $globals->asso('nom'));
-        $vcard->addProfiles($globals->asso()->getMembers()->getProfiles());
+        $vcard->addProfiles($globals->asso()->getMembersFilter()->getProfiles());
         $vcard->show();
     }
 
@@ -350,7 +350,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: ');
@@ -590,7 +590,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)) {
@@ -675,7 +675,7 @@ 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(Profile::LASTNAME, $nom, UFC_Name::CONTAINS));
             }
@@ -704,8 +704,9 @@ class XnetGrpModule extends PLModule
 
         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);
@@ -810,7 +811,7 @@ class XnetGrpModule extends PLModule
                 $page->trigError("Le login $login correspond a plusieurs camarades.");
                 return false;
             }
-            $uid = $x[0]['user_id'];
+            $uid = $x[0]['uid'];
             $sub = false;
         } else {
             list($uid, $login) = $res->fetchOneRow();
@@ -1006,7 +1007,9 @@ class XnetGrpModule extends PLModule
 
     function handler_photo_announce(&$page, $eid = null) {
         if ($eid) {
-            $res = XDB::query("SELECT * FROM group_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']);
@@ -1050,7 +1053,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');
@@ -1083,7 +1086,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 group_announces_photo WHERE eid = {?}", $aid);
+                XDB::query('DELETE FROM  group_announces_photo
+                                  WHERE  eid = {?}', $aid);
                 $upload->rm();
                 Post::kill('valid');
                 $art['photo'] = false;
@@ -1112,23 +1116,22 @@ class XnetGrpModule extends PLModule
                     $post = $banana->post($globals->asso('forum'), null,
                                           $art['titre'], MiniWiki::wikiToText($fulltext, false, 0, 80));
                 }*/
-                XDB::query("INSERT INTO group_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 group_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.");
@@ -1143,11 +1146,11 @@ class XnetGrpModule extends PLModule
                     $page->trigWarning("La parution dans la Lettre Mensuelle est en attente de validation.");
                 }
             } else {
-                XDB::query("UPDATE group_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()) {
@@ -1164,10 +1167,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  group_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();
@@ -1199,14 +1202,14 @@ class XnetGrpModule extends PLModule
 
         if (Env::has('del')) {
             S::assert_xsrf_token();
-            XDB::execute("DELETE  FROM group_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  group_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);
     }