Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-06 07:57:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

LoginProcess refactoring

Browse source 
+ Output parameter in ExternalLogin functionality
This commit is contained in:
RainLoop Team 2014-01-26 16:44:13 +04:00
parent 6ca3b44d05
commit b7e135a553
2 changed files with 58 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

50
rainloop/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
View file

@ -825,22 +825,19 @@ class ServiceActions
*/
public function ServiceExternalLogin()
{
$oException = null;
$oAccount = null;
if ($this->oActions->Config()->Get('labs', 'allow_external_login', false))
{
$oException = null;
$sEmail = trim($this->oHttp->GetRequest('Email', ''));
$sLogin = trim($this->oHttp->GetRequest('Login', ''));
$sPassword = $this->oHttp->GetRequest('Password', '');
try
{
$sEmail = trim($this->oHttp->GetRequest('Email', ''));
$sLogin = trim($this->oHttp->GetRequest('Login', ''));
$sPassword = $this->oHttp->GetRequest('Password', '');
$this->oActions->Logger()->AddSecret($sPassword);
if (0 === \strlen($sLogin))
{
$sLogin = $sEmail;
}
$oAccount = $this->oActions->LoginProcess($sEmail, $sLogin, $sPassword);
$this->oActions->AuthProcess($oAccount);
}
@ -850,7 +847,38 @@ class ServiceActions
}
}
$this->oActions->Location('./');
switch (\strtolower($this->oHttp->GetRequest('Output', 'Redirect')))
{
case 'json':
@\header('Content-Type: application/json; charset=utf-8');
$aResult = array(
'Action' => 'ExternalLogin',
'Result' => $oAccount instanceof \RainLoop\Account ? true : false,
'ErrorCode' => 0
);
if (!$aResult['Result'])
{
if ($oException instanceof \RainLoop\Exceptions\ClientException)
{
$aResult['ErrorCode'] = $oException->getCode();
}
else
{
$aResult['ErrorCode'] = \RainLoop\Notifications::AuthError;
}
}
return \MailSo\Base\Utils::Php2js($aResult);
case 'redirect':
default:
$this->oActions->Location('./');
break;
}
return '';
}