X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fcarnet.php;h=8db0fc2dbadbfb34ad1b45003e4f3cf961ceb410;hb=6cce7840e69bc0b6647e1bc5ea3437a925cd63a0;hp=4f80b4993ef1ae03210abdf9e9420e3c9f30dad4;hpb=c2b36eadda10e7e4245013a88073e751e811a403;p=platal.git

diff --git a/modules/carnet.php b/modules/carnet.php
index 4f80b49..8db0fc2 100644
--- a/modules/carnet.php
+++ b/modules/carnet.php
@@ -24,18 +24,18 @@ class CarnetModule extends PLModule
     function handlers()
     {
         return array(
-            'carnet'                => $this->make_hook('index',      AUTH_COOKIE, 'directory_private'),
-            'carnet/panel'          => $this->make_hook('panel',      AUTH_COOKIE, 'directory_private'),
-            'carnet/notifs'         => $this->make_hook('notifs',     AUTH_COOKIE, 'directory_private'),
-
-            'carnet/contacts'       => $this->make_hook('contacts',   AUTH_COOKIE, 'directory_private'),
-            'carnet/contacts/pdf'   => $this->make_hook('pdf',        AUTH_COOKIE, 'directory_private'),
-            'carnet/contacts/vcard' => $this->make_hook('vcard',      AUTH_COOKIE, 'directory_private'),
-            'carnet/contacts/ical'  => $this->make_token_hook('ical', AUTH_COOKIE, 'directory_private'),
-            'carnet/contacts/csv'   => $this->make_token_hook('csv',  AUTH_COOKIE, 'directory_private'),
+            'carnet'                       => $this->make_hook('index',              AUTH_COOKIE, 'directory_private'),
+            'carnet/panel'                 => $this->make_hook('panel',              AUTH_COOKIE, 'directory_private'),
+            'carnet/notifs'                => $this->make_hook('notifs',             AUTH_COOKIE, 'directory_private'),
+
+            'carnet/contacts'              => $this->make_hook('contacts',           AUTH_COOKIE, 'directory_private'),
+            'carnet/contacts/pdf'          => $this->make_hook('pdf',                AUTH_COOKIE, 'directory_private'),
+            'carnet/contacts/vcard'        => $this->make_hook('vcard',              AUTH_COOKIE, 'directory_private'),
+            'carnet/contacts/ical'         => $this->make_token_hook('ical',         AUTH_COOKIE, 'directory_private'),
+            'carnet/contacts/csv'          => $this->make_token_hook('csv',          AUTH_COOKIE, 'directory_private'),
             'carnet/contacts/csv/birthday' => $this->make_token_hook('csv_birthday', AUTH_COOKIE, 'directory_private'),
 
-            'carnet/rss'            => $this->make_token_hook('rss',  AUTH_COOKIE, 'directory_private'),
+            'carnet/rss'                   => $this->make_token_hook('rss',          AUTH_COOKIE, 'directory_private'),
         );
     }
 
@@ -280,7 +280,7 @@ class CarnetModule extends PLModule
         }
         switch (Env::v('action')) {
             case 'retirer':
-                if (($contact = User::get(Env::v('user')))) {
+                if (($contact = Profile::get(Env::v('user')))) {
                     if (XDB::execute("DELETE FROM  contacts
                                             WHERE  uid = {?} AND contact = {?}",
                                      $uid, $contact->id())) {
@@ -291,7 +291,7 @@ class CarnetModule extends PLModule
                 break;
 
             case 'ajouter':
-                if (($contact = User::get(Env::v('user')))) {
+                if (($contact = Profile::get(Env::v('user')))) {
                     XDB::execute('INSERT IGNORE INTO  contacts (uid, contact)
                                               VALUES  ({?}, {?})',
                                  $uid, $contact->id());
@@ -324,12 +324,9 @@ class CarnetModule extends PLModule
 
         $view->addMod('minifiche', 'Mini-fiches', true);
         $view->addMod('trombi', 'Trombinoscope', false, array('with_admin' => false, 'with_promo' => true));
-        // TODO: Reactivate when the new map is completed.
-        // $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'carnet/contacts/search'));
+        $view->addMod('map', 'Planisphère');
         $view->apply('carnet/contacts', $page, $action, $subaction);
-        //if ($action != 'geoloc' || ($search && !$ssaction) || (!$search && !$subaction)) {
         $page->changeTpl('carnet/mescontacts.tpl');
-        //}
     }
 
     function handler_pdf($page, $arg0 = null, $arg1 = null)
@@ -339,7 +336,7 @@ class CarnetModule extends PLModule
 
         Platal::session()->close();
 
-        $order = array(new UFO_Name(Profile::LASTNAME), new UFO_Name(Profile::FIRSTNAME));
+        $order = array(new UFO_Name());
         if ($arg0 == 'promo') {
             $order = array_unshift($order, new UFO_Promo());
         } else {
@@ -373,7 +370,7 @@ class CarnetModule extends PLModule
             'timestamp' => $date,
             'date' => date('Ymd', $date),
             'tomorrow' => date('Ymd', $tomorrow),
-            'hruid' => $profile->hrid(),
+            'email' => $profile->owner()->bestEmail(),
             'summary' => 'Anniversaire de ' . $profile->fullName(true)
         );
     }
@@ -419,7 +416,7 @@ class CarnetModule extends PLModule
     {
         $pf = new ProfileFilter(new UFC_Contact(S::user()));
         $vcard = new VCard($photos == 'photos');
-        $vcard->addProfiles($pf->getProfiles());
+        $vcard->addProfiles($pf->getProfiles(null, Profile::FETCH_ALL));
         $vcard->show();
     }