Converts module Carnet to the new hruid/User model.

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>

diff --git a/modules/carnet.php b/modules/carnet.php
index 2bd196c..b57f994 100644 (file)
--- a/modules/carnet.php
+++ b/modules/carnet.php
@@ -43,7 +43,7 @@ class CarnetModule extends PLModule
             return;
         }
         $page->setRssLink('Polytechnique.org :: Carnet',
-                          '/carnet/rss/'.S::v('forlife') .'/'.S::v('core_rss_hash').'/rss.xml');
+                          '/carnet/rss/'.S::v('hruid').'/'.S::v('core_rss_hash').'/rss.xml');
     }
 
     function handler_index(&$page)
@@ -158,41 +158,6 @@ class CarnetModule extends PLModule
         $page->assign_by_ref('watch', $watch);
     }
 
-    function _get_list($offset, $limit) {
-        $uid   = S::v('uid');
-        $res   = XDB::query("SELECT COUNT(*) FROM contacts WHERE uid = {?}", $uid);
-        $total = $res->fetchOneCell();
-
-        $order = Get::v('order');
-        $orders = Array(
-            'nom'     => 'nom DESC, u.prenom, u.promo',
-            'promo'   => 'promo DESC, nom, u.prenom',
-            'last'    => 'u.date DESC, nom, u.prenom, promo');
-        if ($order != 'promo' && $order != 'last')
-            $order = 'nom';
-        $order = $orders[$order];
-        if (Get::v('inv') == '')
-            $order = str_replace(" DESC,", ",", $order);
-
-        $res   = XDB::query("
-                SELECT  u.prenom, IF(u.nom_usage='',u.nom,u.nom_usage) AS nom, a.alias AS forlife, u.promo
-                  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 = {?}
-              ORDER BY  $order
-                 LIMIT  {?}, {?}", $uid, $offset*$limit, $limit);
-        $list  = $res->fetchAllAssoc();
-
-        return Array($total, $list);
-    }
-
-    function searchErrorHandler($explain) {
-        $page =& Platal::page();
-        $page->trigError($explain);
-        $this->handler_contacts($page);
-    }
-
     function handler_contacts(&$page, $action = null, $subaction = null, $ssaction = null)
     {
         $page->setTitle('Mes contacts');
@@ -309,6 +274,7 @@ class CarnetModule extends PLModule
         } else if (!$uid) {
             exit;
         }
+
         require_once 'ical.inc.php';
         $page->changeTpl('carnet/calendar.tpl', NO_SKIN);
         $page->register_function('display_ical', 'display_ical');
@@ -320,21 +286,21 @@ class CarnetModule extends PLModule
                         u.naissance,
                         DATE_ADD(u.naissance, INTERVAL 1 DAY) AS end,
                         u.date_ins,
-                        a.alias AS forlife
+                        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 = {?}', $uid);
 
         $annivs = Array();
-        while (list($prenom, $nom, $promo, $naissance, $end, $ts, $forlife) = $res->next()) {
+        while (list($prenom, $nom, $promo, $naissance, $end, $ts, $hruid) = $res->next()) {
             $naissance = str_replace('-', '', $naissance);
             $end       = str_replace('-', '', $end);
             $annivs[] = array(
                 'timestamp' => strtotime($ts),
                 'date'      => $naissance,
                 'tomorrow'  => $end,
-                'forlife'   => $forlife,
+                'hruid'     => $hruid,
                 'summary'   => 'Anniversaire de '.$prenom
                                 .' '.$nom.' - x '.$promo,
             );

diff --git a/templates/carnet/calendar.tpl b/templates/carnet/calendar.tpl
index 73dec2e..6565ffc 100644 (file)
--- a/templates/carnet/calendar.tpl
+++ b/templates/carnet/calendar.tpl
@@ -31,7 +31,7 @@ BEGIN:VEVENT
 DTSTAMP:{$e.timestamp|date_format:"%Y%m%dT%H%M%SZ"}\r
 DTSTART;VALUE=DATE:{$e.date}\r
 DTEND;VALUE=DATE:{$e.tomorrow}\r
-UID:anniv-{$e.date}-{$e.forlife}@{#globals.mail.domain#}\r
+UID:anniv-{$e.date}-{$e.hruid}@{#globals.mail.domain#}\r
 RRULE:FREQ=YEARLY;INTERVAL=1\r
 CLASS:PUBLIC\r
 {display_ical name="summary" value=$e.summary}\r

diff --git a/templates/carnet/mescontacts.tpl b/templates/carnet/mescontacts.tpl
index 2ae0319..49addfd 100644 (file)
--- a/templates/carnet/mescontacts.tpl
+++ b/templates/carnet/mescontacts.tpl
@@ -64,7 +64,7 @@
   </li>
   <li>
     {icon name=calendar_view_day title='Anniversaires'} 
-    <a href="carnet/contacts/ical/{$smarty.session.forlife}/{$smarty.session.core_rss_hash}/anniv-x.ics" title="Anniversaires">
+    <a href="carnet/contacts/ical/{$smarty.session.hruid}/{$smarty.session.core_rss_hash}/anniv-x.ics" title="Anniversaires">
       Le calendrier des anniversaires
     </a>
   </li>