Fix the carnet

[platal.git] / modules / carnet.php

diff --git a/modules/carnet.php b/modules/carnet.php
index 2b64a5f..a19a50c 100644 (file)
--- a/modules/carnet.php
+++ b/modules/carnet.php
@@ -284,7 +284,11 @@ class CarnetModule extends PLModule
                 break;
         }
 
-/*        $search = false;
+        $search = false;
+        $user = S::user();
+
+        require_once 'userset.inc.php';
+
         if ($action == 'search') {
             $action = $subaction;
             $subaction = $ssaction;
@@ -294,19 +298,16 @@ class CarnetModule extends PLModule
             $base = 'carnet/contacts/search';
 
             Platal::load('search', 'classes.inc.php');
-            ThrowError::$throwHook = array($this, 'searchErrorHandler');
-            $view = new SearchSet(true, false, "INNER JOIN contacts AS c2 ON (u.user_id = c2.contact)", "c2.uid = $uid");
+            $view = new SearchSet(true, false, new UFC_Contact($user));
         } else {
             $base = 'carnet/contacts';
-            $view = new UserSet("INNER JOIN contacts AS c2 ON (u.user_id = c2.contact)", " c2.uid = $uid ");
-        }*/
+            $view = new ProfileSet(new UFC_Contact($user));
+        }
 
-        require_once 'userset.inc.php';
-        $user = S::user();
-        $view = new UserSet(new UFC_Contact($user));
         $view->addMod('minifiche', 'Mini-fiches', true);
         $view->addMod('trombi', 'Trombinoscope', false, array('with_admin' => false, 'with_promo' => true));
-        $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'carnet/contacts/search'));
+        // TODO: Reactivate when the new map is completed.
+        // $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'carnet/contacts/search'));
         $view->apply('carnet/contacts', $page, $action, $subaction);
         //if ($action != 'geoloc' || ($search && !$ssaction) || (!$search && !$subaction)) {
         $page->changeTpl('carnet/mescontacts.tpl');
@@ -370,30 +371,18 @@ class CarnetModule extends PLModule
         $page->changeTpl('carnet/calendar.tpl', NO_SKIN);
         $page->register_function('display_ical', 'display_ical');
 
-        $res = XDB::iterRow(
-                'SELECT u.prenom,
-                        IF(u.nom_usage = \'\',u.nom,u.nom_usage) AS nom,
-                        u.promo,
-                        u.naissance,
-                        DATE_ADD(u.naissance, INTERVAL 1 DAY) AS end,
-                        u.date_ins,
-                        u.hruid
-                   FROM contacts      AS c
-             INNER JOIN auth_user_md5 AS u ON (u.user_id = c.contact)
-             INNER JOIN aliases       AS a ON (u.user_id = a.id AND a.type = \'a_vie\')
-                  WHERE c.uid = {?}', $user->id());
-
+        $filter = new UserFilter(new UFC_Contact($user));
         $annivs = Array();
-        while (list($prenom, $nom, $promo, $naissance, $end, $ts, $hruid) = $res->next()) {
-            $naissance = str_replace('-', '', $naissance);
-            $end       = str_replace('-', '', $end);
+        foreach ($filter->getUsers() as $u) {
+            $profile = $u->profile();
+            $date = strtotime($profile->birthdate);
+            $tomorrow = $date + 86400;
             $annivs[] = array(
-                'timestamp' => strtotime($ts),
-                'date'      => $naissance,
-                'tomorrow'  => $end,
-                'hruid'     => $hruid,
-                'summary'   => 'Anniversaire de '.$prenom
-                                .' '.$nom.' - x '.$promo,
+                'timestamp' => strtotime($user->registration_date),
+                'date' => date('Ymd', $date),
+                'tomorrow' => date('Ymd', $tomorrow),
+                'hruid' => $profile->hrid(),
+                'summary' => 'Anniversaire de ' . $profile->fullName(true)
             );
         }
         $page->assign('events', $annivs);