A lot small fixes

This commit is contained in:
RainLoop Team 2015-06-04 22:02:31 +04:00
parent 4457cdbc23
commit 09334159c2
38 changed files with 1496 additions and 239 deletions

View file

@ -26,6 +26,11 @@ class Property
*/
public $Value;
/**
* @var string
*/
public $ValueLower;
/**
* @var string
*/
@ -54,6 +59,7 @@ class Property
$this->TypeStr = '';
$this->Value = '';
$this->ValueLower = '';
$this->ValueCustom = '';
$this->Frec = 0;
@ -120,6 +126,7 @@ class Property
$this->Value = \trim($this->Value);
$this->ValueCustom = \trim($this->ValueCustom);
$this->TypeStr = \trim($this->TypeStr);
$this->ValueLower = '';
if (0 < \strlen($this->Value))
{
@ -131,16 +138,22 @@ class Property
if ($this->IsName())
{
$this->Value = \preg_replace('/[\s]+/u', ' ', $this->Value);
$this->Value = \MailSo\Base\Utils::StripSpaces($this->Value);
}
// phones clear value for searching
// lower value for searching
if (\MailSo\Base\Utils::FunctionExistsAndEnabled('mb_strtolower'))
{
$this->ValueLower = (string) @\mb_strtolower($this->Value, 'UTF-8');
}
// phone value for searching
if ($this->IsPhone())
{
$sPhone = $this->Value;
$sPhone = \trim($this->Value);
$sPhone = \preg_replace('/^[+]+/', '', $sPhone);
$sPhone = \preg_replace('/[^\d]/', '', $sPhone);
$this->ValueCustom = $sPhone;
$this->ValueCustom = \trim($sPhone);
}
}
}