X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fcarnet.php;h=2125cf92ec132cabaa6c9a85848daf9859465c75;hb=a81ee98706ff11231e6d708270e2fb1c97775650;hp=054d07a99371ba4d6a239dfd8e932441df5635ab;hpb=05d148600fe747bb1e0b9400a898105deb044698;p=platal.git

diff --git a/modules/carnet.php b/modules/carnet.php
index 054d07a..2125cf9 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),
         );
     }
 
@@ -45,7 +45,7 @@ class CarnetModule extends PLModule
             return;
         }
         $page->setRssLink('Polytechnique.org :: Carnet',
-                          '/carnet/rss/'.S::v('hruid').'/'.S::v('token').'/rss.xml');
+                          '/carnet/rss/' . S::v('hruid') . '/' . S::user()->token . '/rss.xml');
     }
 
     function handler_index(&$page)
@@ -64,7 +64,7 @@ class CarnetModule extends PLModule
                              SET  last = FROM_UNIXTIME({?})
                            WHERE  uid = {?}',
                          Get::i('read'), S::i('uid'));
-            S::set('watch_last', Get::i('read'));
+            S::user()->invalidWatchCache();
             Platal::session()->updateNbNotifs();
             pl_redirect('carnet/panel');
         }
@@ -131,6 +131,8 @@ class CarnetModule extends PLModule
         }
         XDB::execute('INSERT IGNORE INTO  watch_promo (uid, promo)
                                   VALUES  ' . implode(', ', $to_add));
+        S::user()->invalidWatchCache();
+        Platal::session()->updateNbNotifs();
     }
 
     private function delPromo(PlPage &$page, $promo)
@@ -146,12 +148,16 @@ class CarnetModule extends PLModule
         XDB::execute('DELETE FROM  watch_promo
                             WHERE  ' . XDB::format('uid = {?}', S::i('uid')) . '
                                    AND promo IN (' . implode(', ', $to_delete) . ')');
+        S::user()->invalidWatchCache();
+        Platal::session()->updateNbNotifs();
     }
 
     public function addNonRegistered(PlPage &$page, PlUser &$user)
     {
         XDB::execute('INSERT IGNORE INTO  watch_nonins (uid, ni_id)
                                   VALUES  ({?}, {?})', S::i('uid'), $user->id());
+        S::user()->invalidWatchCache();
+        Platal::session()->updateNbNotifs();
     }
 
     public function delNonRegistered(PlPage &$page, PlUser &$user)
@@ -159,6 +165,8 @@ class CarnetModule extends PLModule
         XDB::execute('DELETE FROM  watch_nonins
                             WHERE  uid = {?} AND ni_id = {?}',
                     S::i('uid'), $user->id());
+        S::user()->invalidWatchCache();
+        Platal::session()->updateNbNotifs();
     }
 
     public function handler_notifs(&$page, $action = null, $arg = null)
@@ -201,6 +209,8 @@ class CarnetModule extends PLModule
             XDB::execute('UPDATE  watch
                              SET  actions = {?}
                            WHERE  uid = {?}', $flags, S::i('uid'));
+            S::user()->invalidWatchCache();
+            Platal::session()->updateNbNotifs();
         }
 
         if (Env::has('flags_contacts')) {
@@ -208,6 +218,8 @@ class CarnetModule extends PLModule
             XDB::execute('UPDATE  watch
                              SET  ' . XDB::changeFlag('flags', 'contacts', Env::b('contacts')) . '
                            WHERE  uid = {?}', S::i('uid'));
+            S::user()->invalidWatchCache();
+            Platal::session()->updateNbNotifs();
         }
 
         if (Env::has('flags_mail')) {
@@ -215,6 +227,8 @@ class CarnetModule extends PLModule
             XDB::execute('UPDATE  watch
                              SET  ' . XDB::changeFlag('flags', 'mail', Env::b('mail')) . '
                            WHERE  uid = {?}', S::i('uid'));
+            S::user()->invalidWatchCache();
+            Platal::session()->updateNbNotifs();
         }
 
         $user = S::user();
@@ -261,7 +275,7 @@ class CarnetModule extends PLModule
 
         // For XSRF protection, checks both the normal xsrf token, and the special RSS token.
         // It allows direct linking to contact adding in the RSS feed.
-        if (Env::v('action') && Env::v('token') !== S::v('token')) {
+        if (Env::v('action') && Env::v('token') !== S::user()->token) {
             S::assert_xsrf_token();
         }
         switch (Env::v('action')) {