From: Reini U. <ru...@us...> - 2006-09-06 05:52:45
|
Update of /cvsroot/phpwiki/phpwiki/lib/WikiUser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19612 Modified Files: IMAP.php POP3.php Log Message: more verbose _DEBUG_LOGIN Index: IMAP.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiUser/IMAP.php,v retrieving revision 1.6 retrieving revision 1.7 diff -u -2 -b -p -d -r1.6 -r1.7 --- IMAP.php 25 Aug 2006 22:35:50 -0000 1.6 +++ IMAP.php 6 Sep 2006 05:52:43 -0000 1.7 @@ -15,8 +15,10 @@ extends _PassUser function checkPass($submitted_password) { if (!$this->isValidName()) { + if (DEBUG & _DEBUG_LOGIN) trigger_error(get_class($this)."::checkPass => failed isValidName", E_USER_WARNING); trigger_error(_("Invalid username."),E_USER_WARNING); return $this->_tryNextPass($submitted_password); } if (!$this->_checkPassLength($submitted_password)) { + if (DEBUG & _DEBUG_LOGIN) trigger_error(get_class($this)."::checkPass => failed checkPassLength", E_USER_WARNING); return WIKIAUTH_FORBIDDEN; } @@ -27,4 +29,5 @@ extends _PassUser imap_close($mbox); $this->_authmethod = 'IMAP'; + if (DEBUG & _DEBUG_LOGIN) trigger_error(get_class($this)."::checkPass => ok", E_USER_WARNING); $this->_level = WIKIAUTH_USER; return $this->_level; @@ -35,4 +38,5 @@ extends _PassUser } } + if (DEBUG & _DEBUG_LOGIN) trigger_error(get_class($this)."::checkPass => wrong", E_USER_WARNING); return $this->_tryNextPass($submitted_password); @@ -43,10 +47,14 @@ extends _PassUser return true; - if ($this->checkPass($this->_prefs->get('passwd'))) + if ($this->checkPass($this->_prefs->get('passwd'))) { + if (DEBUG & _DEBUG_LOGIN) trigger_error(get_class($this)."::userExists => true (pass ok)", E_USER_WARNING); return true; + } + if (DEBUG & _DEBUG_LOGIN) trigger_error(get_class($this)."::userExists => false (pass wrong)", E_USER_WARNING); return $this->_tryNextUser(); } function mayChangePass() { + if (DEBUG & _DEBUG_LOGIN) trigger_error(get_class($this)."::mayChangePass => false", E_USER_WARNING); return false; } @@ -54,4 +62,7 @@ extends _PassUser // $Log$ +// Revision 1.7 2006/09/06 05:52:43 rurban +// more verbose _DEBUG_LOGIN +// // Revision 1.6 2006/08/25 22:35:50 rurban // fix checkPass call in userExists Index: POP3.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiUser/POP3.php,v retrieving revision 1.6 retrieving revision 1.7 diff -u -2 -b -p -d -r1.6 -r1.7 --- POP3.php 23 Apr 2005 11:17:41 -0000 1.6 +++ POP3.php 6 Sep 2006 05:52:43 -0000 1.7 @@ -16,7 +16,9 @@ extends _IMAPPassUser { if (!$this->isValidName()) { trigger_error(_("Invalid username."), E_USER_WARNING); + if (DEBUG & _DEBUG_LOGIN) trigger_error(get_class($this)."::checkPass => failed isValidName", E_USER_WARNING); return $this->_tryNextPass($submitted_password); } if (!$this->_checkPassLength($submitted_password)) { + if (DEBUG & _DEBUG_LOGIN) trigger_error(get_class($this)."::checkPass => failed checkPassLength", E_USER_WARNING); return WIKIAUTH_FORBIDDEN; } @@ -61,4 +63,5 @@ extends _IMAPPassUser { } $this->_authmethod = 'POP3'; + if (DEBUG & _DEBUG_LOGIN) trigger_error(get_class($this)."::checkPass => $retval", E_USER_WARNING); if ($retval) { $this->_level = WIKIAUTH_USER; @@ -68,7 +71,15 @@ extends _IMAPPassUser { return $this->_level; } + + function __userExists() { + if (DEBUG & _DEBUG_LOGIN) trigger_error(get_class($this)."::userExists => true (dummy)", E_USER_WARNING); + return true; + } } // $Log$ +// Revision 1.7 2006/09/06 05:52:43 rurban +// more verbose _DEBUG_LOGIN +// // Revision 1.6 2005/04/23 11:17:41 rurban // bug #1186291 |