X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Frss.inc.php;h=89d63ca00063eea71c94bffb3e4e640de927a65b;hb=730a173a333507926e0029d8a96c3a26b55756e4;hp=ba6c2f3f82436d09a7c02e1ccc5d4477e92fad45;hpb=d1c97e427c6766a1fbd57aa66ae3a9bf5999200a;p=platal.git

diff --git a/include/rss.inc.php b/include/rss.inc.php
index ba6c2f3..89d63ca 100644
--- a/include/rss.inc.php
+++ b/include/rss.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2008 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -25,16 +25,7 @@ function _rss_encode_date($d) {
     } else {
         $t = strtotime($d);
     }
-    return utf8_encode(date('r', $t));
-}
-
-function to_rss ($s)
-{
-    if(is_string($s)) {
-        return iconv('ISO_8859-15', 'UTF8', $s);
-    } else {
-        return $s;
-    }
+    return date('r', $t);
 }
 
 function init_rss($template, $alias, $hash, $require_uid = true)
@@ -42,12 +33,12 @@ function init_rss($template, $alias, $hash, $require_uid = true)
     global $page;
     $page->changeTpl($template, NO_SKIN);
     $page->register_modifier('rss_date', '_rss_encode_date');
-    $page->default_modifiers = Array('@to_rss');
 
     $res = XDB::query(
         'SELECT  a.id
            FROM  aliases         AS a
-     INNER JOIN  auth_user_quick AS q ON ( a.id = q.user_id AND q.core_rss_hash = {?} )
+     INNER JOIN  auth_user_md5   AS u ON (a.id = u.user_id AND u.perms IN ("admin", "user"))
+     INNER JOIN  auth_user_quick AS q ON (a.id = q.user_id AND q.core_rss_hash = {?})
           WHERE  a.alias = {?} AND a.type != "homonyme"', $hash, $alias);
     $uid = $res->fetchOneCell();
 
@@ -59,9 +50,11 @@ function init_rss($template, $alias, $hash, $require_uid = true)
         }
     }
 
-    header('Content-Type: application/rss+xml; charset=utf8');
+    if ($template) {
+        header('Content-Type: application/rss+xml; charset=utf8');
+    }
     return $uid;
 }
 
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>