X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fcarnet.php;h=223b2abcedd73cbeee4892930e31cbe9fc63ee5f;hb=1d10d3fd659fa8eb7c663d6bb599bc8bbc0feeb3;hp=4cafae1e553e5abedf5a3e4958759b36ab510189;hpb=abc680841e38e93931ad07d40f5feab67c3505de;p=platal.git

diff --git a/modules/carnet.php b/modules/carnet.php
index 4cafae1..223b2ab 100644
--- a/modules/carnet.php
+++ b/modules/carnet.php
@@ -49,11 +49,8 @@ class CarnetModule extends PLModule
         if (!S::has('core_rss_hash')) {
             return;
         }
-        $page->assign('xorg_rss',
-                      array('title' => 'Polytechnique.org :: Carnet',
-                            'href'  => '/carnet/rss/'.S::v('forlife')
-                                      .'/'.S::v('core_rss_hash').'/rss.xml')
-                      );
+        $page->setRssLink('Polytechnique.org :: Carnet',
+                          '/carnet/rss/'.S::v('forlife') .'/'.S::v('core_rss_hash').'/rss.xml');
     }
 
     function handler_index(&$page)
@@ -191,6 +188,7 @@ class CarnetModule extends PLModule
         $page->changeTpl('carnet/mescontacts.tpl');
         require_once("applis.func.inc.php");
         $page->assign('xorg_title','Polytechnique.org - Mes contacts');
+        $this->_add_rss_link($page);
 
         $uid  = S::v('uid');
         $user = Env::v('user');
@@ -337,7 +335,7 @@ class CarnetModule extends PLModule
 
     function handler_ical(&$page)
     {
-        require_once dirname(__FILE__).'/carnet/smarty.php';
+        require_once 'ical.inc.php';
         $page->changeTpl('carnet/calendar.tpl', NO_SKIN);
         $page->register_function('display_ical', 'display_ical');
 
@@ -372,13 +370,14 @@ class CarnetModule extends PLModule
         header('Content-Type: text/calendar; charset=utf-8');
     }
 
-    function handler_vcard(&$page)
+    function handler_vcard(&$page, $photos = null)
     {
         $res = XDB::query('SELECT contact
                              FROM contacts
                             WHERE uid = {?}', S::v('uid'));
+
         require_once('vcard.inc.php');
-        $vcard = new VCard($res->fetchColumn());
+        $vcard = new VCard($res->fetchColumn(), $photos == 'photos');
         $vcard->do_page(&$page);
     }
 }