From 0863b51d951bd469b4a791672c8fbcc14b9ff032 Mon Sep 17 00:00:00 2001
From: dairiki <dairiki@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Fri, 21 Feb 2003 23:01:11 +0000
Subject: [PATCH] Fixes to support new $basepage argument of WikiPlugin::run().

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@2634 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/CachedMarkup.php               |  4 ++--
 lib/WikiPluginCached.php           | 12 +++++++-----
 lib/plugin/RecentChangesCached.php | 13 +++++++++----
 lib/plugin/SystemInfo.php          | 15 ++++++++++-----
 4 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/lib/CachedMarkup.php b/lib/CachedMarkup.php
index d6bba798a..c930d49e0 100644
--- a/lib/CachedMarkup.php
+++ b/lib/CachedMarkup.php
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id: CachedMarkup.php,v 1.1 2003-02-21 04:06:45 dairiki Exp $');
+<?php rcs_id('$Id: CachedMarkup.php,v 1.2 2003-02-21 23:01:09 dairiki Exp $');
 /* Copyright (C) 2002, Geoffrey T. Dairiki <dairiki@dairiki.org>
  *
  * This file is part of PhpWiki.
@@ -343,7 +343,7 @@ class Cached_PluginInvocation extends Cached_DynamicContent {
         }
 
         $xml = HTML::div(array('class' => 'plugin'),
-			 $loader->expandPI($this->_pi, $GLOBALS['request']));
+			 $loader->expandPI($this->_pi, $GLOBALS['request'], $basepage));
         
 	if (isset($this->_tightenable)) {
 	    $xml->setInClass('tightenable');
diff --git a/lib/WikiPluginCached.php b/lib/WikiPluginCached.php
index af2045fdf..15133ad12 100644
--- a/lib/WikiPluginCached.php
+++ b/lib/WikiPluginCached.php
@@ -1,4 +1,4 @@
-<?php rcs_id('$Id: WikiPluginCached.php,v 1.3 2002-08-19 06:41:28 rurban Exp $');
+<?php rcs_id('$Id: WikiPluginCached.php,v 1.4 2003-02-21 23:01:09 dairiki Exp $');
 /*
  Copyright (C) 2002 Johannes Große (Johannes Gro&szlig;e)
 
@@ -113,14 +113,15 @@ class WikiPluginCached extends WikiPlugin
      * @access protected
      * @param  dbi       WikiDB  database abstraction class
      * @param  argstr    string  plugin arguments in the call from PhpWiki
-     * @param  request   Request ??? 
+     * @param  request   Request ???
+     * @param  string    basepage Pagename to use to interpret links [/relative] page names.
      * @return           string  HTML output to be printed to browser
      *
      * @see #getHtml
      * @see #getImage
      * @see #getMap
      */
-    function run($dbi, $argstr, $request) {
+    function run($dbi, $argstr, $request, $basepage) {
         $cache = WikiPluginCached::newCache();
         $cacheparams = $GLOBALS['CacheParams'];
 
@@ -141,7 +142,7 @@ class WikiPluginCached extends WikiPlugin
             case PLUGIN_CACHED_HTML:
                 if (!$content || !$content['html']) {
                     $this->resetError();
-                    $content['html'] = $this->getHtml($dbi,$sortedargs,$request);
+                    $content['html'] = $this->getHtml($dbi,$sortedargs,$request,$basepage);
                     if ($errortext = $this->getError()) {
                         WikiPluginCached::printError($errortext,'html');
                         return HTML();
@@ -285,10 +286,11 @@ class WikiPluginCached extends WikiPlugin
      *                                image. It is not necessary to call 
      *                                WikiPlugin->getArgs anymore.
      * @param  request   Request      ??? 
+     * @param  string    $basepage    Pagename to use to interpret links [/relative] page names.
      * @return           string       html to be printed in place of the plugin command
      *                                false if an error occured
      */
-    function getHtml($dbi, $argarray, $request) {
+    function getHtml($dbi, $argarray, $request, $basepage) {
         trigger_error('WikiPluginCached::getHtml: pure virtual function in file ' 
                       . __FILE__ . ' line ' . __LINE__, E_USER_ERROR);
     }
diff --git a/lib/plugin/RecentChangesCached.php b/lib/plugin/RecentChangesCached.php
index 2ff012e8f..c775b3a77 100644
--- a/lib/plugin/RecentChangesCached.php
+++ b/lib/plugin/RecentChangesCached.php
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: RecentChangesCached.php,v 1.2 2003-01-18 22:01:44 carstenklapp Exp $');
+rcs_id('$Id: RecentChangesCached.php,v 1.3 2003-02-21 23:01:10 dairiki Exp $');
 /**
  Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
 
@@ -56,7 +56,7 @@ extends WikiPluginCached
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.2 $");
+                            "\$Revision: 1.3 $");
     }
 
     function getDefaultArguments() {
@@ -67,16 +67,21 @@ extends WikiPluginCached
         return '+900'; // 15 minutes
     }
 
-    function getHtml($dbi, $argarray, $request) {
+    function getHtml($dbi, $argarray, $request, $basepage) {
         $loader = new WikiPluginLoader;
         return $loader->expandPI('<?plugin RecentChanges '
             . WikiPluginCached::glueArgs($argarray)
-            . ' ?>', $request);
+            . ' ?>', $request, $basepage);
     }
 
 } // WikiPlugin_TexToPng
 
 // $Log: not supported by cvs2svn $
+// Revision 1.2  2003/01/18 22:01:44  carstenklapp
+// Code cleanup:
+// Reformatting & tabs to spaces;
+// Added copyleft, getVersion, getDescription, rcs_id.
+//
 
 // For emacs users
 // Local Variables:
diff --git a/lib/plugin/SystemInfo.php b/lib/plugin/SystemInfo.php
index 7eab5b50d..8aa56e837 100644
--- a/lib/plugin/SystemInfo.php
+++ b/lib/plugin/SystemInfo.php
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: SystemInfo.php,v 1.5 2003-01-18 22:08:01 carstenklapp Exp $');
+rcs_id('$Id: SystemInfo.php,v 1.6 2003-02-21 23:01:11 dairiki Exp $');
 /**
  Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
 
@@ -58,17 +58,17 @@ extends WikiPlugin
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.5 $");
+                            "\$Revision: 1.6 $");
     }
 
     function getExpire($dbi, $argarray, $request) {
         return '+1800'; // 30 minutes
     }
-    function getHtml($dbi, $argarray, $request) {
+    function getHtml($dbi, $argarray, $request, $basepage) {
         $loader = new WikiPluginLoader;
         return $loader->expandPI('<?plugin SystemInfo '
                                  . WikiPluginCached::glueArgs($argarray) // all
-                                 . ' ?>', $request);
+                                 . ' ?>', $request, $basepage);
     }
     /*
     function getDefaultArguments() {
@@ -369,7 +369,7 @@ extends WikiPlugin
             return $this->error(sprintf(_("unknown argument '%s' to SystemInfo"), $arg));
     }
 
-    function run($dbi, $argstr, $request) {
+    function run($dbi, $argstr, $request, $basepage) {
         // don't parse argstr for name=value pairs. instead we use just 'name'
         //$args = $this->getArgs($argstr, $request);
         $args['seperator'] = ' ';
@@ -515,6 +515,11 @@ function stddev(&$hits, $total = false) {
 }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.5  2003/01/18 22:08:01  carstenklapp
+// Code cleanup:
+// Reformatting & tabs to spaces;
+// Added copyleft, getVersion, getDescription, rcs_id.
+//
 
 // Local Variables:
 // mode: php
-- 
2.45.0