X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fgadgets.php;h=c7eb9895d97d94c6d35f4bde1c394b93ccac5f78;hb=5b6768e61333046987cdcc2a108051cfed5583cf;hp=ede101f7ccfec2f8cbace0d0b573b309e3e99d6c;hpb=2f8bacc215bab9d9e3401e73004574cfb0eb4540;p=platal.git

diff --git a/modules/gadgets.php b/modules/gadgets.php
index ede101f..c7eb989 100644
--- a/modules/gadgets.php
+++ b/modules/gadgets.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   *
@@ -25,9 +25,9 @@ class GadgetsModule extends PLModule
     {
         return array(
             'gadgets/ig-events.xml' => $this->make_hook('ig_events_xml', AUTH_PUBLIC, 'user', NO_HTTPS),
-            'gadgets/ig-events'     => $this->make_hook('ig_events', AUTH_PUBLIC),
+            'gadgets/ig-events'     => $this->make_hook('ig_events',     AUTH_PUBLIC),
             'gadgets/ig-search.xml' => $this->make_hook('ig_search_xml', AUTH_PUBLIC, 'user', NO_HTTPS),
-            'gadgets/ig-search'     => $this->make_hook('ig_search', AUTH_PUBLIC),
+            'gadgets/ig-search'     => $this->make_hook('ig_search',     AUTH_PUBLIC),
         );
     }
 
@@ -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');