the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2025-02-25 15:26:14 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fixed: Unselect folder (if supported) on [moving, deleting] (#846)

Browse source
This commit is contained in:
RainLoop Team 2015-10-07 22:09:47 +03:00
parent 55e3bad890
commit b5c1d8b665
3 changed files with 75 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
rainloop/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php
View file

@ -966,6 +966,18 @@ class ImapClient extends \MailSo\Net\NetClient
return $this->selectOrExamineFolder($sFolderName, $this->__FORCE_SELECT_ON_EXAMINE__, $bReSelectSameFolders);
}
/**
* @return \MailSo\Imap\ImapClient
*
* @throws \MailSo\Net\Exceptions\Exception
* @throws \MailSo\Imap\Exceptions\Exception
*/
public function FolderUnSelect()
{
return $this->IsSelected() && $this->IsSupported('UNSELECT') ?
$this->SendRequestWithCheck('UNSELECT') : $this;
}
/**
* @param array $aInputFetchItems
* @param string $sIndexRange

16
rainloop/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
View file

@ -637,6 +637,22 @@ class MailClient
return $this;
}
/**
* @return \MailSo\Mail\MailClient
*
* @throws \MailSo\Net\Exceptions\Exception
* @throws \MailSo\Imap\Exceptions\Exception
*/
public function FolderUnSelect()
{
if ($this->oImapClient->IsSelected())
{
$this->oImapClient->FolderUnSelect();
}
return $this;
}
/**
* @param resource $rMessageStream
* @param int $iMessageStreamSize

53
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -7205,14 +7205,35 @@ class Actions
{
$this->MailClient()->MessageDelete($sFolder, $aFilteredUids, true, true,
!!$this->Config()->Get('labs', 'use_imap_expunge_all_on_delete', false));
$sHash = $this->MailClient()->FolderHash($sFolder);
}
catch (\Exception $oException)
{
throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantDeleteMessage, $oException);
}
if ($this->Config()->Get('labs', 'use_imap_unselect', true))
{
try
{
$this->MailClient()->FolderUnSelect();
}
catch (\Exception $oException)
{
unset($oException);
}
}
$sHash = '';
try
{
$sHash = $this->MailClient()->FolderHash($sFromFolder);
}
catch (\Exception $oException)
{
unset($oException);
}
return $this->DefaultResponse(__FUNCTION__, '' === $sHash ? false : array($sFolder, $sHash));
}
@ -7253,16 +7274,36 @@ class Actions
!!$this->Config()->Get('labs', 'use_imap_move', true),
!!$this->Config()->Get('labs', 'use_imap_expunge_all_on_delete', false)
);
$sHash = $this->MailClient()->FolderHash($sFromFolder);
}
catch (\Exception $oException)
{
throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantMoveMessage, $oException);
}
return $this->DefaultResponse(__FUNCTION__,
'' === $sHash ? false : array($sFromFolder, $sHash));
if ($this->Config()->Get('labs', 'use_imap_unselect', true))
{
try
{
$this->MailClient()->FolderUnSelect();
}
catch (\Exception $oException)
{
unset($oException);
}
}
$sHash = '';
try
{
$sHash = $this->MailClient()->FolderHash($sFromFolder);
}
catch (\Exception $oException)
{
unset($oException);
}
return $this->DefaultResponse(__FUNCTION__, '' === $sHash ? false : array($sFromFolder, $sHash));
}
/**