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

Small fixes

Browse source
This commit is contained in:
RainLoop Team 2014-09-16 00:54:20 +04:00
parent fdf317f7a6
commit 7221add1ff
4 changed files with 27 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dev/Common/Globals.js
View file

@ -140,7 +140,7 @@
// {name: 'document', groups: ['mode', 'document', 'doctools']} // {name: 'document', groups: ['mode', 'document', 'doctools']}
], ],
'removePlugins': 'contextmenu', //blockquote 'removePlugins': 'liststyle,tabletools,contextmenu', //blockquote
'removeButtons': 'Format,Undo,Redo,Cut,Copy,Paste,Anchor,Strike,Subscript,Superscript,Image,SelectAll', 'removeButtons': 'Format,Undo,Redo,Cut,Copy,Paste,Anchor,Strike,Subscript,Superscript,Image,SelectAll',
'removeDialogTabs': 'link:advanced;link:target;image:advanced;images:advanced', 'removeDialogTabs': 'link:advanced;link:target;image:advanced;images:advanced',

1
dev/Common/HtmlEditor.js
View file

@ -217,6 +217,7 @@
self.editor.on('instanceReady', function () { self.editor.on('instanceReady', function () {
self.editor.setKeystroke(window.CKEDITOR.CTRL + 65 /* A */, 'selectAll'); self.editor.setKeystroke(window.CKEDITOR.CTRL + 65 /* A */, 'selectAll');
self.editor.editable().addClass('cke_enable_context_menu');
self.fOnReady(); self.fOnReady();
self.__resizable = true; self.__resizable = true;

2
package.json
View file

@ -2,7 +2,7 @@
"name": "RainLoop", "name": "RainLoop",
"title": "RainLoop Webmail", "title": "RainLoop Webmail",
"version": "1.6.9", "version": "1.6.9",
"release": "165", "release": "167",
"description": "Simple, modern & fast web-based email client", "description": "Simple, modern & fast web-based email client",
"homepage": "http://rainloop.net", "homepage": "http://rainloop.net",
"main": "gulpfile.js", "main": "gulpfile.js",

41
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -2667,7 +2667,7 @@ class Actions
{ {
$oConfig->Set('security', 'admin_login', $sLogin); $oConfig->Set('security', 'admin_login', $sLogin);
} }
$oConfig->SetPassword($sNewPassword); $oConfig->SetPassword($sNewPassword);
$bResult = true; $bResult = true;
} }
@ -4858,26 +4858,33 @@ class Actions
throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantSendMessage); throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantSendMessage);
} }
if ($oMessage && $this->AddressBookProvider($oAccount)->IsActive()) try
{ {
$aArrayToFrec = array(); if ($oMessage && $this->AddressBookProvider($oAccount)->IsActive())
$oToCollection = $oMessage->GetTo();
if ($oToCollection)
{ {
$aTo =& $oToCollection->GetAsArray(); $aArrayToFrec = array();
foreach ($aTo as /* @var $oEmail \MailSo\Mime\Email */ $oEmail) $oToCollection = $oMessage->GetTo();
if ($oToCollection)
{ {
$aArrayToFrec[$oEmail->GetEmail(true)] = $oEmail->ToString(false, true); $aTo =& $oToCollection->GetAsArray();
foreach ($aTo as /* @var $oEmail \MailSo\Mime\Email */ $oEmail)
{
$aArrayToFrec[$oEmail->GetEmail(true)] = $oEmail->ToString(false, true);
}
}
if (0 < \count($aArrayToFrec))
{
$oSettings = $this->SettingsProvider()->Load($oAccount);
$this->AddressBookProvider($oAccount)->IncFrec(
$oAccount->ParentEmailHelper(), \array_values($aArrayToFrec), !!$oSettings->GetConf('ContactsAutosave', true));
} }
} }
}
if (0 < \count($aArrayToFrec)) catch (\Exception $oException)
{ {
$oSettings = $this->SettingsProvider()->Load($oAccount); $this->Logger()->WriteException($oException);
$this->AddressBookProvider($oAccount)->IncFrec(
$oAccount->ParentEmailHelper(), \array_values($aArrayToFrec), !!$oSettings->GetConf('ContactsAutosave', true));
}
} }
return $this->TrueResponse(__FUNCTION__); return $this->TrueResponse(__FUNCTION__);
@ -7414,7 +7421,7 @@ class Actions
// $mResult['Plain'] = 0 === \strlen($sPlain) ? '' : \MailSo\Base\HtmlUtils::ConvertPlainToHtml($sPlain); // $mResult['Plain'] = 0 === \strlen($sPlain) ? '' : \MailSo\Base\HtmlUtils::ConvertPlainToHtml($sPlain);
$this->Logger()->WriteDump($mResult['Html']); $this->Logger()->WriteDump($mResult['Html']);
$mResult['TextHash'] = \md5($mResult['Html'].$mResult['Plain']); $mResult['TextHash'] = \md5($mResult['Html'].$mResult['Plain']);
$mResult['TextPartIsTrimmed'] = $mResponse->TextPartIsTrimmed(); $mResult['TextPartIsTrimmed'] = $mResponse->TextPartIsTrimmed();