viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-28 23:16:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

email from name caching

Browse Source
This commit is contained in:
yuri
2019-05-03 16:36:13 +03:00
parent 7f82fab69b
commit 46a985076e
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
application/Espo/Services/Email.php
View File

@@ -82,6 +82,8 @@ class Email extends Record
'hasAttachment'
];
private $fromEmailAddressNameCache = [];
protected function getFileManager()
{
return $this->getInjection('fileManager');
@@ -720,17 +722,25 @@ class Email extends Record
} else {
$fromEmailAddressId = $entity->get('fromEmailAddressId');
if (!empty($fromEmailAddressId)) {
$person = $this->getEntityManager()->getRepository('EmailAddress')->getEntityByAddressId($fromEmailAddressId, null, true);
if ($person) {
$entity->set('personStringData', $person->get('name'));
} else {
$fromName = $entity->get('fromName');
if (!empty($fromName)) {
$entity->set('personStringData', $fromName);
if (!array_key_exists($fromEmailAddressId, $this->fromEmailAddressNameCache)) {
$person = $this->getEntityManager()->getRepository('EmailAddress')->getEntityByAddressId($fromEmailAddressId, null, true);
if ($person) {
$fromName = $person->get('name');
} else {
$entity->set('personStringData', $entity->get('fromEmailAddressName'));
$fromName = null;
}
$this->fromEmailAddressNameCache[$fromEmailAddressId] = $fromName;
}
$fromName = $this->fromEmailAddressNameCache[$fromEmailAddressId];
if (!$fromName) {
$fromName = $entity->get('fromName');
if (!$fromName) {
$fromName = $entity->get('fromEmailAddressName');
}
}
$entity->set('personStringData', $fromName);
}
}
}