Typo and charset fixes

[platal.git] / include / wiki / engine.php

diff --git a/include/wiki/engine.php b/include/wiki/engine.php
index 859dd95..b294af9 100644 (file)
--- a/include/wiki/engine.php
+++ b/include/wiki/engine.php
@@ -33,8 +33,9 @@ $feed  = false;
 // Check user perms
 switch (Env::v('action')) {
   case 'rss': case 'atom': case 'sdf': case 'dc':
+    wiki_apply_feed_perms($perms['0']);  
     $feed = true;
-  case '': case 'search': case 'rss': case 'atom': 
+  case '': case 'search': 
     break;
 
   case 'edit':
@@ -89,6 +90,9 @@ $wiki_exists = file_exists(wiki_work_dir() . '/' . wiki_filename($n));
 if ($feed) {
     $wikiAll = str_replace('dc:contributor', 'author', $wikiAll);
     $wikiAll = preg_replace('!<author>.*?\..*?\.(\d{4})\|(.*?)</author>!u', '<author>$2 (X$1)</author>', $wikiAll);
+    echo $wikiAll;
+    pl_clear_errors();
+    exit;
 } elseif (Env::v('action')) {
     $page->assign('xorg_extra_header', substr($wikiAll, 0, $i));
     $wikiAll = substr($wikiAll, $j);
@@ -109,11 +113,6 @@ if ($feed) {
 // Check user perms
 wiki_apply_perms($perms[0]);
 
-if ($feed) {
-    echo $wikiAll;
-    exit;
-}
-
 $page->assign('perms', $perms);
 $page->assign('perms_opts', wiki_perms_options());
 
@@ -130,7 +129,11 @@ if (!$feed && $perms[1] == 'admin' && !Env::v('action') && $wiki_exists) {
 $page->addCssLink('wiki.css');
 $page->addJsLink('wiki.js');
 if (!Env::v('action')) {
-    $page->setRssLink($n, '/' . str_replace('.', '/', $n) . '?action=rss');
+    $url = '/' . str_replace('.', '/', $n) . '?action=rss';
+    if (S::logged()) {
+        $url .= '&user=' . S::v('forlife') . '&hash=' . S::v('core_rss_hash');
+    } 
+    $page->setRssLink($n, $url);
 }
 
 $page->run();