Small fixes

This commit is contained in:
RainLoop Team 2014-08-07 01:10:16 +04:00
parent 1027f319ed
commit 2d9ac0b53a
6 changed files with 28 additions and 22 deletions

View file

@ -29,7 +29,7 @@ MailBoxScreen.prototype.setNewTitle = function ()
sEmail = RL.data().accountEmail(), sEmail = RL.data().accountEmail(),
ifoldersInboxUnreadCount = RL.data().foldersInboxUnreadCount() ifoldersInboxUnreadCount = RL.data().foldersInboxUnreadCount()
; ;
RL.setTitle(('' === sEmail ? '' : RL.setTitle(('' === sEmail ? '' :
(0 < ifoldersInboxUnreadCount ? '(' + ifoldersInboxUnreadCount + ') ' : ' ') + sEmail + ' - ') + Utils.i18n('TITLES/MAILBOX')); (0 < ifoldersInboxUnreadCount ? '(' + ifoldersInboxUnreadCount + ') ' : ' ') + sEmail + ' - ') + Utils.i18n('TITLES/MAILBOX'));
}; };
@ -74,7 +74,6 @@ MailBoxScreen.prototype.onRoute = function (sFolderHash, iPage, sSearch, bPrevie
if (Enums.Layout.NoPreview === oData.layout() && oData.message()) if (Enums.Layout.NoPreview === oData.layout() && oData.message())
{ {
oData.message(null); oData.message(null);
oData.messageFullScreenMode(false);
} }
RL.reloadMessageList(); RL.reloadMessageList();
@ -120,7 +119,7 @@ MailBoxScreen.prototype.onStart = function ()
oData.layout.subscribe(function (nValue) { oData.layout.subscribe(function (nValue) {
$html.toggleClass('rl-no-preview-pane', Enums.Layout.NoPreview === nValue); $html.toggleClass('rl-no-preview-pane', Enums.Layout.NoPreview === nValue);
}); });
oData.foldersInboxUnreadCount.subscribe(function () { oData.foldersInboxUnreadCount.subscribe(function () {
this.setNewTitle(); this.setNewTitle();
}, this); }, this);

View file

@ -289,6 +289,7 @@ function WebMailDataStorage()
if (!oMessage) if (!oMessage)
{ {
this.message.focused(false); this.message.focused(false);
this.messageFullScreenMode(false);
this.hideMessageBodies(); this.hideMessageBodies();
if (Enums.Layout.NoPreview === RL.data().layout() && if (Enums.Layout.NoPreview === RL.data().layout() &&

View file

@ -55,7 +55,7 @@ class PoppassdClient extends \MailSo\Net\NetClient
parent::Connect($sServerName, $iPort, $iSecurityType); parent::Connect($sServerName, $iPort, $iSecurityType);
$this->validateResponse(); $this->validateResponse();
return $this; return $this;
} }
@ -118,7 +118,7 @@ class PoppassdClient extends \MailSo\Net\NetClient
/** /**
* @param string $sNewPassword * @param string $sNewPassword
* *
* @return \MailSo\Poppassd\PoppassdClient * @return \MailSo\Poppassd\PoppassdClient
* *
* @throws \MailSo\Net\Exceptions\Exception * @throws \MailSo\Net\Exceptions\Exception
@ -136,7 +136,7 @@ class PoppassdClient extends \MailSo\Net\NetClient
new \MailSo\Poppassd\Exceptions\RuntimeException('Required login'), new \MailSo\Poppassd\Exceptions\RuntimeException('Required login'),
\MailSo\Log\Enumerations\Type::ERROR, true); \MailSo\Log\Enumerations\Type::ERROR, true);
} }
return $this; return $this;
} }
@ -195,7 +195,7 @@ class PoppassdClient extends \MailSo\Net\NetClient
$this->iRequestTime = \microtime(true); $this->iRequestTime = \microtime(true);
$this->sendRaw($sRealCommand, true, $sFakeCommand); $this->sendRaw($sRealCommand, true, $sFakeCommand);
return $this; return $this;
} }
@ -222,7 +222,7 @@ class PoppassdClient extends \MailSo\Net\NetClient
* @param bool $bAuthRequestValidate = false * @param bool $bAuthRequestValidate = false
* *
* @return \MailSo\Poppassd\PoppassdClient * @return \MailSo\Poppassd\PoppassdClient
* *
* @throws \MailSo\Net\Exceptions\Exception * @throws \MailSo\Net\Exceptions\Exception
* @throws \MailSo\Poppassd\Exceptions\ResponseException * @throws \MailSo\Poppassd\Exceptions\ResponseException
*/ */
@ -237,7 +237,13 @@ class PoppassdClient extends \MailSo\Net\NetClient
} }
else else
{ {
$bResult = (bool) \preg_match('/^2\d\d/', trim($this->sResponseBuffer)); $bResult = (bool) \preg_match('/^2\d\d/', \trim($this->sResponseBuffer));
}
if (!$bResult)
{
// POP3 validation hack
$bResult = '+OK ' === \substr(\trim($this->sResponseBuffer), 0, 4);
} }
if (!$bResult) if (!$bResult)
@ -263,7 +269,7 @@ class PoppassdClient extends \MailSo\Net\NetClient
/** /**
* @param \MailSo\Log\Logger $oLogger * @param \MailSo\Log\Logger $oLogger
* *
* @return \MailSo\Poppassd\PoppassdClient * @return \MailSo\Poppassd\PoppassdClient
* *
* @throws \MailSo\Base\Exceptions\InvalidArgumentException * @throws \MailSo\Base\Exceptions\InvalidArgumentException

View file

@ -557,7 +557,7 @@ COULD_NOT_SAVE_NEW_PASSWORD = "Impossibile salvare la nuova password"
CURRENT_PASSWORD_INCORRECT = "La password attuale è scorretta" CURRENT_PASSWORD_INCORRECT = "La password attuale è scorretta"
NEW_PASSWORD_SHORT = "La password è troppo corta" NEW_PASSWORD_SHORT = "La password è troppo corta"
NEW_PASSWORD_WEAK = "La password è troppo facile" NEW_PASSWORD_WEAK = "La password è troppo facile"
NEW_PASSWORD_FORBIDDENT = "La password contiene cavalli proibiti" NEW_PASSWORD_FORBIDDENT = "La password contiene caratteri proibiti"
CONTACTS_SYNC_ERROR = "Errore durante la sincronizzazione dei contatti" CONTACTS_SYNC_ERROR = "Errore durante la sincronizzazione dei contatti"
CANT_GET_MESSAGE_LIST = "Impossibile ottenere la lista dei messaggi" CANT_GET_MESSAGE_LIST = "Impossibile ottenere la lista dei messaggi"
CANT_GET_MESSAGE = "Impossibile ottenere il messaggio" CANT_GET_MESSAGE = "Impossibile ottenere il messaggio"
@ -584,7 +584,7 @@ LICENSING_DOMAIN_EXPIRED = "La licenza per questo dominio è scaduta"
LICENSING_DOMAIN_BANNED = "Questo dominio è stato bannato" LICENSING_DOMAIN_BANNED = "Questo dominio è stato bannato"
DEMO_SEND_MESSAGE_ERROR = "Per ragioni di sicurezza, questa demo non è abilitata ad inviare email ad inidirizzi esterni" DEMO_SEND_MESSAGE_ERROR = "Per ragioni di sicurezza, questa demo non è abilitata ad inviare email ad inidirizzi esterni"
ACCOUNT_ALREADY_EXISTS = "L'account esiste già" ACCOUNT_ALREADY_EXISTS = "L'account esiste già"
MAIL_SERVER_ERROR = "È successo un errore nel server mail" MAIL_SERVER_ERROR = "Si è verificato un errore nel server mail"
INVALID_INPUT_ARGUMENT = "Invalid input argument" INVALID_INPUT_ARGUMENT = "Invalid input argument"
UNKNOWN_ERROR = "Errore sconosciuto" UNKNOWN_ERROR = "Errore sconosciuto"

View file

@ -16764,6 +16764,7 @@ function WebMailDataStorage()
if (!oMessage) if (!oMessage)
{ {
this.message.focused(false); this.message.focused(false);
this.messageFullScreenMode(false);
this.hideMessageBodies(); this.hideMessageBodies();
if (Enums.Layout.NoPreview === RL.data().layout() && if (Enums.Layout.NoPreview === RL.data().layout() &&
@ -19427,7 +19428,7 @@ MailBoxScreen.prototype.setNewTitle = function ()
sEmail = RL.data().accountEmail(), sEmail = RL.data().accountEmail(),
ifoldersInboxUnreadCount = RL.data().foldersInboxUnreadCount() ifoldersInboxUnreadCount = RL.data().foldersInboxUnreadCount()
; ;
RL.setTitle(('' === sEmail ? '' : RL.setTitle(('' === sEmail ? '' :
(0 < ifoldersInboxUnreadCount ? '(' + ifoldersInboxUnreadCount + ') ' : ' ') + sEmail + ' - ') + Utils.i18n('TITLES/MAILBOX')); (0 < ifoldersInboxUnreadCount ? '(' + ifoldersInboxUnreadCount + ') ' : ' ') + sEmail + ' - ') + Utils.i18n('TITLES/MAILBOX'));
}; };
@ -19472,7 +19473,6 @@ MailBoxScreen.prototype.onRoute = function (sFolderHash, iPage, sSearch, bPrevie
if (Enums.Layout.NoPreview === oData.layout() && oData.message()) if (Enums.Layout.NoPreview === oData.layout() && oData.message())
{ {
oData.message(null); oData.message(null);
oData.messageFullScreenMode(false);
} }
RL.reloadMessageList(); RL.reloadMessageList();
@ -19518,7 +19518,7 @@ MailBoxScreen.prototype.onStart = function ()
oData.layout.subscribe(function (nValue) { oData.layout.subscribe(function (nValue) {
$html.toggleClass('rl-no-preview-pane', Enums.Layout.NoPreview === nValue); $html.toggleClass('rl-no-preview-pane', Enums.Layout.NoPreview === nValue);
}); });
oData.foldersInboxUnreadCount.subscribe(function () { oData.foldersInboxUnreadCount.subscribe(function () {
this.setNewTitle(); this.setNewTitle();
}, this); }, this);

File diff suppressed because one or more lines are too long