X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Frss.inc.php;h=89d63ca00063eea71c94bffb3e4e640de927a65b;hb=9833e186295906e81ff8c5ac4256f5cc941db0f8;hp=42b8ca142b91095092a90c062dc5a51bb8e5702a;hpb=50a40a33a496131e817df875607ea5542d096a64;p=platal.git

diff --git a/include/rss.inc.php b/include/rss.inc.php
index 42b8ca1..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,40 +25,36 @@ function _rss_encode_date($d) {
     } else {
         $t = strtotime($d);
     }
-    return utf8_encode(date('r', $t));
+    return date('r', $t);
 }
 
-function to_rss ($s)
+function init_rss($template, $alias, $hash, $require_uid = true)
 {
-    if(is_string($s)) {
-        return utf8_encode($s);
-    } else {
-        return $s;
-    }
-}
-
-function init_rss($template)
-{
-    global $page, $globals;
-    new_nonhtml_page($template, AUTH_PUBLIC);
+    global $page;
+    $page->changeTpl($template, NO_SKIN);
     $page->register_modifier('rss_date', '_rss_encode_date');
-    $page->default_modifiers = Array('@to_rss');
 
-    if (preg_match(',^/([^/]+)/([^/]+)\.xml$,', $_SERVER['PATH_INFO'], $m)) {
-        $alias = $m[1];
-        $hash  = $m[2];
-        $res = $globals->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 = {?} )
-              WHERE  a.alias = {?} AND a.type != "homonyme"', $hash, $alias);
-        $uid = $res->fetchOneCell();
+    $res = XDB::query(
+        'SELECT  a.id
+           FROM  aliases         AS a
+     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();
+
+    if (empty($uid)) {
+        if ($require_uid) {
+            exit;
+        } else {
+            $uid = null;
+        }
     }
-    if (empty($uid)) { exit; }
 
-    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:
 ?>