Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-08 00:47:04 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update contacts schema

Browse source
This commit is contained in:
RainLoop Team 2013-11-28 20:03:56 +04:00
parent 98cc5c0fe6
commit b92f26e88b
3 changed files with 52 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

35
rainloop/v/0.0.0/app/libraries/RainLoop/Providers/PersonalAddressBook/Classes/Contact.php
View file

@ -13,16 +13,6 @@ class Contact
* @var int
*/
public $IdUser;
/**
* @var string
*/
public $DisplayName;
/**
* @var string
*/
public $DisplayEmail;
/**
* @var string
@ -39,6 +29,11 @@ class Contact
*/
public $IsShare;
/**
* @var bool
*/
public $CanBeChanged;
/**
* @var int
*/
@ -68,17 +63,16 @@ class Contact
{
$this->IdContact = 0;
$this->IdUser = 0;
$this->DisplayName = '';
$this->DisplayEmail = '';
$this->DisplayInList = '';
$this->IsAuto = false;
$this->IsShare = false;
$this->CanBeChanged = false;
$this->Changed = \time();
$this->Tags = array();
$this->Properties = array();
}
public function InitBeforeWrite()
public function UpdateDependentValues()
{
$sDisplayName = '';
$sDisplayEmail = '';
@ -87,24 +81,21 @@ class Contact
{
if ($oProperty)
{
$oProperty->InitBeforeWrite();
$oProperty->UpdateDependentValues();
if ('' === $sDisplayName && \RainLoop\Providers\PersonalAddressBook\Enumerations\PropertyType::FULLNAME === $oProperty->Type)
if ('' === $sDisplayName && \RainLoop\Providers\PersonalAddressBook\Enumerations\PropertyType::FULLNAME === $oProperty->Type &&
0 < \strlen($oProperty->Value))
{
$sDisplayName = $oProperty->Value;
}
if ('' === $sDisplayEmail && $oProperty->IsEmail())
else if ('' === $sDisplayEmail && $oProperty->IsEmail() &&
0 < \strlen($oProperty->Value))
{
$sDisplayEmail = $oProperty->Value;
}
}
}
$this->DisplayName = $sDisplayName;
$this->DisplayEmail = $sDisplayEmail;
$this->DisplayInList = 0 < \strlen($this->DisplayName) ? $this->DisplayName : (!empty($this->DisplayEmail) ? $this->DisplayEmail : '');
$this->Changed = \time();
$this->DisplayInList = 0 < \strlen($sDisplayName) ? $sDisplayName : (!empty($sDisplayEmail) ? $sDisplayEmail : '');
}
}

2
rainloop/v/0.0.0/app/libraries/RainLoop/Providers/PersonalAddressBook/Classes/Property.php
View file

@ -82,7 +82,7 @@ class Property
));
}
public function InitBeforeWrite()
public function UpdateDependentValues()
{
// trimer
$this->Value = \trim($this->Value);