From 25f1f73472d6a7fda6f563e5d24d57acc1b4e625 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 6 May 2010 15:59:15 +0000
Subject: [PATCH] fixing a problem for move/copy when appling to foldernames
 with e.g.: umlauts

---
 felamimail/inc/class.ajaxfelamimail.inc.php |  4 ++--
 felamimail/js/jscode/viewMainScreen.js      | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/felamimail/inc/class.ajaxfelamimail.inc.php b/felamimail/inc/class.ajaxfelamimail.inc.php
index 87400af9d9..c347e1529a 100644
--- a/felamimail/inc/class.ajaxfelamimail.inc.php
+++ b/felamimail/inc/class.ajaxfelamimail.inc.php
@@ -643,7 +643,7 @@
 		*/
 		function moveMessages($_folderName, $_selectedMessages)
 		{
-			if($this->_debug) error_log(__METHOD__." called with Messages ".print_r($_selectedMessages,true));
+			if($this->_debug) error_log(__METHOD__." move to $_folderName called with Messages ".print_r($_selectedMessages,true));
 			$messageCount = 0;
 			if(is_array($_selectedMessages) && count($_selectedMessages['msg']) > 0) $messageCount = count($_selectedMessages['msg']);
 			$folderName = $this->_decodeEntityFolderName($_folderName);
@@ -653,7 +653,7 @@
 				} else {
 					  if($this->_debug) error_log("ajaxfelamimail::moveMessages-> same folder than current selected");
 				}
-
+				if($this->_debug) error_log(__METHOD__." Rebuild MessageList for Folder:".$this->sessionData['mailbox']);
 				return $this->generateMessageList($this->sessionData['mailbox'],($_selectedMessages == 'all'?0:(-1*$messageCount)));
 			} else {
 				$response = new xajaxResponse();
diff --git a/felamimail/js/jscode/viewMainScreen.js b/felamimail/js/jscode/viewMainScreen.js
index 82dc259ad5..1fc302e9e6 100644
--- a/felamimail/js/jscode/viewMainScreen.js
+++ b/felamimail/js/jscode/viewMainScreen.js
@@ -122,7 +122,8 @@ function OnLoadingStart(_nodeID) {
 //}
 
 function callNodeSelect(_nodeIDfc, mode) {
-//alert("callNodeSelect:"+_nodeIDfc);
+	_nodeIDfc = _nodeIDfc.replace(/#ampersand#/g,"&amp;");
+	//alert("callNodeSelect:"+_nodeIDfc);
 	var buff = prefAskForMove;
 	if (mode == 0) // cancel
 	{
@@ -157,10 +158,11 @@ function onNodeSelect(_nodeID) {
 			{
 				//Check = confirm(lang_askformove + tree.getUserData(_nodeID, 'folderName'));
 				title = lang_MoveCopyTitle;
+				node2call = _nodeID.replace(/&amp;/g,'#ampersand#');
 				message = lang_askformove + tree.getUserData(_nodeID, 'folderName');
-				message = message + "<p><button onclick=\"callNodeSelect('"+_nodeID+"', 1);hideDialog();\">"+lang_move+"</button>";
-				if (prefAskForMove == 2) message = message + "&nbsp;<button onclick=\"callNodeSelect('"+_nodeID+"', 2);hideDialog();\">"+lang_copy+"</button>";
-				message = message + "&nbsp;<button onclick=\"callNodeSelect('"+_nodeID+"', 0);hideDialog();\">"+lang_cancel+"</button>";
+				message = message + "<p><button onclick=\"callNodeSelect('"+node2call+"', 1);hideDialog();\">"+lang_move+"</button>";
+				if (prefAskForMove == 2) message = message + "&nbsp;<button onclick=\"callNodeSelect('"+node2call+"', 2);hideDialog();\">"+lang_copy+"</button>";
+				message = message + "&nbsp;<button onclick=\"callNodeSelect('"+node2call+"', 0);hideDialog();\">"+lang_cancel+"</button>";
 				type = 'prompt';
 				autohide = 0;
 				showDialog(title,message,type,autohide);