X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fgadgets.php;h=c7eb9895d97d94c6d35f4bde1c394b93ccac5f78;hb=330ffaa012073e66a5c94a6dce3ef5c8e32f67b8;hp=95a20b7f13a2974af537e4c58d83a4c200dcc4b7;hpb=fb813fb52d5ab65ca9a5b92b5cb9089523380d79;p=platal.git diff --git a/modules/gadgets.php b/modules/gadgets.php index 95a20b7..c7eb989 100644 --- a/modules/gadgets.php +++ b/modules/gadgets.php @@ -42,14 +42,14 @@ class GadgetsModule extends PLModule require_once 'gadgets/gadgets.inc.php'; init_igoogle_html('gadgets/ig-events.tpl', AUTH_COOKIE); - $events = XDB::iterator('SELECT SQL_CALC_FOUND_ROWS + $events = XDB::iterator("SELECT SQL_CALC_FOUND_ROWS e.id, e.titre, UNIX_TIMESTAMP(e.creation_date) AS creation_date, - IF(u.nom_usage = "", u.nom, u.nom_usage) AS nom, u.prenom, u.promo, - ev.user_id IS NULL AS nonlu, e.user_id - FROM evenements AS e - LEFT JOIN evenements_vus AS ev ON (e.id = ev.evt_id AND ev.user_id = {?}) - WHERE FIND_IN_SET("valide", e.flags) AND peremption >= NOW() - ORDER BY e.creation_date DESC', S::i('uid')); + IF(u.nom_usage = '', u.nom, u.nom_usage) AS nom, u.prenom, u.promo, + ev.uid IS NULL AS nonlu, e.uid + FROM announces AS e + LEFT JOIN announce_read AS ev ON (e.id = ev.evt_id AND ev.uid = {?}) + WHERE FIND_IN_SET('valide', e.flags) AND expiration >= NOW() + ORDER BY e.creation_date DESC", S::i('uid')); $page->assign('event_count', XDB::query("SELECT FOUND_ROWS()")->fetchOneCell()); Platal::load('events', 'feed.inc.php');