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

Small refactoring: Identity

Browse source
This commit is contained in:
RainLoop Team 2015-10-29 23:47:23 +03:00
parent e3b62d24d8
commit 2ab17f8eff
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dev/Model/Identity.js
View file

@ -19,7 +19,7 @@
{ {
AbstractModel.call(this, 'IdentityModel'); AbstractModel.call(this, 'IdentityModel');
this.id = ko.observable(sId); this.id = ko.observable(sId || '');
this.email = ko.observable(sEmail); this.email = ko.observable(sEmail);
this.name = ko.observable(''); this.name = ko.observable('');

2
dev/View/Popup/Identity.js
View file

@ -170,7 +170,7 @@
{ {
this.edit(true); this.edit(true);
this.id = oIdentity.id(); this.id = oIdentity.id() || '';
this.name(oIdentity.name()); this.name(oIdentity.name());
this.email(oIdentity.email()); this.email(oIdentity.email());
this.replyTo(oIdentity.replyTo()); this.replyTo(oIdentity.replyTo());

8
rainloop/v/0.0.0/app/libraries/RainLoop/Model/Identity.php
View file

@ -47,8 +47,8 @@ class Identity
*/ */
protected function __construct($sId = '', $sEmail = '') protected function __construct($sId = '', $sEmail = '')
{ {
$this->sId = $sId; $this->sId = empty($sId) ? '' : $sId;
$this->sEmail = $sEmail; $this->sEmail = empty($sEmail) ? '' : $sEmail;
$this->sName = ''; $this->sName = '';
$this->sReplyTo = ''; $this->sReplyTo = '';
$this->sBcc = ''; $this->sBcc = '';
@ -152,9 +152,9 @@ class Identity
*/ */
public function FromJSON($aData, $bAjax = false) public function FromJSON($aData, $bAjax = false)
{ {
if (isset($aData['Id'], $aData['Email']) && !empty($aData['Email'])) if (!empty($aData['Email']))
{ {
$this->sId = $aData['Id']; $this->sId = !empty($aData['Id']) ? $aData['Id'] : '';
$this->sEmail = $bAjax ? \MailSo\Base\Utils::IdnToAscii($aData['Email'], true) : $aData['Email']; $this->sEmail = $bAjax ? \MailSo\Base\Utils::IdnToAscii($aData['Email'], true) : $aData['Email'];
$this->sName = isset($aData['Name']) ? $aData['Name'] : ''; $this->sName = isset($aData['Name']) ? $aData['Name'] : '';
$this->sReplyTo = !empty($aData['ReplyTo']) ? $aData['ReplyTo'] : ''; $this->sReplyTo = !empty($aData['ReplyTo']) ? $aData['ReplyTo'] : '';