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

Bugfix: folder rename/move was broken

Browse source
This commit is contained in:
djmaze 2021-12-02 23:21:12 +01:00
parent 792fee547a
commit c1228d09f0
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
View file

@ -1385,22 +1385,13 @@ class MailClient
* @throws \MailSo\Base\Exceptions\InvalidArgumentException
* @throws \MailSo\Base\Exceptions\RuntimeException
*/
protected function folderModify(string $sPrevFolderFullName, string $sNextFolderNameInUtf, bool $bRename, bool $bSubscribeOnModify) : self
protected function folderModify(string $sPrevFolderFullName, string $sNewFolderFullName, bool $bRename, bool $bSubscribeOnModify) : self
{
if (!\strlen($sPrevFolderFullName) || !\strlen($sNextFolderNameInUtf))
if (!\strlen($sPrevFolderFullName) || !\strlen($sNewFolderFullName))
{
throw new \MailSo\Base\Exceptions\InvalidArgumentException;
}
$sDelimiter = $this->oImapClient->FolderHierarchyDelimiter($sPrevFolderFullName);
if (!$sDelimiter)
{
// TODO: Translate
throw new Exceptions\RuntimeException('Cannot '.($bRename?'rename':'move').' non-existent folder.');
}
$iLast = \strrpos($sPrevFolderFullName, $sDelimiter);
$aSubscribeFolders = array();
if ($bSubscribeOnModify)
{
@ -1413,14 +1404,23 @@ class MailClient
if ($bRename)
{
$sDelimiter = $this->oImapClient->FolderHierarchyDelimiter($sPrevFolderFullName);
if (!$sDelimiter)
{
// TODO: Translate
throw new Exceptions\RuntimeException('Cannot '.($bRename?'rename':'move').' non-existent folder.');
}
$iLast = \strrpos($sPrevFolderFullName, $sDelimiter);
if (\strlen($sDelimiter) && false !== \strpos($sNewFolderFullName, $sDelimiter))
{
// TODO: Translate
throw new Exceptions\RuntimeException('New folder name contains delimiter.');
}
$sFolderParentFullName = false === $iLast ? '' : \substr($sPrevFolderFullName, 0, $iLast + 1);
$sNewFolderFullName = $sFolderParentFullName.$sNewFolderFullName;
$sNewFolderFullName = (false === $iLast ? '' : \substr($sPrevFolderFullName, 0, $iLast + 1))
. $sNewFolderFullName;
}
$this->oImapClient->FolderRename($sPrevFolderFullName, $sNewFolderFullName);