From 13d4c769e2a1a95cd63a3adff529755ada3b3c0c Mon Sep 17 00:00:00 2001
From: RainLoop Team <support@rainloop.net>
Date: Sun, 22 Feb 2015 22:25:34 +0400
Subject: [PATCH] Small fixes

---
 dev/Model/Message.js                          |  3 --
 dev/Stores/User/Message.js                    | 15 +-------
 dev/Styles/FolderList.less                    | 37 +++++++++++--------
 package.json                                  |  2 +-
 .../0.0.0/app/libraries/RainLoop/Actions.php  | 17 +++++----
 5 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/dev/Model/Message.js b/dev/Model/Message.js
index e1f960f5a..e684aa06b 100644
--- a/dev/Model/Message.js
+++ b/dev/Model/Message.js
@@ -97,9 +97,6 @@
 					case 'certificate':
 						sClass = 'icon-file-certificate';
 						break;
-//					case 'pdf':
-//						sClass = 'icon-file-pdf';
-//						break;
 				}
 			}
 			return sClass;
diff --git a/dev/Stores/User/Message.js b/dev/Stores/User/Message.js
index bca89535f..7885eceea 100644
--- a/dev/Stores/User/Message.js
+++ b/dev/Stores/User/Message.js
@@ -33,7 +33,6 @@
 	function MessageUserStore()
 	{
 		this.staticMessage = new MessageModel();
-		this.staticMessageList = [];
 
 		this.messageList = ko.observableArray([]).extend({'rateLimit': 0});
 
@@ -621,7 +620,6 @@
 				iOffset = 0,
 				aList = [],
 				iUtc = moment().unix(),
-				aStaticList = this.staticMessageList,
 				oJsonMessage = null,
 				oMessage = null,
 				oFolder = null,
@@ -674,12 +672,7 @@
 				oJsonMessage = oData.Result['@Collection'][iIndex];
 				if (oJsonMessage && 'Object/Message' === oJsonMessage['@Object'])
 				{
-					oMessage = aStaticList[iIndex];
-					if (!oMessage || !oMessage.initByJson(oJsonMessage))
-					{
-						oMessage = MessageModel.newInstanceFromJson(oJsonMessage);
-					}
-
+					oMessage = MessageModel.newInstanceFromJson(oJsonMessage);
 					if (oMessage)
 					{
 						if (Cache.hasNewMessageAndRemoveFromCache(oMessage.folderFullNameRaw, oMessage.uid) && 5 >= iNewCount)
@@ -699,6 +692,7 @@
 							Cache.storeMessageFlagsToCache(oMessage);
 						}
 
+						oMessage.lastInCollapsedThreadLoading(false);
 						oMessage.lastInCollapsedThread(mLastCollapsedThreadUids && -1 < Utils.inArray(Utils.pInt(oMessage.uid), mLastCollapsedThreadUids) ? true : false);
 
 						aList.push(oMessage);
@@ -717,11 +711,6 @@
 			this.messageList(aList);
 			this.messageListIsNotCompleted(false);
 
-			if (aStaticList.length < aList.length)
-			{
-				this.staticMessageList = aList;
-			}
-
 			Cache.clearNewMessageCache();
 
 			if (oFolder && (bCached || bUnreadCountChange || SettingsStore.useThreads()))
diff --git a/dev/Styles/FolderList.less b/dev/Styles/FolderList.less
index 3629878f6..27919f7b9 100644
--- a/dev/Styles/FolderList.less
+++ b/dev/Styles/FolderList.less
@@ -144,35 +144,40 @@
 	.b-sub-folders .e-item .e-link {
 		padding-left: @subPadding * 1 + @folderItemPadding;
 	}
-	.b-sub-folders.unpaddig-folder .e-item .e-link {
-		padding-left: @folderItemPadding;
-	}
 	.b-sub-folders .b-sub-folders .e-item .e-link {
 		padding-left: @subPadding * 2 + @folderItemPadding;
 	}
-	.b-sub-folders.unpaddig-folder .b-sub-folders .e-item .e-link {
-		padding-left: @subPadding * 1 + @folderItemPadding;
-	}
 	.b-sub-folders .b-sub-folders .b-sub-folders .e-item .e-link {
 		padding-left: @subPadding * 3 + @folderItemPadding;
 	}
-	.b-sub-folders.unpaddig-folder .b-sub-folders .b-sub-folders .e-item .e-link {
-		padding-left: @subPadding * 2 + @folderItemPadding;
-	}
 	.b-sub-folders .b-sub-folders .b-sub-folders .b-sub-folders .e-item .e-link {
 		padding-left: @subPadding * 4 + @folderItemPadding;
 	}
-	.b-sub-folders.unpaddig-folder .b-sub-folders .b-sub-folders .b-sub-folders .e-item .e-link {
-		padding-left: @subPadding * 3 + @folderItemPadding;
-	}
 
-/**
+/**/
 	&.single-root-inbox .i-am-inbox.e-link {
-		display: none;
+		display: none !important;
 	}
 
-	&.single-root-inbox .i-am-inbox-wrapper + .b-sub-folders .e-item .e-link {
-		padding-left: @folderItemPadding;
+	&.single-root-inbox .i-am-inbox-wrapper > .b-sub-folders {
+		max-height: none !important;
+		height: inherit !important;
+		display: block !important;
+	}
+
+	&.single-root-inbox .i-am-inbox-wrapper {
+		.b-sub-folders .e-item .e-link {
+			padding-left: @folderItemPadding;
+		}
+		.b-sub-folders .b-sub-folders .e-item .e-link {
+			padding-left: @subPadding * 1 + @folderItemPadding;
+		}
+		.b-sub-folders .b-sub-folders .b-sub-folders .e-item .e-link {
+			padding-left: @subPadding * 2 + @folderItemPadding;
+		}
+		.b-sub-folders .b-sub-folders .b-sub-folders .b-sub-folders .e-item .e-link {
+			padding-left: @subPadding * 3 + @folderItemPadding;
+		}
 	}
 /**/
 }
diff --git a/package.json b/package.json
index 57485768b..27a86f165 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
 	"name": "RainLoop",
 	"title": "RainLoop Webmail",
 	"version": "1.8.1",
-	"release": "267",
+	"release": "271",
 	"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 ea52cd200..39f84a0fc 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -1013,6 +1013,9 @@ class Actions
 		$sRand = \MailSo\Base\Utils::Md5Rand();
 		if (!$this->Cacher()->Set(\RainLoop\KeyPathHelper::SessionAdminKey($sRand), \time()))
 		{
+			$this->oLogger->Write('Cannot store an admin token',
+				\MailSo\Log\Enumerations\Type::WARNING);
+
 			$sRand = '';
 		}
 
@@ -1037,12 +1040,9 @@ class Actions
 			{
 				$bResult = true;
 			}
-			else if ($bThrowExceptionOnFalse)
-			{
-				throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AuthError);
-			}
 		}
-		else if ($bThrowExceptionOnFalse)
+
+		if (!$bResult && $bThrowExceptionOnFalse)
 		{
 			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AuthError);
 		}
@@ -3264,9 +3264,10 @@ class Actions
 			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AuthError);
 		}
 
-		$this->setAdminAuthToken($this->getAdminToken());
+		$sToken = $this->getAdminToken();
+		$this->setAdminAuthToken($sToken);
 
-		return $this->TrueResponse(__FUNCTION__);
+		return $this->DefaultResponse(__FUNCTION__, $sToken ? true : false);
 	}
 
 	/**
@@ -3322,7 +3323,7 @@ class Actions
 	{
 		$sDomain = \strtolower(\trim($sDomain));
 
-		$sTempDomain = \preg_replace('/^(webmail|email|mail|www|ssl)\./', '', $sDomain);
+		$sTempDomain = \preg_replace('/^(webmail|email|mail)\./', '', $sDomain);
 		if (false === \strpos($sTempDomain, '.'))
 		{
 			$sTempDomain = $sDomain;