X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fwiki%2Fengine.php;h=f8c01fc91494b56ffc012129fdf126ffb640fb92;hb=a7d35093a40837b3a17d7fbac0259995f084812c;hp=276bb7e6c29304699dea26ae6817ca78d3643f12;hpb=a7de4ef724d1a3b0bf978a50ce7cc9d23412c7a0;p=platal.git diff --git a/include/wiki/engine.php b/include/wiki/engine.php index 276bb7e..f8c01fc 100644 --- a/include/wiki/engine.php +++ b/include/wiki/engine.php @@ -1,6 +1,6 @@ trig('Permissions mises à jour'); + $page->trigSuccess('Permissions mises à jour'); } } @@ -55,16 +59,15 @@ if ($p = Post::v('setwperms')) { wiki_apply_perms('admin'); if (wiki_set_perms($n, $perms[0], $p)) { $perms = wiki_get_perms($n); - $page->trig('Permissions mises à jour'); + $page->trigSuccess('Permissions mises à jour'); } } // Generate cache even if we don't have access rights $wiki_cache = wiki_work_dir().'/cache_'.wiki_filename($n).'.tpl'; $cache_exists = file_exists($wiki_cache); - if (Env::v('action') || !$cache_exists) { - if ($cache_exists) { + if ($cache_exists && !$feed) { unlink($wiki_cache); $files = glob($globals->spoolroot . '/spool/templates_c/*cache_' . wiki_filename($n) . '.tpl*'); foreach ($files as $file) { @@ -77,6 +80,8 @@ if (Env::v('action') || !$cache_exists) { require_once($globals->spoolroot.'/wiki/pmwiki.php'); $wikiAll = ob_get_clean(); + pl_clear_errors(); + // the pmwiki skin we are using (almost empty) has these keywords: $i = strpos($wikiAll, ""); $j = strpos($wikiAll, "", $i); @@ -84,7 +89,14 @@ if (Env::v('action') || !$cache_exists) { $wiki_exists = file_exists(wiki_work_dir() . '/' . wiki_filename($n)); -if (Env::v('action')) { +if ($feed) { + $wikiAll = str_replace('dc:contributor', 'author', $wikiAll); + $wikiAll = preg_replace('!.*?\..*?\.(\d{4})\|(.*?)!u', '$2 (X$1)', $wikiAll); + $wikiAll = str_replace('./', '' . $globals->baseurl . '/' . $platal->ns, $wikiAll); + echo $wikiAll; + pl_clear_errors(); + exit; +} elseif (Env::v('action')) { $page->assign('xorg_extra_header', substr($wikiAll, 0, $i)); $wikiAll = substr($wikiAll, $j); } else { @@ -111,7 +123,7 @@ $page->assign('canedit', wiki_may_have_perms($perms[1])); $page->assign('has_perms', wiki_may_have_perms('admin')); $page->assign('wikipage', str_replace('.', '/', $n)); -if ($perms[1] == 'admin' && !Env::v('action') && $wiki_exists) { +if (!$feed && $perms[1] == 'admin' && !Env::v('action') && $wiki_exists) { $page->assign('pmwiki_cache', $wiki_cache); } else { $page->assign('pmwiki', $wikiAll); @@ -119,6 +131,13 @@ if ($perms[1] == 'admin' && !Env::v('action') && $wiki_exists) { } $page->addCssLink('wiki.css'); $page->addJsLink('wiki.js'); +if (!Env::v('action')) { + $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();