Fix RSS encoding, add a disclaimer for xnet announces...

[platal.git] / include / rss.inc.php

diff --git a/include/rss.inc.php b/include/rss.inc.php
index 10fb3ed..ba6c2f3 100644 (file)
--- a/include/rss.inc.php
+++ b/include/rss.inc.php
@@ -31,20 +31,20 @@ function _rss_encode_date($d) {
 function to_rss ($s)
 {
     if(is_string($s)) {
-        return utf8_encode($s);
+        return iconv('ISO_8859-15', 'UTF8', $s);
     } else {
         return $s;
     }
 }
 
-function init_rss($template, $alias, $hash)
+function init_rss($template, $alias, $hash, $require_uid = true)
 {
-    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');
 
-    $res = $globals->xdb->query(
+    $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 = {?} )
@@ -52,7 +52,11 @@ function init_rss($template, $alias, $hash)
     $uid = $res->fetchOneCell();
 
     if (empty($uid)) {
-        exit;
+        if ($require_uid) {
+            exit;
+        } else {
+            $uid = null;
+        }
     }
 
     header('Content-Type: application/rss+xml; charset=utf8');