modifs wiki

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

diff --git a/htdocs/wiki.php b/htdocs/wiki.php
index 7958eb0..08fe9a9 100644 (file)
--- a/htdocs/wiki.php
+++ b/htdocs/wiki.php
@@ -25,20 +25,11 @@ if (Env::has('response'))
 else
  new_skinned_page('wiki.tpl', AUTH_PUBLIC);
 
-if ($globals->wiki->wikidir)
-{
- ob_start();
- require_once($globals->spoolroot.$globals->wiki->wikidir.'/pmwiki.php');
-
- $wikiAll = ob_get_clean();
- $i = strpos($wikiAll, "<!--/HeaderText-->");
-
+require_once('pmwiki.php');
+ 
  $page->assign('xorg_extra_header', substr($wikiAll, 0, $i));
-
- $wikiTxt = substr($wikiAll, $i);
-
+ $page->assign('menu-pmwiki', $wikiMenu);
  $page->assign('pmwiki', $wikiTxt);
-}
 
 $page->run();
 ?>

diff --git a/include/pmwiki.php b/include/pmwiki.php
new file mode 100644 (file)
index 0000000..8b973c8
--- /dev/null
+++ b/include/pmwiki.php
@@ -0,0 +1,41 @@
+<?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);
+
+}
+
+?>

diff --git a/plugins/pmwiki.config.php b/plugins/pmwiki.config.php
index 7673691..9a2d5c8 100644 (file)
--- a/plugins/pmwiki.config.php
+++ b/plugins/pmwiki.config.php
@@ -12,6 +12,7 @@
 ##  $ScriptUrl is your preferred URL for accessing wiki pages
 ##  $PubDirUrl is the URL for the pub directory.
 $ScriptUrl = $globals->baseurl;
+$UploadUrlFmt = $ScriptUrl."/uploads";
 $WorkDir = '../wiki/wiki.d';
 $WikiDir = new PageStore('$FarmD/wiki.d/$FullName');
 $PubDirUrl = $globals->baseurl.'/pubwiki';

diff --git a/plugins/pmwiki.platalSkin.php b/plugins/pmwiki.platalSkin.php
index bb782c0..f7fa131 100644 (file)
--- a/plugins/pmwiki.platalSkin.php
+++ b/plugins/pmwiki.platalSkin.php
@@ -10,6 +10,10 @@ Markup("[[~platal", "<[[~", '/\[\[~([^|\]]*)\|([^\]]*)\]\]/e', 'PreserveText("="
 // (:request topic:) then (:if topic top:) will test $_REQUEST['topic'] == 'top'
 Markup("requestVars", "<if", '/\(:request ([a-z_]+)( ([a-z_]+))?:\)/ie', 'RequestToCond("$1", "$3")');
 
+## [[#anchor]] in standard XHTML
+Markup('[[#','<[[','/(?>\\[\\[#([A-Za-z][-.:\\w]*))\\]\\]/e',
+  "Keep(\"<a id='$1'></a>\",'L')");
+  
 function RequestToCond($var, $default)
 {
  global $Conditions;