X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fwiki%2Fengine.php;h=fb3a61ecff58424a88d313ef35840b2c41316ad2;hb=7f12e3b4113791f3372f11572a205925d7bb6b97;hp=1ac5511816986ae6cb220113efb863de89336fc0;hpb=fce088c179adecaf9d013e927db96dfe960bccba;p=platal.git
diff --git a/include/wiki/engine.php b/include/wiki/engine.php
index 1ac5511..fb3a61e 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,36 +59,57 @@ 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) {
- @unlink($wiki_cache);
+ if ($cache_exists && !$feed) {
+ unlink($wiki_cache);
+ $files = glob($globals->spoolroot . '/spool/templates_c/*cache_' . wiki_filename($n) . '.tpl*');
+ foreach ($files as $file) {
+ unlink($file);
+ }
+ }
// we leave pmwiki do whatever it wants and store everything
ob_start();
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);
}
-if (Env::v('action')) {
- $page->assign('xorg_extra_header', substr($wikiAll, 0, $i));
+$wiki_exists = file_exists(wiki_work_dir() . '/' . wiki_filename($n));
+
+if ($feed) {
+ $wikiAll = str_replace('dc:contributor', 'author', $wikiAll);
+ $wikiAll = preg_replace('!
La page de wiki $n n'existe pas. " + . "Il te suffit de l'éditer
"; + } else { + $page->changeTpl('core/404.tpl'); } } @@ -98,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')) { +if (!$feed && $perms[1] == 'admin' && !Env::v('action') && $wiki_exists) { $page->assign('pmwiki_cache', $wiki_cache); } else { $page->assign('pmwiki', $wikiAll); @@ -106,7 +131,15 @@ if ($perms[1] == 'admin' && !Env::v('action')) { } $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(); +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: ?>