mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-09-07 08:27:03 +03:00
v1.2.10.430
This commit is contained in:
parent
c658c5af1f
commit
c6b70fa290
395 changed files with 370 additions and 247 deletions
|
|
@ -1 +1 @@
|
||||||
1.2.10.427
|
1.2.10.430
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
3ade7d9a5b7a9dbf6623b642d2dbd24ba1f2644c
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
1.2.10.427
|
|
||||||
1
rainloop/v/1.2.10.430/REVISION
Normal file
1
rainloop/v/1.2.10.430/REVISION
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
3f2545f89603ca4568c9fb341e6dffbeb86c069a
|
||||||
1
rainloop/v/1.2.10.430/VERSION
Normal file
1
rainloop/v/1.2.10.430/VERSION
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
1.2.10.430
|
||||||
|
|
@ -13,7 +13,7 @@ class FolderType
|
||||||
const INBOX = 1;
|
const INBOX = 1;
|
||||||
const SENT = 2;
|
const SENT = 2;
|
||||||
const DRAFTS = 3;
|
const DRAFTS = 3;
|
||||||
const SPAN = 4;
|
const SPAM = 4;
|
||||||
const TRASH = 5;
|
const TRASH = 5;
|
||||||
const IMPORTANT = 10;
|
const IMPORTANT = 10;
|
||||||
const STARRED = 11;
|
const STARRED = 11;
|
||||||
|
|
@ -56,6 +56,10 @@ class Folder
|
||||||
$this->aExtended = array();
|
$this->aExtended = array();
|
||||||
|
|
||||||
$sDelimiter = 'NIL' === \strtoupper($sDelimiter) ? '' : $sDelimiter;
|
$sDelimiter = 'NIL' === \strtoupper($sDelimiter) ? '' : $sDelimiter;
|
||||||
|
if (empty($sDelimiter))
|
||||||
|
{
|
||||||
|
$sDelimiter = '.'; // default delimiter
|
||||||
|
}
|
||||||
|
|
||||||
if (!\is_array($aFlags) ||
|
if (!\is_array($aFlags) ||
|
||||||
!\is_string($sDelimiter) || 1 < \strlen($sDelimiter) ||
|
!\is_string($sDelimiter) || 1 < \strlen($sDelimiter) ||
|
||||||
|
|
@ -87,14 +91,14 @@ class Folder
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param string $sFullNameRaw
|
* @param string $sFullNameRaw
|
||||||
* @param string $sDelimiter = '/'
|
* @param string $sDelimiter = '.'
|
||||||
* @param array $aFlags = array()
|
* @param array $aFlags = array()
|
||||||
*
|
*
|
||||||
* @return \MailSo\Imap\Folder
|
* @return \MailSo\Imap\Folder
|
||||||
*
|
*
|
||||||
* @throws \MailSo\Base\Exceptions\InvalidArgumentException
|
* @throws \MailSo\Base\Exceptions\InvalidArgumentException
|
||||||
*/
|
*/
|
||||||
public static function NewInstance($sFullNameRaw, $sDelimiter = '/', $aFlags = array())
|
public static function NewInstance($sFullNameRaw, $sDelimiter = '.', $aFlags = array())
|
||||||
{
|
{
|
||||||
return new self($sFullNameRaw, $sDelimiter, $aFlags);
|
return new self($sFullNameRaw, $sDelimiter, $aFlags);
|
||||||
}
|
}
|
||||||
|
|
@ -186,11 +186,25 @@ class ImapClient extends \MailSo\Net\NetClient
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
$this->SendRequestWithCheck('LOGIN',
|
if ($this->IsSupported('AUTH=LOGIN') || !$this->IsSupported('AUTH=PLAIN'))
|
||||||
array(
|
{
|
||||||
$this->EscapeString($sLogin),
|
$this->SendRequestWithCheck('LOGIN',
|
||||||
$this->EscapeString($sPassword)
|
array(
|
||||||
));
|
$this->EscapeString($sLogin),
|
||||||
|
$this->EscapeString($sPassword)
|
||||||
|
));
|
||||||
|
}
|
||||||
|
else if ($this->IsSupported('AUTH=PLAIN'))
|
||||||
|
{
|
||||||
|
$this->SendRequestWithCheck('AUTHENTICATE',
|
||||||
|
array('PLAIN', \base64_encode("\0".$sLogin."\0".$sPassword)));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$this->writeLogException(
|
||||||
|
new \MailSo\Imap\Exceptions\LoginBadMethodException(),
|
||||||
|
\MailSo\Log\Enumerations\Type::NOTICE, true);
|
||||||
|
}
|
||||||
|
|
||||||
if (0 < \strlen($sProxyAuthUser))
|
if (0 < \strlen($sProxyAuthUser))
|
||||||
{
|
{
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue