X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fgadgets.php;h=b8700de7c31a1f84520a0db0bd4ccec2d983668a;hb=3422f7193e38e67054d2ecda2f4a68b64bd310ef;hp=b02b6865fe23e2f7f3bf8817a795b09db4c39c8b;hpb=c12cc82e1d97b51e19b294942ea9450a34d929cd;p=platal.git

diff --git a/modules/gadgets.php b/modules/gadgets.php
index b02b686..b8700de 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   *
@@ -42,14 +42,13 @@ 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'));
+                                         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');
@@ -72,7 +71,9 @@ class GadgetsModule extends PLModule
     function handler_ig_search(&$page)
     {
         if (Env::has('quick') && Env::s('quick') != '') {
+            global $globals;
             require_once 'userset.inc.php';
+
             $view = new SearchSet(true);
             $view->addMod('gadget', 'Gadget', true);
             $view->apply(null, $page);
@@ -86,6 +87,8 @@ class GadgetsModule extends PLModule
                 $page->assign('error', 'Recherche trop générale.');
             } elseif (empty($nb_tot)) {
                 $page->assign('error', 'Il n\'existe personne correspondant à ces critères dans la base !');
+            } else {
+                $page->assign('error', false);
             }
         }