Merge commit 'origin/fusionax' into account

[platal.git] / modules / carnet.php

diff --git a/modules/carnet.php b/modules/carnet.php
index 8109acb..2b64a5f 100644 (file)
--- a/modules/carnet.php
+++ b/modules/carnet.php
@@ -29,9 +29,9 @@ class CarnetModule extends PLModule
             'carnet/notifs'         => $this->make_hook('notifs',   AUTH_COOKIE),
 
             'carnet/contacts'       => $this->make_hook('contacts', AUTH_COOKIE),
-            'carnet/contacts/pdf'   => $this->make_hook('pdf',      AUTH_COOKIE, 'user', NO_HTTPS),
+            'carnet/contacts/pdf'   => $this->make_hook('pdf',      AUTH_COOKIE),
+            'carnet/contacts/vcard' => $this->make_hook('vcard',    AUTH_COOKIE),
             'carnet/contacts/ical'  => $this->make_hook('ical',     AUTH_PUBLIC, 'user', NO_HTTPS),
-            'carnet/contacts/vcard' => $this->make_hook('vcard',    AUTH_COOKIE, 'user', NO_HTTPS),
 
             'carnet/rss'            => $this->make_hook('rss',      AUTH_PUBLIC, 'user', NO_HTTPS),
         );
@@ -80,7 +80,7 @@ class CarnetModule extends PLModule
     private function getSinglePromotion(PlPage &$page, $promo)
     {
         if (!ctype_digit($promo) || $promo < 1920 || $promo > date('Y')) {
-            $page->trigError('Promotion invalide : ' . $promo);
+            $page->trigError('Promotion invalide&nbsp;: ' . $promo . '.');
             return null;
         }
         return (int)$promo;
@@ -107,7 +107,7 @@ class CarnetModule extends PLModule
             return null;
         }
         if ($promo1 > $promo2) {
-            $page->trigError("Intervale non valide : " . $promo);
+            $page->trigError('Intervalle non valide :&nbsp;' . $promo . '.');
             return null;
         }
         $array = array();
@@ -267,7 +267,7 @@ class CarnetModule extends PLModule
                 if (($user = User::get(Env::v('user')))) {
                     if (XDB::execute("DELETE FROM  contacts
                                             WHERE  uid = {?} AND contact = {?}", $uid, $user->id())) {
-                        $page->trigSuccess("Contact retiré !");
+                        $page->trigSuccess("Contact retiré&nbsp;!");
                     }
                 }
                 break;
@@ -276,9 +276,9 @@ class CarnetModule extends PLModule
                 if (($user = User::get(Env::v('user')))) {
                     if (XDB::execute("REPLACE INTO  contacts (uid, contact)
                                             VALUES  ({?}, {?})", $uid, $user->id())) {
-                        $page->trigSuccess('Contact ajouté !');
+                        $page->trigSuccess('Contact ajouté&nbsp;!');
                     } else {
-                        $page->trigWarning('Contact déjà dans la liste !');
+                        $page->trigWarning('Contact déjà dans la liste&nbsp;!');
                     }
                 }
                 break;
@@ -398,7 +398,7 @@ class CarnetModule extends PLModule
         }
         $page->assign('events', $annivs);
 
-        header('Content-Type: text/calendar; charset=utf-8');
+        pl_content_headers("text/calendar");
     }
 
     function handler_vcard(&$page, $photos = null)