cvs: php-wiki-web /dokuwiki/inc/auth phpcvs.class.php
| From: | Lukas Smith | Date: | Sun, 22 Jun 2008 13:12:38 +0000 |
| Subject: | cvs: php-wiki-web /dokuwiki/inc/auth phpcvs.class.php | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-1988@lists.php.net to get a copy of this message | ||
lsmith Sun Jun 22 13:12:38 2008 UTC
Modified files:
/php-wiki-web/dokuwiki/inc/auth phpcvs.class.php
Log:
- ensure that all users out of the userfile are loaded when doing the "fake" load of a
cvs based user
http://cvs.php.net/viewvc.cgi/php-wiki-web/dokuwiki/inc/auth/phpcvs.class.php?r1=1.3&r2=1.4&diff_format=u
Index: php-wiki-web/dokuwiki/inc/auth/phpcvs.class.php
diff -u php-wiki-web/dokuwiki/inc/auth/phpcvs.class.php:1.3
php-wiki-web/dokuwiki/inc/auth/phpcvs.class.php:1.4
--- php-wiki-web/dokuwiki/inc/auth/phpcvs.class.php:1.3 Thu Mar 27 09:56:00 2008
+++ php-wiki-web/dokuwiki/inc/auth/phpcvs.class.php Sun Jun 22 13:12:38 2008
@@ -41,6 +41,7 @@
* @return bool true or int error code
*/
function _setCVSUser($user){
+ $this->_loadUserData();
$this->users[$user]['pass'] = null;
$this->users[$user]['name'] = $user;
$this->users[$user]['mail'] = $user.'@php.net';
@@ -88,7 +89,7 @@
return 0;
}
if (isset($a["errno"])) {
- return $a["errno"];
+ return (int)$a["errno"];
}
$this->_setCVSUser($user);
@@ -109,7 +110,8 @@
if ($cvs_reply === true) {
return true;
- } elseif($cvs_reply == 1) {
+ // username did not match an existing username
+ } elseif($cvs_reply < 2) {
return parent::checkPass($user,$pass);
}