CVS: phpwiki/lib/plugin AllPages.php,1.17,1.18

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

Modified Files:
        AllPages.php 
Log Message:
PageList sortby support in PearDB and ADODB backends


Index: AllPages.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/AllPages.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -2 -b -p -d -r1.17 -r1.18
--- AllPages.php        27 Feb 2003 20:10:30 -0000      1.17
+++ AllPages.php        25 Jan 2004 07:58:30 -0000      1.18
@@ -58,8 +58,12 @@ extends WikiPlugin
         extract($this->getArgs($argstr, $request));
         // Todo: extend given _GET args
-        if ($sortby)
+        if ($sorted = $request->getArg('sortby'))
+            $sortby = $sorted;
+        elseif ($sortby)
             $request->setArg('sortby',$sortby);
 
-        $pagelist = new PageList($info, $exclude);
+        $pagelist = new PageList($info, $exclude, $this->getArgs($argstr, 
$request));
+        if ($sortby) $sorted = $pagelist->sortby($sortby,'db');
+        else $sorted='pagename';
         if (!$noheader)
             $pagelist->setCaption(_("Pages in this wiki (%d total):"));
@@ -69,7 +73,8 @@ extends WikiPlugin
             $pagelist->_addColumn('version');
 
+        if (defined('DEBUG') and DEBUG)
         $timer = new DebugTimer;
-
-        $pagelist->addPages( $dbi->getAllPages($include_empty) );
+        //handle $sortby
+        $pagelist->addPages( $dbi->getAllPages($include_empty, $sorted) );
 
         if (defined('DEBUG') and DEBUG) {
@@ -88,4 +93,7 @@ extends WikiPlugin
 
 // $Log$
+// Revision 1.18  2004/01/25 07:58:30  rurban
+// PageList sortby support in PearDB and ADODB backends
+//
 // Revision 1.17  2003/02/27 20:10:30  dairiki
 // Disable profiling output when DEBUG is defined but false.



-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn