[phpwiki-checkins] CVS: phpwiki/lib WikiUserNew.php,1.26,1.27

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

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

Modified Files:
	WikiUserNew.php 
Log Message:
fixed DbPassuser pref init; lost userid

Index: WikiUserNew.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiUserNew.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -2 -b -p -d -r1.26 -r1.27
--- WikiUserNew.php	29 Feb 2004 04:10:56 -0000	1.26
+++ WikiUserNew.php	1 Mar 2004 09:35:13 -0000	1.27
@@ -584,4 +584,7 @@ extends _WikiUser
 
     function checkPass($submitted_password) {
+        return false;
+        // this might happen on a old-style signin button.
+
         // By definition, the _AnonUser does not HAVE a password
         // (compared to _BogoUser, who has an EMPTY password).
@@ -770,5 +773,5 @@ extends _AnonUser
         if (empty($this->_auth_dbi)) {
             if (empty($DBAuthParams['auth_dsn'])) {
-                if ($DBParams['dbtype'] == 'SQL')
+                if ($DBParams['dbtype'] == 'SQL' or $DBParams['dbtype'] == 'ADODB')
                     $dbh = $request->getDbh(); // use phpwiki database 
                 else 
@@ -816,8 +819,8 @@ extends _AnonUser
         if (!empty($this->_prefs->_method)) {
             if ($this->_prefs->_method == 'ADODB') {
-                _AdoDbPassUser::_AdoDbPassUser();
+                _AdoDbPassUser::_AdoDbPassUser($this->_userid,$this->_prefs);
                 return _AdoDbPassUser::getPreferences();
             } elseif ($this->_prefs->_method == 'SQL') {
-                _PearDbPassUser::_PearDbPassUser();
+                _PearDbPassUser::_PearDbPassUser($this->_userid,$this->_prefs);
                 return _PearDbPassUser::getPreferences();
             }
@@ -842,9 +845,9 @@ extends _AnonUser
         if (!empty($this->_prefs->_method)) {
             if ($this->_prefs->_method == 'ADODB') {
-                _AdoDbPassUser::_AdoDbPassUser();
+                _AdoDbPassUser::_AdoDbPassUser($this->_userid,$prefs);
                 return _AdoDbPassUser::setPreferences($prefs, $id_only);
             }
             elseif ($this->_prefs->_method == 'SQL') {
-                _PearDbPassUser::_PearDbPassUser();
+                _PearDbPassUser::_PearDbPassUser($this->_userid,$prefs);
                 return _PearDbPassUser::setPreferences($prefs, $id_only);
             }
@@ -1480,5 +1483,6 @@ extends _DbPassUser
                 $dbh = &$this->_auth_dbi;
                 $db_result = $dbh->Execute(sprintf($this->_prefs->_update,
-                                                   $dbh->qstr($packed),$dbh->qstr($this->_userid)));
+                                                   $dbh->qstr($packed),
+                                                   $dbh->qstr($this->_userid)));
                 $db_result->Close();
             } else {
@@ -1860,5 +1864,4 @@ class _AdminUser
 extends _PassUser
 {
-
     function checkPass($submitted_password) {
         $stored_password = ADMIN_PASSWD;
@@ -2267,4 +2270,7 @@ extends UserPreferences
 
 // $Log$
+// Revision 1.27  2004/03/01 09:35:13  rurban
+// fixed DbPassuser pref init; lost userid
+//
 // Revision 1.26  2004/02/29 04:10:56  rurban
 // new POP3 auth (thanks to BiloBilo: pentothal at despammed dot com)