From 80ecc0813395c8b54b0f6297a0a4bd9980036aca Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 14 Aug 2014 07:32:51 +0000
Subject: [PATCH] Backport commit r48039, committed by Nathan Gray. Some more
 speed improvements for initial load: - Avoid expensive connect in constructor
 for all AJAX calls (reconnect/cache used instead) - Don't verify that special
 folders exist for folder tree - Only fetch folder counts when fetchCounters
 flag is set, instead of always - Avoid some et2 warnings about not existing
 attributes (no speed improvement, but less annoying)

---
 mail/inc/class.mail_ui.inc.php   | 27 ++++++++---------
 mail/templates/default/index.xet | 52 ++++++++++++++++----------------
 2 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 64b6367d59..551d25bbcf 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -132,7 +132,7 @@ class mail_ui
 //					. 'mail.mail_ui.ajax_refreshQuotaDisplay|'
 					. 'mail.mail_ui.ajax_changeProfile|'
 					. '^(?!mail)/';
-			if (!preg_match($needle,$_GET['menuaction']))
+			if (!preg_match($needle,$_GET['menuaction']) && !egw_json_request::isJSONRequest())
 			{
 				//error_log(__METHOD__.__LINE__.' Fetched IC Server openConnection:'.self::$icServerID.'/'.$this->mail_bo->profileID.':'.function_backtrace());
 				//openConnection gathers SpecialUseFolderInformation and Delimiter Info
@@ -793,10 +793,10 @@ class mail_ui
 			$folderObjects = $this->mail_bo->getFolderObjects($_subscribedOnly,false,false,$_useCacheIfPossible);
 			//$endtime = microtime(true) - $starttime;
 			//error_log(__METHOD__.__LINE__.' Fetching folderObjects took: '.$endtime);
-			$trashFolder = $this->mail_bo->getTrashFolder();
-			$templateFolder = $this->mail_bo->getTemplateFolder();
-			$draftFolder = $this->mail_bo->getDraftFolder();
-			$sentFolder = $this->mail_bo->getSentFolder();
+			$trashFolder = $this->mail_bo->getTrashFolder(false);
+			$templateFolder = $this->mail_bo->getTemplateFolder(false);
+			$draftFolder = $this->mail_bo->getDraftFolder(false);
+			$sentFolder = $this->mail_bo->getSentFolder(false);
 			$userDefinedFunctionFolders = array();
 			if (isset($trashFolder) && $trashFolder != 'none') $userDefinedFunctionFolders['Trash'] = $trashFolder;
 			if (isset($sentFolder) && $sentFolder != 'none') $userDefinedFunctionFolders['Sent'] = $sentFolder;
@@ -881,11 +881,6 @@ class mail_ui
 			{
 				if ($levelCt>$cmblevelsCt+1) $fetchCounters=false;
 			}
-			//error_log(__METHOD__.__LINE__.' fc:'.$fetchCounters.'/'.$_fetchCounters.'('.$levelCt.'/'.$cmblevelsCt.')'.' for:'.array2string($key));
-			$fS = $this->mail_bo->getFolderStatus($key,false,($fetchCounters?false:true),false);
-			//error_log(__METHOD__.__LINE__.'Object:'.array2string($obj));
-			//error_log(__METHOD__.__LINE__.'Status:'.array2string($fS));
-			//error_log(__METHOD__.__LINE__."-------------------------");
 			$fFP = $folderParts = explode($obj->delimiter, $key);
 			if (in_array($key,$userDefinedFunctionFolders)) $obj->shortDisplayName = lang($obj->shortDisplayName);
 			//get rightmost folderpart
@@ -921,10 +916,14 @@ class mail_ui
 				$oA['im1'] = "folderOpen.gif";
 				$oA['im2'] = "MailFolderClosed.png"; // has Children
 			}
-			if ($fS['unseen'])
+			if ($fetchCounters)
 			{
-				$oA['text'] = $oA['text'].' ('.$fS['unseen'].')';
-				$oA['style'] = 'font-weight: bold';
+				$count = $this->mail_bo->getMailBoxCounters($key,true);
+				if($count->unseen)
+				{
+					$oA['text'] = $oA['text'].' ('.$count->unseen.')';
+					$oA['style'] = 'font-weight: bold';
+				}
 			}
 			$path = $this->mail_bo->profileID.self::$delimiter.$key;
 			$oA['id'] = $path; // ID holds the PATH
@@ -3926,7 +3925,7 @@ class mail_ui
 			if (empty($icServerID)) $icServerID = $mail->mail_bo->profileID;
 			if ($icServerID != $mail->mail_bo->profileID) return;
 
-			$vacation = $mail->gatherVacation($cachedVacations);
+			$vacation = $mail->gatherVacation();
 		}
 
 		if($vacation) {
diff --git a/mail/templates/default/index.xet b/mail/templates/default/index.xet
index 3a767ecdab..be2bbfe180 100644
--- a/mail/templates/default/index.xet
+++ b/mail/templates/default/index.xet
@@ -79,32 +79,32 @@
 				<hbox id="mailPreviewHeadersAttachments" class="mailPreviewHeaders">
 					<description value="Attachments"/>
 					<grid disabled="@no_griddata" id="previewAttachmentArea" class="previewAttachmentArea">
-					  <columns>
-					   <column disabled="!@showtempname"/>
-					   <column disabled="!@showtempname"/>
-					   <column disabled="!@showtempname"/>
-					   <column disabled="!@showtempname"/>
-					   <column width="70%" />
-					   <column width="11%" />
-					   <column width="3%"/>
-					   <column width="3%"/>
-					   <column width="3%"/>
-					   <column />
-					  </columns>
-					  <rows>
-					   <row >
-						<description id="${row}[attachment_number]" />
-						<description id="${row}[partID]" />
-						<description id="${row}[type]" />
-						<description id="${row}[winmailFlag]" />
-						<description class="et2_link" id="${row}[filename]" no_lang="1" onclick="app.mail.displayAttachment"/>
-						<description align="right" id="${row}[size]" />
-						<buttononly id="${row}[save]" value="save" image="fileexport" onclick="app.mail.saveAttachment"/>
-						<buttononly id="${row}[saveAsVFS]" value="save" image="filemanager/navbar" onclick="app.mail.saveAttachmentToVFS"/>
-						<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_all]" value="save_all" image="mail/save_all" onclick="app.mail.saveAllAttachmentsToVFS"/>
-						<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_zip]" value="save_zip" image="mail/save_all" onclick="app.mail.saveAllAttachmentsToZip" label="Save as Zip"/>
-					   </row>
-					  </rows>
+						<columns>
+							<column disabled="!@showtempname"/>
+							<column disabled="!@showtempname"/>
+							<column disabled="!@showtempname"/>
+							<column disabled="!@showtempname"/>
+							<column width="70%" />
+							<column width="11%" />
+							<column width="3%"/>
+							<column width="3%"/>
+							<column width="3%"/>
+							<column />
+						</columns>
+						<rows>
+							<row >
+								<description id="${row}[attachment_number]" />
+								<description id="${row}[partID]" />
+								<description id="${row}[type]" />
+								<description id="${row}[winmailFlag]" />
+								<description class="et2_link" id="${row}[filename]" no_lang="1" onclick="app.mail.displayAttachment"/>
+								<description align="right" id="${row}[size]" />
+								<buttononly id="${row}[save]" image="fileexport" onclick="app.mail.saveAttachment"/>
+								<buttononly id="${row}[saveAsVFS]" image="filemanager/navbar" onclick="app.mail.saveAttachmentToVFS"/>
+								<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_all]" image="mail/save_all" onclick="app.mail.saveAllAttachmentsToVFS"/>
+								<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_zip]" image="mail/save_zip" onclick="app.mail.saveAllAttachmentsToZip" label="Save as Zip"/>
+							</row>
+						</rows>
 					</grid>
 					<buttononly class="et2_button ui-button" label="Show all attachments" image="foldertree_nolines_plus" onclick="app.mail.showAllHeader"/>
 				</hbox>