From 7221add1ffd93d261820d8844cded80183c2c0d3 Mon Sep 17 00:00:00 2001
From: RainLoop Team <support@rainloop.net>
Date: Tue, 16 Sep 2014 00:54:20 +0400
Subject: [PATCH] Small fixes

---
 dev/Common/Globals.js                         |  2 +-
 dev/Common/HtmlEditor.js                      |  1 +
 package.json                                  |  2 +-
 .../0.0.0/app/libraries/RainLoop/Actions.php  | 41 +++++++++++--------
 4 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/dev/Common/Globals.js b/dev/Common/Globals.js
index ce60cbb66..531322e82 100644
--- a/dev/Common/Globals.js
+++ b/dev/Common/Globals.js
@@ -140,7 +140,7 @@
 	//		{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',
 		'removeDialogTabs': 'link:advanced;link:target;image:advanced;images:advanced',
 
diff --git a/dev/Common/HtmlEditor.js b/dev/Common/HtmlEditor.js
index c7a380088..15523eb77 100644
--- a/dev/Common/HtmlEditor.js
+++ b/dev/Common/HtmlEditor.js
@@ -217,6 +217,7 @@
 						self.editor.on('instanceReady', function () {
 
 							self.editor.setKeystroke(window.CKEDITOR.CTRL + 65 /* A */, 'selectAll');
+							self.editor.editable().addClass('cke_enable_context_menu');
 
 							self.fOnReady();
 							self.__resizable = true;
diff --git a/package.json b/package.json
index 9c1c3aa69..2245299c7 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
 	"name": "RainLoop",
 	"title": "RainLoop Webmail",
 	"version": "1.6.9",
-	"release": "165",
+	"release": "167",
 	"description": "Simple, modern & fast web-based email client",
 	"homepage": "http://rainloop.net",
 	"main": "gulpfile.js",
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
index d25db3623..085f16872 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -2667,7 +2667,7 @@ class Actions
 			{
 				$oConfig->Set('security', 'admin_login', $sLogin);
 			}
-			
+
 			$oConfig->SetPassword($sNewPassword);
 			$bResult = true;
 		}
@@ -4858,26 +4858,33 @@ class Actions
 			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantSendMessage);
 		}
 
-		if ($oMessage && $this->AddressBookProvider($oAccount)->IsActive())
+		try
 		{
-			$aArrayToFrec = array();
-			$oToCollection = $oMessage->GetTo();
-			if ($oToCollection)
+			if ($oMessage && $this->AddressBookProvider($oAccount)->IsActive())
 			{
-				$aTo =& $oToCollection->GetAsArray();
-				foreach ($aTo as /* @var $oEmail \MailSo\Mime\Email */ $oEmail)
+				$aArrayToFrec = array();
+				$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))
-			{
-				$oSettings = $this->SettingsProvider()->Load($oAccount);
-
-				$this->AddressBookProvider($oAccount)->IncFrec(
-					$oAccount->ParentEmailHelper(), \array_values($aArrayToFrec), !!$oSettings->GetConf('ContactsAutosave', true));
-			}
+		}
+		catch (\Exception $oException)
+		{
+			$this->Logger()->WriteException($oException);
 		}
 
 		return $this->TrueResponse(__FUNCTION__);
@@ -7414,7 +7421,7 @@ class Actions
 //					$mResult['Plain'] = 0 === \strlen($sPlain) ? '' : \MailSo\Base\HtmlUtils::ConvertPlainToHtml($sPlain);
 
 					$this->Logger()->WriteDump($mResult['Html']);
-					
+
 					$mResult['TextHash'] = \md5($mResult['Html'].$mResult['Plain']);
 
 					$mResult['TextPartIsTrimmed'] = $mResponse->TextPartIsTrimmed();