Merge commit 'origin/master' into hruid

[platal.git] / modules / events.php

diff --git a/modules/events.php b/modules/events.php
index 15ce6d7..24b0a4b 100644 (file)
--- a/modules/events.php
+++ b/modules/events.php
@@ -144,7 +144,7 @@ class EventsModule extends PLModule
 
         // cache les evenements lus et raffiche les evenements a relire
         if ($action == 'read' && $eid) {
-            XDB::execute('DELETE evenements_vus.*
+            XDB::execute('DELETE ev.*
                             FROM evenements_vus AS ev
                       INNER JOIN evenements AS e ON e.id = ev.evt_id
                            WHERE peremption < NOW()');
@@ -218,7 +218,7 @@ class EventsModule extends PLModule
                 exit;
             }
         } else {
-            $upload = new PlUpload(S::v('forlife'), 'event');
+            $upload = new PlUpload(S::user()->login(), 'event');
             if ($upload->exists() && $upload->isType('image')) {
                 header('Content-Type: ' . $upload->contentType());
                 echo $upload->getContents();
@@ -233,22 +233,9 @@ class EventsModule extends PLModule
 
     function handler_rss(&$page, $user = null, $hash = null)
     {
-        require_once 'rss.inc.php';
-
-        $uid = init_rss('events/rss.tpl', $user, $hash);
-
-        $rss = XDB::iterator(
-                'SELECT  e.id, e.titre, e.texte, e.creation_date, e.post_id, p.attachmime IS NOT NULL AS photo,
-                         IF(u2.nom_usage = "", u2.nom, u2.nom_usage) AS nom, u2.prenom, u2.promo,
-                         FIND_IN_SET(\'wiki\', e.flags) AS wiki
-                   FROM  auth_user_md5   AS u
-             INNER JOIN  evenements      AS e ON ( (e.promo_min = 0 || e.promo_min <= u.promo)
-                                                 AND (e.promo_max = 0 || e.promo_max >= u.promo) )
-              LEFT JOIN  evenements_photo AS p ON (p.eid = e.id)
-             INNER JOIN  auth_user_md5   AS u2 ON (u2.user_id = e.user_id)
-                  WHERE  u.user_id = {?} AND FIND_IN_SET("valide", e.flags)
-                                         AND peremption >= NOW()', $uid);
-        $page->assign('rss', $rss);
+        $this->load('feed.inc.php');
+        $feed = new EventFeed();
+        return $feed->run($page, $user, $hash);
     }
 
     function handler_preview(&$page)
@@ -282,7 +269,7 @@ class EventsModule extends PLModule
         $peremption = Post::i('peremption');
         $valid_mesg = Post::v('valid_mesg');
         $action     = Post::v('action');
-        $upload     = new PlUpload(S::v('forlife'), 'event');
+        $upload     = new PlUpload(S::user()->login(), 'event');
         $this->upload_image($page, $upload);
 
         if (($promo_min > $promo_max && $promo_max != 0)||
@@ -312,7 +299,7 @@ class EventsModule extends PLModule
 
             require_once 'validations.inc.php';
             $evtreq = new EvtReq($titre, $texte, $promo_min, $promo_max,
-                                 $peremption, $valid_mesg, S::v('uid'), $upload);
+                                 $peremption, $valid_mesg, S::user(), $upload);
             $evtreq->submit();
             $page->assign('ok', true);
         } elseif (!Env::v('preview')) {
@@ -356,7 +343,7 @@ class EventsModule extends PLModule
         $arch = $action == 'archives';
         $page->assign('action', $action);
 
-        $upload = new PlUpload(S::v('forlife'), 'event');
+        $upload = new PlUpload(S::user()->login(), 'event');
         if ((Env::has('preview') || Post::v('action') == "Proposer") && $eid) {
             $action = 'edit';
             $this->upload_image($page, $upload);