X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=htdocs%2Fwiki.php;h=bca07b3b6f31f2d15be8bacf6b56ee4c856af976;hb=d575b75cff2a418992a54bfa311c888cab19bd8b;hp=33cc7179783da66dfb73b380452612ecb21432c4;hpb=22e19b61c6c0b507b7970ac3f6a8dfdc51d74807;p=platal.git

diff --git a/htdocs/wiki.php b/htdocs/wiki.php
index 33cc717..bca07b3 100644
--- a/htdocs/wiki.php
+++ b/htdocs/wiki.php
@@ -20,17 +20,22 @@
  ***************************************************************************/
 
 require_once("xorg.inc.php");
-if (Env::has('response'))
- new_skinned_page('wiki.tpl', AUTH_MDP);
-else
- new_skinned_page('wiki.tpl', AUTH_PUBLIC);
+new_skinned_page('wiki.tpl', Env::has('response') ? AUTH_MDP : AUTH_PUBLIC);
+
+if ($globals->wiki->wikidir) {
+    ob_start();
+    require_once(dirname(dirname(__FILE__)).'/'.$globals->wiki->wikidir.'/pmwiki.php');
+
+    $wikiAll = ob_get_clean();
+    $i = strpos($wikiAll, "<!--/HeaderText-->");
+    $j = strpos($wikiAll, "<!--/PageLeftFmt-->", $i);
+
+    $page->assign('xorg_extra_header', substr($wikiAll, 0, $i));
+    $page->assign('menu-pmwiki', substr($wikiAll, $i, $j-$i));
+    $page->assign('pmwiki', substr($wikiAll, $j));
+}
 
-require_once('pmwiki.php');
- 
 $page->addCssLink('css/wiki.css');
-$page->assign('xorg_extra_header', substr($wikiAll, 0, $i));
-$page->assign('menu-pmwiki', $wikiMenu);
-$page->assign('pmwiki', $wikiTxt);
 
 $page->run();
 ?>