[phpwiki-checkins] CVS: phpwiki/lib WikiDB.php,1.117,1.118 WikiPlugin.php,1.56,1.57

[Reini U. <ru...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10053

Modified Files:
	WikiDB.php WikiPlugin.php 
Log Message:
new BlogArchives plugin for the new blog theme. enable default box method 
for all plugins. Minor search improvement. 


Index: WikiDB.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB.php,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -2 -b -p -d -r1.117 -r1.118
--- WikiDB.php	13 Dec 2004 08:15:09 -0000	1.117
+++ WikiDB.php	13 Dec 2004 13:22:57 -0000	1.118
@@ -1494,4 +1494,7 @@ class WikiDB_PageRevision
         return $this->_pagename;
     }
+    function getName() {
+        return $this->_pagename;
+    }
 
     /**
@@ -2142,4 +2145,8 @@ function _sql_debuglog_shutdown_function
 
 // $Log$
+// Revision 1.118  2004/12/13 13:22:57  rurban
+// new BlogArchives plugin for the new blog theme. enable default box method
+// for all plugins. Minor search improvement.
+//
 // Revision 1.117  2004/12/13 08:15:09  rurban
 // false is wrong. null might be better but lets play safe.

Index: WikiPlugin.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiPlugin.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -2 -b -p -d -r1.56 -r1.57
--- WikiPlugin.php	29 Nov 2004 17:56:51 -0000	1.56
+++ WikiPlugin.php	13 Dec 2004 13:22:58 -0000	1.57
@@ -360,9 +360,16 @@ class WikiPlugin
     }
 
-    function makeBox($title,$body) {
-        if (!$title) $title = $this->_getName();
+    // box is used to display a fixed-width, narrow version with common header
+    function box($args=false, $request=false, $basepage=false) {
+        if (!$request) $request =& $GLOBALS['request'];
+        $dbi = $request->getDbh();
+        return $this->makeBox('', $this->run($dbi, $args, $request, $basepage));
+    }
+
+    function makeBox($title, $body) {
+        if (!$title) $title = $this->getName();
         return HTML::div(array('class'=>'box'),
-                         HTML::div(array('class'=>'box-title'),$title),
-                         HTML::div(array('class'=>'box-data'),$body));
+                         HTML::div(array('class'=>'box-title'), $title),
+                         HTML::div(array('class'=>'box-data'), $body));
     }