From 4ba51c410a5127c0db26bb0cf94f1a3a34060854 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 28 May 2013 09:32:23 +0000
Subject: [PATCH] reenable splitter dock/undock; improve/fix bug in findNode
 regarding comparing node at hand and nodeid requested

---
 mail/inc/class.mail_ui.inc.php | 7 ++++---
 mail/js/app.js                 | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index a7ccb2d9e9..db169721ce 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -144,6 +144,7 @@ class mail_ui
 				//$content['nm']['path'] = self::get_home_dir();
 			}
 		}
+		$content['nm']['csv_fields'] = false;
 		if ($msg)
 		{
 			$content['msg'] = $msg;
@@ -545,7 +546,7 @@ class mail_ui
 	{
 		foreach($_out['item'] as $node)
 		{
-			if ($node['id']==$_nodeID)
+			if (strcmp($node['id'],$_nodeID)===0)
 			{
 				//error_log(__METHOD__.__LINE__.':'.$_nodeID.'->'.$node['id']);
 				return ($childElements?$node['item']:$node);
@@ -970,7 +971,7 @@ class mail_ui
 unset($query['actions']);
 //error_log(__METHOD__.__LINE__.array2string($query));
 //error_log(__METHOD__.__LINE__.' SelectedFolder:'.$query['selectedFolder'].' Start:'.$query['start'].' NumRows:'.$query['num_rows']);
-		//$starttime = microtime(true);
+		$starttime = microtime(true);
 		//error_log(__METHOD__.__LINE__.array2string($query['search']));
 		//$query['search'] is the phrase in the searchbox
 
@@ -1084,7 +1085,7 @@ unset($query['actions']);
 		if ($GLOBALS['egw_info']['user']['preferences']['common']['select_mode']=='EGW_SELECTMODE_TOGGLE') unset($cols[0]);
 		$rows = $this->header2gridelements($sortResult['header'],$cols, $_folderName, $folderType,$previewMessage);
 		//error_log(__METHOD__.__LINE__.array2string($rows));
-		//$endtime = microtime(true) - $starttime;
+		$endtime = microtime(true) - $starttime;
 		//error_log(__METHOD__.__LINE__.' SelectedFolder:'.$query['selectedFolder'].' Start:'.$query['start'].' NumRows:'.$query['num_rows'].' Took:'.$endtime);
 
 		return $rowsFetched['messages'];
diff --git a/mail/js/app.js b/mail/js/app.js
index 5dbfbf80bd..8c46ff9fee 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -151,11 +151,11 @@ app.mail = AppJS.extend(
 		etemplate2.getByApplication('mail')[0].widgetContainer.getWidgetById('mailPreview').set_disabled(_value);
 		if (_value==true)
 		{
-			//splitter.dock();
+			splitter.dock();
 		}		
 		else
 		{
-			//splitter.undock();
+			splitter.undock();
 		}
 	},