simplify code, delete one include

[platal.git] / htdocs / wiki.php

diff --git a/htdocs/wiki.php b/htdocs/wiki.php
index 7958eb0..bca07b3 100644 (file)
--- a/htdocs/wiki.php
+++ b/htdocs/wiki.php
@@ -20,25 +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($globals->spoolroot.$globals->wiki->wikidir.'/pmwiki.php');
+if ($globals->wiki->wikidir) {
+    ob_start();
+    require_once(dirname(dirname(__FILE__)).'/'.$globals->wiki->wikidir.'/pmwiki.php');
 
- $wikiAll = ob_get_clean();
- $i = strpos($wikiAll, "<!--/HeaderText-->");
+    $wikiAll = ob_get_clean();
+    $i = strpos($wikiAll, "<!--/HeaderText-->");
+    $j = strpos($wikiAll, "<!--/PageLeftFmt-->", $i);
 
- $page->assign('xorg_extra_header', substr($wikiAll, 0, $i));
-
- $wikiTxt = substr($wikiAll, $i);
-
- $page->assign('pmwiki', $wikiTxt);
+    $page->assign('xorg_extra_header', substr($wikiAll, 0, $i));
+    $page->assign('menu-pmwiki', substr($wikiAll, $i, $j-$i));
+    $page->assign('pmwiki', substr($wikiAll, $j));
 }
 
+$page->addCssLink('css/wiki.css');
+
 $page->run();
 ?>