[phpwiki-checkins] CVS: phpwiki/lib PageList.php,1.18,1.19

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv21658

Modified Files:
	PageList.php 
Log Message:
Author names in PageList uses $Theme->linkExistingWikiWord

Index: PageList.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/PageList.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** PageList.php	2002/01/23 05:18:10	1.18
--- PageList.php	2002/01/25 08:19:26	1.19
***************
*** 102,105 ****
--- 102,135 ----
  };
  
+ class _PageList_Column_author extends _PageList_Column {
+     function _getValue ($page_handle, &$revision_handle) {
+         if ($this->_need_rev) {
+             if (!$revision_handle)
+                 $revision_handle = $page_handle->getCurrentRevision();
+             $author = $revision_handle->get($this->_field);
+             return $this->_authorLink($author);
+         }
+         else {
+             $author = $page_handle->get($this->_field);
+             return $this->_authorLink($author);
+         }
+     }
+     // adapted from plugin/RecentChanges
+     function _authorLink($author) {
+         if ( ($url = $this->authorURL($author)) ) {
+             global $Theme;
+             return $Theme->linkExistingWikiWord($author);
+         } else
+             return $author;
+     }
+     function authorURL($author) {
+         global $WikiNameRegexp, $request;
+         $dbi = $request->getDbh();
+         if (preg_match("/^$WikiNameRegexp\$/", $author) && $dbi->isWikiPage($author))
+             return WikiURL($author);
+         return false;
+     }
+ };
+ 
  class _PageList_Column_pagename extends _PageList_Column_base {
      function _PageList_Column_pagename () {
***************
*** 214,218 ****
                              => new _PageList_Column('rev:summary',  _("Last Summary")),
                              'author'
!                             => new _PageList_Column('rev:author',  _("Last Author")),
                              'locked'
                              => new _PageList_Column_bool('locked',  _("Locked"), _("locked")),
--- 244,248 ----
                              => new _PageList_Column('rev:summary',  _("Last Summary")),
                              'author'
!                             => new _PageList_Column_author('rev:author',  _("Last Author")),
                              'locked'
                              => new _PageList_Column_bool('locked',  _("Locked"), _("locked")),