Dereku/snappymail
0
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-11-01 09:58:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update ckeditor

Browse source
This commit is contained in:
RainLoop Team 2014-10-31 21:25:02 +04:00
parent 11b66abd17
commit 8747ea59ac
107 changed files with 1021 additions and 968 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rainloop/v/0.0.0/app/src/RainLoop/Actions.php
View file

@ -1158,7 +1158,7 @@ class Actions
$aResult['GoogleClientID'] = '';
$aResult['GoogleApiKey'] = '';
}
if (!$aResult['AllowGoogleSocial'])
{
$aResult['AllowGoogleSocialPreview'] = false;
@ -1498,7 +1498,7 @@ class Actions
{
$this->Logger()->Write('The email address "'.$sEmail.'" is not complete', \MailSo\Log\Enumerations\Type::INFO, 'LOGIN');
if (false === \strpos($sEmail, '@') && 0 < \strlen(\trim($this->Config()->Get('login', 'determine_user_domain', false))))
if (false === \strpos($sEmail, '@') && !!$this->Config()->Get('login', 'determine_user_domain', false))
{
$sUserHost = \trim($this->Http()->GetHost(false, true, true));
$this->Logger()->Write('Determined user domain: '.$sUserHost, \MailSo\Log\Enumerations\Type::INFO, 'LOGIN');