Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Partial fix for #170

Browse source
This commit is contained in:
djmaze 2021-12-23 12:20:40 +01:00
parent eb31d0258a
commit 6465c95a91
2 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dev/App/User.js
View file

@ -216,7 +216,7 @@ class AppUser extends AbstractApp {
} }
messagesCopyHelper(sFromFolderFullName, sToFolderFullName, aUidForCopy) { messagesCopyHelper(sFromFolderFullName, sToFolderFullName, aUidForCopy) {
Remote.request('MessageCopy', this.moveOrDeleteResponseHelper, { Remote.request('MessageCopy', null, {
FromFolder: sFromFolderFullName, FromFolder: sFromFolderFullName,
ToFolder: sToFolderFullName, ToFolder: sToFolderFullName,
Uids: aUidForCopy.join(',') Uids: aUidForCopy.join(',')

14
snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
View file

@ -503,17 +503,16 @@ trait Messages
} }
$sHash = ''; $sHash = '';
try try
{ {
$sHash = $this->MailClient()->FolderHash($sFolder); $sHash = $this->MailClient()->FolderHash($sFolder);
} }
catch (\Throwable $oException) catch (\Throwable $oException)
{ {
unset($oException); \error_log("FolderHash({$sFolder}) Exception: {$oException->getMessage()}");
} }
return $this->DefaultResponse(__FUNCTION__, $sHash ? array($sFolder, $sHash) : false); return $this->DefaultResponse(__FUNCTION__, $sHash ? array($sFolder, $sHash) : array($sFromFolder));
} }
/** /**
@ -567,17 +566,16 @@ trait Messages
} }
$sHash = ''; $sHash = '';
try try
{ {
$sHash = $this->MailClient()->FolderHash($sFromFolder); $sHash = $this->MailClient()->FolderHash($sFromFolder);
} }
catch (\Throwable $oException) catch (\Throwable $oException)
{ {
unset($oException); \error_log("FolderHash({$sFromFolder}) Exception: {$oException->getMessage()}");
} }
return $this->DefaultResponse(__FUNCTION__, $sHash ? array($sFromFolder, $sHash) : false); return $this->DefaultResponse(__FUNCTION__, $sHash ? array($sFromFolder, $sHash) : array($sFromFolder));
} }
/** /**
@ -597,15 +595,13 @@ trait Messages
{ {
$this->MailClient()->MessageCopy($sFromFolder, $sToFolder, $this->MailClient()->MessageCopy($sFromFolder, $sToFolder,
$aFilteredUids, true); $aFilteredUids, true);
$sHash = $this->MailClient()->FolderHash($sFromFolder);
} }
catch (\Throwable $oException) catch (\Throwable $oException)
{ {
throw new ClientException(Notifications::CantCopyMessage, $oException); throw new ClientException(Notifications::CantCopyMessage, $oException);
} }
return $this->DefaultResponse(__FUNCTION__, $sHash ? array($sFromFolder, $sHash) : false); return $this->TrueResponse(__FUNCTION__);
} }
public function DoMessageUploadAttachments() : array public function DoMessageUploadAttachments() : array