X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fevents.php;h=c51aec9709c704e48cfb525094154ac0e202aa10;hb=a93519575833e6886e055abb8b43b3ada6f163bc;hp=33f1c6d51390661cc181f33a2f825e3fa412b973;hpb=ea74d2785d9c1ff5571ebf2f73c89cbf19c8dd07;p=platal.git

diff --git a/modules/events.php b/modules/events.php
index 33f1c6d..c51aec9 100644
--- a/modules/events.php
+++ b/modules/events.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2009 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -128,9 +128,8 @@ class EventsModule extends PLModule
         $page->assign('photo_incitation', $res->fetchOneCell() == 0);
 
         // Geo-location onebox.
-        require_once 'geoloc.inc.php';
-        $res = localize_addresses(S::user()->id());
-        $page->assign('geoloc_incitation', count($res));
+        require_once "geocoding.inc.php";
+        $page->assign('geoloc_incitation', Geocoder::countNonGeocoded(S::user()->id()));
 
         // Direct link to the RSS feed, when available.
         if (S::rssActivated()) {
@@ -159,16 +158,17 @@ class EventsModule extends PLModule
 
         // Fetch the events to display, along with their metadata.
         $array = array();
-        $it = XDB::iterator("SELECT  e.id,e.titre,e.texte,e.post_id,a.user_id,a.nom,a.prenom,a.promo,a.hruid,
+        $it = XDB::iterator("SELECT  e.id, e.titre, e.texte, e.post_id, a.user_id, a.nom, a.prenom, d.promo AS promo_display ,a.hruid,
                                      p.x, p.y, p.attach IS NOT NULL AS img, FIND_IN_SET('wiki', e.flags) AS wiki,
                                      FIND_IN_SET('important', e.flags) AS important,
                                      e.creation_date > DATE_SUB(CURDATE(), INTERVAL 2 DAY) AS news,
                                      e.peremption < DATE_ADD(CURDATE(), INTERVAL 2 DAY) AS end,
                                      ev.user_id IS NULL AS nonlu
                                FROM  evenements       AS e
-                          LEFT JOIN  evenements_photo AS p ON (e.id = p.eid)
-                         INNER JOIN  auth_user_md5    AS a ON e.user_id=a.user_id
-                          LEFT JOIN  evenements_vus AS ev ON (e.id = ev.evt_id AND ev.user_id = {?})
+                          LEFT JOIN  evenements_photo AS p  ON (e.id = p.eid)
+                         INNER JOIN  auth_user_md5    AS a  ON (e.user_id = a.user_id)
+                         INNER JOIN  profile_display  AS d  ON (d.pid = a.user_id)
+                          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()
                                      AND (e.promo_min = 0 || e.promo_min <= {?})
                                      AND (e.promo_max = 0 || e.promo_max >= {?})