X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fevents.php;h=469bce1ec9b7dcdde625c390ce98a660f84268a8;hb=714f5437ddf637fc9514709a4bb07c6c5eb71542;hp=0a16d146a1f3e40fe7e86fb42d7896de2e656328;hpb=3f95a7bd17cd6cd7b218f12787276a485f496f1d;p=platal.git

diff --git a/modules/events.php b/modules/events.php
index 0a16d14..469bce1 100644
--- a/modules/events.php
+++ b/modules/events.php
@@ -24,15 +24,15 @@ class EventsModule extends PLModule
     function handlers()
     {
         return array(
-            'events'         => $this->make_hook('ev',        AUTH_COOKIE),
-            'rss'            => $this->make_hook('rss', AUTH_PUBLIC, 'user', NO_HTTPS),
-            'events/preview' => $this->make_hook('preview', AUTH_PUBLIC, 'user', NO_AUTH),
-            'events/photo'   => $this->make_hook('photo', AUTH_PUBLIC),
-            'events/submit'  => $this->make_hook('ev_submit', AUTH_MDP),
-            'admin/events'   => $this->make_hook('admin_events',     AUTH_MDP, 'admin'),
-
-            'ajax/tips'      => $this->make_hook('tips',      AUTH_COOKIE, 'user', NO_AUTH),
-            'admin/tips'     => $this->make_hook('admin_tips', AUTH_MDP, 'admin'),
+            'events'         => $this->make_hook('ev',           AUTH_COOKIE),
+            'rss'            => $this->make_hook('rss',          AUTH_PUBLIC, 'user', NO_HTTPS),
+            'events/preview' => $this->make_hook('preview',      AUTH_PUBLIC, 'user', NO_AUTH),
+            'events/photo'   => $this->make_hook('photo',        AUTH_PUBLIC),
+            'events/submit'  => $this->make_hook('ev_submit',    AUTH_MDP),
+            'admin/events'   => $this->make_hook('admin_events', AUTH_MDP,    'admin'),
+
+            'ajax/tips'      => $this->make_hook('tips',         AUTH_COOKIE, 'user', NO_AUTH),
+            'admin/tips'     => $this->make_hook('admin_tips',   AUTH_MDP,    'admin'),
         );
     }
 
@@ -106,14 +106,16 @@ class EventsModule extends PLModule
         $page->addJsLink('ajax.js');
         $page->assign('tips', $this->get_tips());
 
-        // Profile update (appears when profile is > 400d old), and birthday
-        // oneboxes.
+        // 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 (strtotime($profile->last_change) < time() - (400 * 86400)) {
-                $page->assign('fiche_incitation', $profile->last_change);
-            }
             if ($profile->next_birthday == date('Y-m-d')) {
                 $birthyear = (int)date('Y', strtotime($profile->birthdate));
                 $curyear   = (int)date('Y');
@@ -121,17 +123,6 @@ class EventsModule extends PLModule
             }
         }
 
-        // No-photo onebox.
-        $res = XDB::query("SELECT  COUNT(*)
-                             FROM  photo
-                            WHERE  uid = {?}",
-                          S::user()->id());
-        $page->assign('photo_incitation', $res->fetchOneCell() == 0);
-
-        // Geo-location onebox.
-        require_once "geocoding.inc.php";
-        $page->assign('geoloc_incitation', Geocoder::countNonGeocoded(S::user()->id()));
-
         // Direct link to the RSS feed, when available.
         if (S::hasAuthToken()) {
             $page->setRssLink('Polytechnique.org :: News',
@@ -203,7 +194,7 @@ class EventsModule extends PLModule
             $res = XDB::query("SELECT * FROM evenements_photo WHERE eid = {?}", $eid);
             if ($res->numRows()) {
                 $photo = $res->fetchOneAssoc();
-                header('Content-Type: image/' . $photo['attachmime']);
+                pl_cached_dynamic_content_headers("image/" . $photo['attachmime']);
                 echo $photo['attach'];
                 exit;
             }
@@ -211,20 +202,20 @@ class EventsModule extends PLModule
             require_once 'validations.inc.php';
             $valid = Validate::get_request_by_id($valid);
             if ($valid && $valid->img) {
-                header('Content-Type: image/' . $valid->imgtype);
+                pl_cached_dynamic_content_headers("image/" . $valid->imgtype);
                 echo $valid->img;
                 exit;
             }
         } else {
             $upload = new PlUpload(S::user()->login(), 'event');
             if ($upload->exists() && $upload->isType('image')) {
-                header('Content-Type: ' . $upload->contentType());
+                pl_cached_dynamic_content_headers($upload->contentType());
                 echo $upload->getContents();
                 exit;
             }
         }
         global $globals;
-        header('Content-Type: image/png');
+        pl_cached_dynamic_content_headers("image/png");
         echo file_get_contents($globals->spoolroot . '/htdocs/images/logo.png');
         exit;
     }
@@ -249,7 +240,7 @@ class EventsModule extends PLModule
         }
         $page->assign('texte', $texte);
         $page->assign('titre', $titre);
-        header('Content-Type: text/html; charset=utf-8');
+        pl_content_headers("text/html");
     }
 
     function handler_ev_submit(&$page)
@@ -307,7 +298,7 @@ class EventsModule extends PLModule
 
     function handler_tips(&$page, $tips = null)
     {
-        header('Content-Type: text/html; charset="UTF-8"');
+        pl_content_headers("text/html");
         $page->changeTpl('include/tips.tpl', NO_SKIN);
         $page->assign('tips', $this->get_tips($tips));
     }