wibble

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-360

diff --git a/htdocs/admin/evenements.php b/htdocs/admin/evenements.php
index 49617ed..5273d7c 100644 (file)
--- a/htdocs/admin/evenements.php
+++ b/htdocs/admin/evenements.php
@@ -29,7 +29,7 @@ $page->assign('arch', $arch);
 switch(Post::get('action')) {
     case "Proposer":
         $globals->xdb->execute('UPDATE evenements SET titre={?}, texte={?}, peremption={?}, promo_min={?}, promo_max={?} WHERE id = {?}', 
-                Post::get('titre'), Post::get('texte'), Post::get('peremption'), Post::get('promo_min'), Post::get('promo_max'));
+                Post::get('titre'), Post::get('texte'), Post::get('peremption'), Post::get('promo_min'), Post::get('promo_max'), $evid);
         break;
 
     case "Valider":

diff --git a/htdocs/rss.php b/htdocs/rss.php
index ceed5ca..aa7a9b3 100644 (file)
--- a/htdocs/rss.php
+++ b/htdocs/rss.php
@@ -22,17 +22,19 @@
 require_once('xorg.inc.php');
 new_nonhtml_page('rss.tpl', AUTH_PUBLIC);
 
-$requete = 'SELECT e.id,e.titre,e.texte FROM evenements AS e WHERE FIND_IN_SET(flags, "valide") AND peremption >= NOW()';
+if (!Env::has('promo')) { exit; }
+require_once('rss.inc.php');
 
-if (Env::has('promo')) {
-    $promo    = Env::getInt('promo');
-    $requete .= " AND (e.promo_min = 0 || e.promo_min <= $promo) AND (e.promo_max = 0 || e.promo_max >= $promo)";
-    $page->assign('promo', $promo);
-}
+$rss = $globals->xdb->iterator(
+        'SELECT  e.id, e.titre, e.texte, e.creation_date
+           FROM  evenements AS e
+          WHERE  FIND_IN_SET(flags, "valide") AND peremption >= NOW()
+                 AND (e.promo_min = 0 || e.promo_min <= {?})
+                 AND (e.promo_max = 0 || e.promo_max >= {?})
+       ORDER BY  (e.promo_min != 0 AND e.promo_max != 0) DESC, e.peremption',
+       Env::getInt('promo'), Env::getInt('promo'));
+$page->assign('rss', $rss);
 
-$requete.=' ORDER BY (e.promo_min != 0 AND e.promo_max != 0) DESC,  e.peremption';
-$page->assign('rss', $globals->xdb->iterator($requete));
-
-header('Content-Type: text/xml');
+header('Content-Type: text/xml; charset=utf-8');
 $page->run();
 ?> 

diff --git a/include/xorg/database.inc.php b/include/xorg/database.inc.php
index f7bdfef..52e7ee4 100644 (file)
--- a/include/xorg/database.inc.php
+++ b/include/xorg/database.inc.php
@@ -122,7 +122,7 @@ class XOrgDBResult
     function XOrgDBResult($query)
     {
         global $globals;
-        if (strpos("SQL_CALC_FOUND_ROWS", $query) === false) {
+        if (strpos($query, 'SQL_CALC_FOUND_ROWS') === false) {
             $this->_res = $globals->db->query($query);
         } else {
             $this->_res = mysql_query($query);

diff --git a/templates/rss.tpl b/templates/rss.tpl
index 445c413..6fd0e6a 100644 (file)
--- a/templates/rss.tpl
+++ b/templates/rss.tpl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0"?>
 {***************************************************************************
  *  Copyright (C) 2003-2004 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
@@ -18,25 +18,29 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************}
-
-<!DOCTYPE rss PUBLIC "-//Netscape Communications//DTD RSS 0.91//EN"
- "http://my.netscape.com/publish/formats/rss-0.91.dtd">
-
-<rss version="0.91">
-
-<channel>
-<title>Polytechnique.org :: News</title>
-<link>http://{$smarty.server.SERVER_NAME}/</link>
-<description>L'actualité polytechnicienne...{if $promo} Promotion {$promo}{/if}</description>
-<language>fr</language>
-
-{iterate item=line from=$rss}
-<item>
-<title>{$line.titre|strip_tags}</title>
-<link>http://{$smarty.server.SERVER_NAME}/login.php#newsid{$line.id}</link>
-</item>
-{/iterate}
-
-</channel>
+<rss version="2.0">
+  <channel>
+    <title>Polytechnique.org :: News</title>
+    <language>fr</language>
+    <link>{#globals.baseurl#}/</link>
+    <description>L'actualit&eacute; polytechnicienne...</description>
+    <image>
+      <title>Polytechnique.org</title>
+      <url>{#globals.baseurl#}/images/logo.png</url>
+      <link>{#globals.baseurl#}/</link>
+    </image>
+    {iterate item=line from=$rss}
+    <item>
+      <title>{$line.titre|strip_tags}</title>
+      <link>{#globals.baseurl#}/login.php#newsid{$line.id}</link>
+      <description><![CDATA[{$line.texte|nl2br}]]></description>
+      <image>
+        <title>Polytechnique.org</title>
+        <url>{#globals.baseurl#}/images/logo.png</url>
+        <link>{#globals.baseurl#}/</link>
+      </image>
+    </item>
+    {/iterate}
+  </channel>
 </rss>
 {* vim:set et sw=2 sts=2 sws=2: *}