extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-24 17:04:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixing a problem for move/copy when appling to foldernames with e.g.: umlauts

Browse Source
This commit is contained in:
Klaus Leithoff 2010-05-06 15:59:15 +00:00
parent 710ce399ed
commit 25f1f73472
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
felamimail/inc/class.ajaxfelamimail.inc.php
View File

@ -643,7 +643,7 @@
*/ */
function moveMessages($_folderName, $_selectedMessages) 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; $messageCount = 0;
if(is_array($_selectedMessages) && count($_selectedMessages['msg']) > 0) $messageCount = count($_selectedMessages['msg']); if(is_array($_selectedMessages) && count($_selectedMessages['msg']) > 0) $messageCount = count($_selectedMessages['msg']);
$folderName = $this->_decodeEntityFolderName($_folderName); $folderName = $this->_decodeEntityFolderName($_folderName);
@ -653,7 +653,7 @@
} else { } else {
if($this->_debug) error_log("ajaxfelamimail::moveMessages-> same folder than current selected"); 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))); return $this->generateMessageList($this->sessionData['mailbox'],($_selectedMessages == 'all'?0:(-1*$messageCount)));
} else { } else {
$response = new xajaxResponse(); $response = new xajaxResponse();

10
felamimail/js/jscode/viewMainScreen.js
View File

@ -122,7 +122,8 @@ function OnLoadingStart(_nodeID) {
//} //}
function callNodeSelect(_nodeIDfc, mode) { function callNodeSelect(_nodeIDfc, mode) {
//alert("callNodeSelect:"+_nodeIDfc); _nodeIDfc = _nodeIDfc.replace(/#ampersand#/g,"&");
//alert("callNodeSelect:"+_nodeIDfc);
var buff = prefAskForMove; var buff = prefAskForMove;
if (mode == 0) // cancel if (mode == 0) // cancel
{ {
@ -157,10 +158,11 @@ function onNodeSelect(_nodeID) {
{ {
//Check = confirm(lang_askformove + tree.getUserData(_nodeID, 'folderName')); //Check = confirm(lang_askformove + tree.getUserData(_nodeID, 'folderName'));
title = lang_MoveCopyTitle; title = lang_MoveCopyTitle;
node2call = _nodeID.replace(/&/g,'#ampersand#');
message = lang_askformove + tree.getUserData(_nodeID, 'folderName'); message = lang_askformove + tree.getUserData(_nodeID, 'folderName');
message = message + "<p><button onclick=\"callNodeSelect('"+_nodeID+"', 1);hideDialog();\">"+lang_move+"</button>"; message = message + "<p><button onclick=\"callNodeSelect('"+node2call+"', 1);hideDialog();\">"+lang_move+"</button>";
if (prefAskForMove == 2) message = message + "&nbsp;<button onclick=\"callNodeSelect('"+_nodeID+"', 2);hideDialog();\">"+lang_copy+"</button>"; if (prefAskForMove == 2) message = message + "&nbsp;<button onclick=\"callNodeSelect('"+node2call+"', 2);hideDialog();\">"+lang_copy+"</button>";
message = message + "&nbsp;<button onclick=\"callNodeSelect('"+_nodeID+"', 0);hideDialog();\">"+lang_cancel+"</button>"; message = message + "&nbsp;<button onclick=\"callNodeSelect('"+node2call+"', 0);hideDialog();\">"+lang_cancel+"</button>";
type = 'prompt'; type = 'prompt';
autohide = 0; autohide = 0;
showDialog(title,message,type,autohide); showDialog(title,message,type,autohide);