v1.2.10.430

This commit is contained in:
RainLoop Team 2013-10-08 02:52:30 +04:00
parent c658c5af1f
commit c6b70fa290
395 changed files with 370 additions and 247 deletions

View file

@ -1 +1 @@
1.2.10.427
1.2.10.430

View file

@ -1 +0,0 @@
3ade7d9a5b7a9dbf6623b642d2dbd24ba1f2644c

View file

@ -1 +0,0 @@
1.2.10.427

View file

@ -0,0 +1 @@
3f2545f89603ca4568c9fb341e6dffbeb86c069a

View file

@ -0,0 +1 @@
1.2.10.430

View file

@ -13,7 +13,7 @@ class FolderType
const INBOX = 1;
const SENT = 2;
const DRAFTS = 3;
const SPAN = 4;
const SPAM = 4;
const TRASH = 5;
const IMPORTANT = 10;
const STARRED = 11;

View file

@ -56,6 +56,10 @@ class Folder
$this->aExtended = array();
$sDelimiter = 'NIL' === \strtoupper($sDelimiter) ? '' : $sDelimiter;
if (empty($sDelimiter))
{
$sDelimiter = '.'; // default delimiter
}
if (!\is_array($aFlags) ||
!\is_string($sDelimiter) || 1 < \strlen($sDelimiter) ||
@ -87,14 +91,14 @@ class Folder
/**
* @param string $sFullNameRaw
* @param string $sDelimiter = '/'
* @param string $sDelimiter = '.'
* @param array $aFlags = array()
*
* @return \MailSo\Imap\Folder
*
* @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);
}

View file

@ -186,11 +186,25 @@ class ImapClient extends \MailSo\Net\NetClient
try
{
$this->SendRequestWithCheck('LOGIN',
array(
$this->EscapeString($sLogin),
$this->EscapeString($sPassword)
));
if ($this->IsSupported('AUTH=LOGIN') || !$this->IsSupported('AUTH=PLAIN'))
{
$this->SendRequestWithCheck('LOGIN',
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))
{

Some files were not shown because too many files have changed in this diff Show more