X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetgrp%2Ffeed.inc.php;h=95b421cec58c0af61996623d72eb885fc6acd521;hb=b0e935d6af8eb37e423b8bb862e477d9e09af0f5;hp=bee7ca8411382b1c6e882a2890567bbe7de10a19;hpb=fb813fb52d5ab65ca9a5b92b5cb9089523380d79;p=platal.git diff --git a/modules/xnetgrp/feed.inc.php b/modules/xnetgrp/feed.inc.php index bee7ca8..95b421c 100644 --- a/modules/xnetgrp/feed.inc.php +++ b/modules/xnetgrp/feed.inc.php @@ -75,19 +75,19 @@ class XnetGrpEventFeed extends PlFeed global $globals; if (!is_null($user)) { return new UserFilterIterator( - XDB::iterator("SELECT a.id, a.titre AS title, a.texte, a.contacts, - a.create_date AS publication, - FIND_IN_SET('photo', a.flags) AS photo, - CONCAT({?}, '/#art', a.id) AS link - FROM group_announces AS a - WHERE peremption >= NOW() AND a.asso_id = {?}", + XDB::iterator("SELECT id, titre AS title, texte, contacts, + create_date AS publication, + FIND_IN_SET('photo', flags) AS photo, + CONCAT({?}, '/#art', id) AS link + FROM group_announces + WHERE expiration >= NOW() AND asso_id = {?}", $this->link, $globals->asso('id'), $user)); } else { - return XDB::iterator("SELECT a.id, a.titre AS title, a.texte, a.create_date AS publication, - CONCAT({?}, '/#art', a.id) AS link, + return XDB::iterator("SELECT id, titre AS title, texte, create_date AS publication, + CONCAT({?}, '/#art', id) AS link, NULL AS photo, NULL AS contacts - FROM group_announces AS a - WHERE FIND_IN_SET('public', a.flags) AND peremption >= NOW() AND a.asso_id = {?}", + FROM group_announces + WHERE FIND_IN_SET('public', flags) AND expiration >= NOW() AND asso_id = {?}", $this->link, $globals->asso('id')); } }