X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fevents.php;h=6a02b23c55498d81f218279ede83579471ddd1ec;hb=916b4ee3e800729a93cfb4e3da0c56818baf7c3f;hp=eebfa82c219636e5f99ef61de91d88549220654f;hpb=34465ab035104f739a54ec62660f04f874448627;p=platal.git

diff --git a/modules/events.php b/modules/events.php
index eebfa82..6a02b23 100644
--- a/modules/events.php
+++ b/modules/events.php
@@ -40,7 +40,7 @@ class EventsModule extends PLModule
     {
         global $globals;
         // Add a new special tip when changing plat/al version
-        if ($globals->version != S::v('last_version') && is_null($exclude)) {
+        if ($globals->version != S::user()->last_version && is_null($exclude)) {
             XDB::execute('UPDATE accounts
                              SET last_version = {?}
                            WHERE uid = {?}',
@@ -104,29 +104,37 @@ class EventsModule extends PLModule
     {
         $page->changeTpl('events/index.tpl');
         $page->addJsLink('ajax.js');
-        $page->assign('tips', $this->get_tips());
 
-        // Adds a reminder onebox to the page.
         $user = S::user();
-        require_once 'reminder.inc.php';
-        if (($reminder = Reminder::GetCandidateReminder($user))) {
-            $reminder->Prepare($page);
-        }
 
-        // Wishes "Happy birthday" when required
-        $profile = $user->profile();
-        if (!is_null($profile)) {
-            if ($profile->next_birthday == date('Y-m-d')) {
-                $birthyear = (int)date('Y', strtotime($profile->birthdate));
-                $curyear   = (int)date('Y');
-                $page->assign('birthday', $curyear - $birthyear);
+        /** XXX: Tips and reminder only for user with 'email' permission.
+         * We can do better in the future by storing the required permission(s)
+         * with teh tip/reminder.
+         */
+        if ($user->checkPerms(User::PERM_MAIL)) {
+            $page->assign('tips', $this->get_tips());
+
+            // Adds a reminder onebox to the page.
+            require_once 'reminder.inc.php';
+            if (($reminder = Reminder::GetCandidateReminder($user))) {
+                $reminder->Prepare($page);
+            }
+
+            // Wishes "Happy birthday" when required
+            $profile = $user->profile();
+            if (!is_null($profile)) {
+                if ($profile->next_birthday == date('Y-m-d')) {
+                    $birthyear = (int)date('Y', strtotime($profile->birthdate));
+                    $curyear   = (int)date('Y');
+                    $page->assign('birthday', $curyear - $birthyear);
+                }
             }
         }
 
         // Direct link to the RSS feed, when available.
         if (S::hasAuthToken()) {
             $page->setRssLink('Polytechnique.org :: News',
-                              '/rss/'.S::v('hruid') .'/'.S::v('token').'/rss.xml');
+                              '/rss/' . S::v('hruid') . '/' . S::user()->token . '/rss.xml');
         }
 
         // Hide the read event, and reload the page to get to the next event.
@@ -199,7 +207,6 @@ class EventsModule extends PLModule
                 exit;
             }
         } elseif ($eid == 'valid') {
-            require_once 'validations.inc.php';
             $valid = Validate::get_request_by_id($valid);
             if ($valid && $valid->img) {
                 pl_cached_dynamic_content_headers("image/" . $valid->imgtype);
@@ -286,7 +293,6 @@ class EventsModule extends PLModule
         } elseif ($action) {
             S::assert_xsrf_token();
 
-            require_once 'validations.inc.php';
             $evtreq = new EvtReq($titre, $texte, $promo_min, $promo_max,
                                  $expiration, $valid_mesg, S::user(), $upload);
             $evtreq->submit();
@@ -311,10 +317,10 @@ class EventsModule extends PLModule
         $table_editor->describe('expiration', 'date de péremption', true);
         $table_editor->describe('promo_min', 'promo. min (0 aucune)', false);
         $table_editor->describe('promo_max', 'promo. max (0 aucune)', false);
-        $table_editor->describe('titre', 'titre', true);
+        $table_editor->describe('title', 'titre', true);
         $table_editor->describe('state', 'actif', true);
         $table_editor->describe('text', 'texte (html) de l\'astuce', false);
-        $table_editor->describe('priorite', '0<=priorité<=255', true);
+        $table_editor->describe('priority', '0<=priorité<=255', true);
         $table_editor->list_on_edit(false);
         $table_editor->apply($page, $action, $id);
         if (($action == 'edit' && !is_null($id)) || $action == 'update') {