extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-13 01:18:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix missing delete after move when moving cross servers

Browse Source
This commit is contained in:
Klaus Leithoff 2014-01-17 12:02:03 +00:00
parent d2ad25a928
commit 70ebabaf90
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/inc/class.mail_bo.inc.php
View File

@ -2995,7 +2995,7 @@ class mail_bo
$uidsToFetch->add($_messageUID); $uidsToFetch->add($_messageUID);
$fquery = new Horde_Imap_Client_Fetch_Query(); $fquery = new Horde_Imap_Client_Fetch_Query();
$fquery->fullText(); $fquery->fullText(array('peek'=>true));
$fquery->flags(); $fquery->flags();
$headersNew = $this->icServer->fetch($sourceFolder, $fquery, array( $headersNew = $this->icServer->fetch($sourceFolder, $fquery, array(
'ids' => $uidsToFetch, 'ids' => $uidsToFetch,
@ -3025,6 +3025,10 @@ class mail_bo
$retUid->add($ret); $retUid->add($ret);
unset($dataNflags); unset($dataNflags);
} }
if ($deleteAfterMove)
{
$this->deleteMessages($_messageUID, $sourceFolder, $_forceDeleteMethod='remove_immediately');
}
} }
} }
else else

6
mail/inc/class.mail_ui.inc.php
View File

@ -613,9 +613,9 @@ class mail_ui
$fetchCounters = !is_null($_nodeID); $fetchCounters = !is_null($_nodeID);
list($_profileID,$_folderName) = explode(self::$delimiter,$nodeID,2); list($_profileID,$_folderName) = explode(self::$delimiter,$nodeID,2);
if (!empty($_folderName)) $fetchCounters = true; if (!empty($_folderName)) $fetchCounters = true;
error_log(__METHOD__.__LINE__.':'.$nodeID.'->'.array2string($fetchCounters)); //error_log(__METHOD__.__LINE__.':'.$nodeID.'->'.array2string($fetchCounters));
$data = $this->getFolderTree($fetchCounters, $nodeID, $subscribedOnly); $data = $this->getFolderTree($fetchCounters, $nodeID, $subscribedOnly);
error_log(__METHOD__.__LINE__.':'.$nodeID.'->'.array2string($data)); //error_log(__METHOD__.__LINE__.':'.$nodeID.'->'.array2string($data));
if (!is_null($_nodeID)) return $data; if (!is_null($_nodeID)) return $data;
header('Content-Type: application/json; charset=utf-8'); header('Content-Type: application/json; charset=utf-8');
echo json_encode($data); echo json_encode($data);
@ -3966,7 +3966,7 @@ blockquote[type=cite] {
*/ */
function ajax_copyMessages($_folderName, $_messageList, $_copyOrMove='copy') function ajax_copyMessages($_folderName, $_messageList, $_copyOrMove='copy')
{ {
if(mail_bo::$debug); error_log(__METHOD__."->".$_folderName.':'.print_r($_messageList,true).' Method:'.$_copyOrMove); if(mail_bo::$debug) error_log(__METHOD__."->".$_folderName.':'.print_r($_messageList,true).' Method:'.$_copyOrMove);
$_folderName = $this->mail_bo->decodeEntityFolderName($_folderName); $_folderName = $this->mail_bo->decodeEntityFolderName($_folderName);
// only copy or move are supported as method // only copy or move are supported as method
if (!($_copyOrMove=='copy' || $_copyOrMove=='move')) $_copyOrMove='copy'; if (!($_copyOrMove=='copy' || $_copyOrMove=='move')) $_copyOrMove='copy';