extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 16:33:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

improve authMethod handling

Browse Source
This commit is contained in:
Klaus Leithoff 2011-12-12 17:14:59 +00:00
parent e272848444
commit adbc245a3b
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
egw-pear/Net/IMAPProtocol.php
View File

@ -509,22 +509,22 @@ class Net_IMAPProtocol {
$result = $this->_authDigest_MD5( $uid , $pwd , $cmdid );
if ( !PEAR::isError($result)) break;
$this->supportedAuthMethods = array_diff($this->supportedAuthMethods,array($method));
return $this->cmdAuthenticate($uid , $pwd , $userMethod);
return $this->cmdAuthenticate($uid , $pwd);
case 'CRAM-MD5':
$result = $this->_authCRAM_MD5( $uid , $pwd ,$cmdid );
if ( !PEAR::isError($result)) break;
$this->supportedAuthMethods = array_diff($this->supportedAuthMethods,array($method));
return $this->cmdAuthenticate($uid , $pwd , $userMethod);
return $this->cmdAuthenticate($uid , $pwd);
case 'LOGIN':
$result = $this->_authLOGIN( $uid , $pwd , $cmdid );
if ( !PEAR::isError($result)) break;
$this->supportedAuthMethods = array_diff($this->supportedAuthMethods,array($method));
return $this->cmdAuthenticate($uid , $pwd , $userMethod);
return $this->cmdAuthenticate($uid , $pwd);
case 'PLAIN':
$result = $this->_authPLAIN( $uid , $pwd , $cmdid );
if ( !PEAR::isError($result)) break;
$this->supportedAuthMethods = array_diff($this->supportedAuthMethods,array($method));
return $this->cmdAuthenticate($uid , $pwd , $userMethod);
return $this->cmdAuthenticate($uid , $pwd);
default :
$result = new PEAR_Error( "$method is not a supported authentication method" );
@ -786,11 +786,12 @@ class Net_IMAPProtocol {
$myMethods=implode(',' ,$this->supportedAuthMethods);
if (!empty($userMethod) && !in_array($userMethod,$this->_serverAuthMethods))
{
$this->supportedAuthMethods = array_diff($this->supportedAuthMethods,array($userMethod)); // we may support it, but if the server does not, its useless
foreach ( $this->supportedAuthMethods as $method ) {
if ( in_array( $method , $this->_serverAuthMethods ) ) {
if ($this->_debug) error_log(__METHOD__." UserMethod $userMethod not supported by server; trying best ServerMethod $method");
return $method;
}
if ( in_array( $method , $this->_serverAuthMethods ) ) {
if ($this->_debug) error_log(__METHOD__." UserMethod $userMethod not supported by server; trying best ServerMethod $method");
return $method;
}
}
}