Don't use the domain part in login anymore.

[platal.git] / modules / carnet.php

diff --git a/modules/carnet.php b/modules/carnet.php
index 944b8a8..8db0fc2 100644 (file)
--- 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_hook('ical',     AUTH_PUBLIC, 'directory_private', NO_HTTPS),
-            'carnet/contacts/csv'   => $this->make_hook('csv',     AUTH_PUBLIC,  'directory_private', NO_HTTPS),
-            'carnet/contacts/csv/birthday'  => $this->make_hook('csv_birthday',     AUTH_PUBLIC, 'directory_private', NO_HTTPS),
-
-            'carnet/rss'            => $this->make_hook('rss',      AUTH_PUBLIC, 'directory_private', NO_HTTPS),
+            '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'),
         );
     }
 
@@ -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 {
@@ -358,11 +355,11 @@ class CarnetModule extends PLModule
         exit;
     }
 
-    function handler_rss($page, $user = null, $hash = null)
+    function handler_rss(PlPage $page, PlUser $user)
     {
         $this->load('feed.inc.php');
         $feed = new CarnetFeed();
-        return $feed->run($page, $user, $hash);
+        return $feed->run($page, $user);
     }
 
     function buildBirthRef(Profile $profile)
@@ -373,22 +370,13 @@ 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)
         );
     }
 
-    function handler_csv_birthday($page, $alias = null, $hash = null)
+    function handler_csv_birthday(PlPage $page, PlUser $user)
     {
-        $user = Platal::session()->tokenAuth($alias, $hash);
-        if (is_null($user)) {
-            if (S::logged()) {
-                $user = S::user();
-            } else {
-                return PL_FORBIDDEN;
-            }
-        }
-
         $page->changeTpl('carnet/calendar.outlook.tpl', NO_SKIN);
         $filter = new UserFilter(new UFC_Contact($user));
         $profiles = $filter->iterProfiles();
@@ -411,17 +399,8 @@ class CarnetModule extends PLModule
         pl_content_headers("text/comma-separated-values;charset=".$encoding);
     }
 
-    function handler_ical($page, $alias = null, $hash = null)
+    function handler_ical(PlPage $page, PlUser $user)
     {
-        $user = Platal::session()->tokenAuth($alias, $hash);
-        if (is_null($user)) {
-            if (S::logged()) {
-                $user = S::user();
-            } else {
-                return PL_FORBIDDEN;
-            }
-        }
-
         require_once 'ical.inc.php';
         $page->changeTpl('carnet/calendar.tpl', NO_SKIN);
         $page->register_function('display_ical', 'display_ical');
@@ -437,21 +416,12 @@ 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();
     }
 
-    function handler_csv($page, $alias = null, $hash = null)
+    function handler_csv(PlPage $page, PlUser $user)
     {
-        $user = Platal::session()->tokenAuth($alias, $hash);
-        if (is_null($user)) {
-            if (S::logged()) {
-                $user = S::user();
-            } else {
-                return PL_FORBIDDEN;
-            }
-        }
-
         $page->changeTpl('carnet/mescontacts.outlook.tpl', NO_SKIN);
         $pf = new ProfileFilter(new UFC_Contact($user));
         require_once 'carnet/outlook.inc.php';