X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fcarnet.php;h=9454062743ccdbaee8aea26492a98f1193ff7fe1;hb=723d4c6b7736df20e07d2c6e32e4c37c6c80ca05;hp=276fabf46411a117fee16147ce8971aa252f45f5;hpb=843a2191e4c76f0beb00c754f06974de76791238;p=platal.git

diff --git a/modules/carnet.php b/modules/carnet.php
index 276fabf..9454062 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),
-            'carnet/panel'          => $this->make_hook('panel',    AUTH_COOKIE),
-            '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),
-            'carnet/contacts/vcard' => $this->make_hook('vcard',    AUTH_COOKIE),
-            'carnet/contacts/ical'  => $this->make_hook('ical',     AUTH_PUBLIC, 'user', NO_HTTPS),
-            'carnet/contacts/csv'   => $this->make_hook('csv',     AUTH_PUBLIC, 'user', NO_HTTPS),
-            'carnet/contacts/csv/birthday'  => $this->make_hook('csv_birthday',     AUTH_PUBLIC, 'user', NO_HTTPS),
-
-            'carnet/rss'            => $this->make_hook('rss',      AUTH_PUBLIC, 'user', 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_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),
         );
     }
 
@@ -292,9 +292,10 @@ class CarnetModule extends PLModule
 
             case 'ajouter':
                 if (($contact = User::get(Env::v('user')))) {
-                    if (XDB::execute("REPLACE INTO  contacts (uid, contact)
-                                            VALUES  ({?}, {?})",
-                                     $uid, $contact->id())) {
+                    XDB::execute('INSERT IGNORE INTO  contacts (uid, contact)
+                                              VALUES  ({?}, {?})',
+                                 $uid, $contact->id());
+                    if (XDB::affectedRows() > 0) {
                         Platal::session()->updateNbNotifs();
                         $page->trigSuccess('Contact ajouté !');
                     } else {
@@ -315,7 +316,7 @@ class CarnetModule extends PLModule
         }
         if ($search && trim(Env::v('quick'))) {
             $base = 'carnet/contacts/search';
-            $view = new SearchSet(true, false, new UFC_Contact($user));
+            $view = new SearchSet(true, new UFC_Contact($user));
         } else {
             $base = 'carnet/contacts';
             $view = new ProfileSet(new UFC_Contact($user));
@@ -382,7 +383,7 @@ class CarnetModule extends PLModule
         $user = Platal::session()->tokenAuth($alias, $hash);
         if (is_null($user)) {
             if (S::logged()) {
-                $user == S::user();
+                $user = S::user();
             } else {
                 return PL_FORBIDDEN;
             }
@@ -415,7 +416,7 @@ class CarnetModule extends PLModule
         $user = Platal::session()->tokenAuth($alias, $hash);
         if (is_null($user)) {
             if (S::logged()) {
-                $user == S::user();
+                $user = S::user();
             } else {
                 return PL_FORBIDDEN;
             }
@@ -445,7 +446,7 @@ class CarnetModule extends PLModule
         $user = Platal::session()->tokenAuth($alias, $hash);
         if (is_null($user)) {
             if (S::logged()) {
-                $user == S::user();
+                $user = S::user();
             } else {
                 return PL_FORBIDDEN;
             }