From 522162cc5dd8cc27e4a1ca0fbc38ac3ce62cd4dc Mon Sep 17 00:00:00 2001
From: x2003bruneau <x2003bruneau@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Tue, 7 Nov 2006 13:45:08 +0000
Subject: [PATCH] Add author name in RSS stream

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1056 839d8a87-29fc-0310-9880-83ba4fa771e5
---
 ChangeLog          | 3 +++
 modules/platal.php | 6 ++++--
 templates/rss.tpl  | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 486523a..f4b7de1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@ New:
     * Carnet:
         - Add a vcard of all the contacts                                  -FRU
 
+    * Events:
+        - Add author in RSS                                                -FRU
+
     * Xnet:
         - Add a vcard of all the members of a group                        -FRU
 
diff --git a/modules/platal.php b/modules/platal.php
index 7d72369..dff65ce 100644
--- a/modules/platal.php
+++ b/modules/platal.php
@@ -401,10 +401,12 @@ Mail envoy
         $uid = init_rss('rss.tpl', $user, $hash);
 
         $rss = XDB::iterator(
-                'SELECT  e.id, e.titre, e.texte, e.creation_date
+                'SELECT  e.id, e.titre, e.texte, e.creation_date,
+                         IF(u2.nom_usage = "", u2.nom, u2.nom_usage) AS nom, u2.prenom, u2.promo
                    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) )
+                                                 AND (e.promo_max = 0 || e.promo_max >= u.promo) )
+             INNER JOIN  auth_user_md5   AS u2 ON (u2.user_id = e.user_id)
                   WHERE  u.user_id = {?} AND FIND_IN_SET(e.flags, "valide")
                                          AND peremption >= NOW()', $uid);
         $page->assign('rss', $rss);
diff --git a/templates/rss.tpl b/templates/rss.tpl
index 5fe92ba..91fb54b 100644
--- a/templates/rss.tpl
+++ b/templates/rss.tpl
@@ -37,6 +37,7 @@
       <title>{$line.titre|strip_tags}</title>
       <link>{#globals.baseurl#}/events#newsid{$line.id}</link>
       <description><![CDATA[{$line.texte|nl2br}]]></description>
+      <author>{$line.prenom} {$line.nom} (X{$line.promo})</author>
       <pubDate>{$line.creation_date|rss_date}</pubDate>
     </item>
     {/iterate}
-- 
2.1.4