[phpwiki-checkins] CVS: phpwiki/lib WikiDB.php,1.59,1.60

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

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

Modified Files:
	WikiDB.php 
Log Message:
fix bug #962117, incorrect init of auth_dsn

Index: WikiDB.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -2 -b -p -d -r1.59 -r1.60
--- WikiDB.php	27 May 2004 17:49:05 -0000	1.59
+++ WikiDB.php	28 May 2004 10:09:58 -0000	1.60
@@ -110,6 +110,8 @@ class WikiDB {
     function WikiDB (&$backend, $dbparams) {
         $this->_backend = &$backend;
-        $this->_cache = new WikiDB_cache($backend);
+        // don't do the following with the auth_dsn!
+        if (isset($dbparams['auth_dsn'])) return;
 
+        $this->_cache = new WikiDB_cache($backend);
         // If the database doesn't yet have a timestamp, initialize it now.
         if ($this->get('_timestamp') === false)
@@ -1175,6 +1177,6 @@ class WikiDB_Page 
     function getOwner() {
         if ($owner = $this->get('owner'))
-            return $owner;
-        // check all revisions for the first author_id
+            return ($owner == "The PhpWiki programming team") ? ADMIN_USER : $owner;
+        // check all revisions forwards for the first author_id
         $backend = &$this->_wikidb->_backend;
         $pagename = &$this->_pagename;
@@ -1182,6 +1184,7 @@ class WikiDB_Page 
         for ($v=1; $v <= $latestversion; $v++) {
             $rev = $this->getRevision($v);
-            if ($rev and $owner = $rev->get('author_id'))
-                return $owner;
+            if ($rev and $owner = $rev->get('author_id')) {
+            	return ($owner == "The PhpWiki programming team") ? ADMIN_USER : $owner;
+            }
         }
         return '';
@@ -1505,5 +1508,6 @@ class WikiDB_PageRevision
 
 /**
- * A class which represents a sequence of WikiDB_Pages.
+ * Class representing a sequence of WikiDB_Pages.
+ * TODO: Enhance to php5 iterators
  */
 class WikiDB_PageIterator
@@ -1531,5 +1535,5 @@ class WikiDB_PageIterator
         $pagename = &$next['pagename'];
         if (!$pagename) {
-            trigger_error(__FILE__.':'.__LINE__.' empty pagename in WikiDB_PageIterator::next()',E_USER_WARNING);
+            trigger_error('empty pagename in WikiDB_PageIterator::next()', E_USER_WARNING);
             var_dump($next);
             return false;
@@ -1557,5 +1561,4 @@ class WikiDB_PageIterator
     }
 
-    
     function asArray() {
     	$result = array();
@@ -1600,4 +1603,5 @@ class WikiDB_PageIterator
 /**
  * A class which represents a sequence of WikiDB_PageRevisions.
+ * TODO: Enhance to php5 iterators
  */
 class WikiDB_PageRevisionIterator
@@ -1667,4 +1671,12 @@ class WikiDB_PageRevisionIterator
         $this->_revisions->free();
     }
+
+    function asArray() {
+    	$result = array();
+    	while ($rev = $this->next())
+            $result[] = $rev;
+        $this->free();
+        return $result;
+    }
 };
 
@@ -1812,4 +1824,7 @@ class WikiDB_cache 
 
 // $Log$
+// Revision 1.60  2004/05/28 10:09:58  rurban
+// fix bug #962117, incorrect init of auth_dsn
+//
 // Revision 1.59  2004/05/27 17:49:05  rurban
 // renamed DB_Session to DbSession (in CVS also)