simplify the scheme a bit

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@127 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/htdocs/wiki.php b/htdocs/wiki.php
index 33cc717..bca07b3 100644 (file)
--- 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();
 ?>

diff --git a/include/pmwiki.php b/include/pmwiki.php
deleted file mode 100644 (file)
index 480875b..0000000
--- a/include/pmwiki.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/***************************************************************************
- *  Copyright (C) 2003-2004 Polytechnique.org                              *
- *  http://opensource.polytechnique.org/                                   *
- *                                                                         *
- *  This program is free software; you can redistribute it and/or modify   *
- *  it under the terms of the GNU General Public License as published by   *
- *  the Free Software Foundation; either version 2 of the License, or      *
- *  (at your option) any later version.                                    *
- *                                                                         *
- *  This program is distributed in the hope that it will be useful,        *
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of         *
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
- *  GNU General Public License for more details.                           *
- *                                                                         *
- *  You should have received a copy of the GNU General Public License      *
- *  along with this program; if not, write to the Free Software            *
- *  Foundation, Inc.,                                                      *
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
- ***************************************************************************/
-
-// should be at global level (and not in a function)
-// as we need to include lots of globals vars in the external wiki
-if ($globals->wiki->wikidir)
-{
-    ob_start();
-    require_once($globals->spoolroot.$globals->wiki->wikidir.'/pmwiki.php');
-
-    $wikiAll = ob_get_clean();
-    $i = strpos($wikiAll, "<!--/HeaderText-->");
-    $j = strpos($wikiAll, "<!--/PageLeftFmt-->", $i);
-
-    $wikiHeaders = substr($wikiAll, 0, $i);
-
-    $wikiMenu = substr($wikiAll, $i, $j-$i);
-
-    $wikiTxt = substr($wikiAll, $j);
-
-}
-
-?>