fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HOR-4501

Browse Source
This commit is contained in:
Paula Quispe
2018-04-17 14:52:21 -04:00
parent 1c2c7d69cd
commit 6c215b9d22
2 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
workflow/engine/src/ProcessMaker/BusinessModel/EmailEvent.php
View File

@@ -71,14 +71,11 @@ class EmailEvent
$row = $result->getRow(); $row = $result->getRow();
if (!empty($row['MESS_UID'])) { if (!empty($row['MESS_UID'])) {
$row['EMAIL'] = $row['MESS_ACCOUNT']; $row['EMAIL'] = $row['MESS_ACCOUNT'];
$row['MESS_LABEL'] = EmailServer::getMessLabel(
if (empty($row['EMAIL']) && $row['MESS_ENGINE'] === 'MAIL') { $row['MESS_ENGINE'],
$row['MESS_ACCOUNT'] = $row['EMAIL'] = 'Mail (PHP)'; $row['MESS_ACCOUNT'],
} $row['MESS_FROM_MAIL']
$row['MESS_LABEL'] = $row['MESS_FROM_MAIL']; );
if (empty($row['MESS_FROM_MAIL'])) {
$row['MESS_LABEL'] = $row['MESS_ACCOUNT'];
}
$accounts[] = array_change_key_case($row, CASE_LOWER); $accounts[] = array_change_key_case($row, CASE_LOWER);
} }
} }
@@ -108,7 +105,14 @@ class EmailEvent
$rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$rsCriteria->next(); $rsCriteria->next();
$row = $rsCriteria->getRow(); $row = $rsCriteria->getRow();
$emailServer = new EmailServer();
if ($row) { if ($row) {
$emailServerData = $emailServer->getEmailServer($row['EMAIL_SERVER_UID'], true);
$row['MESS_LABEL'] = EmailServer::getMessLabel(
$emailServerData['MESS_ENGINE'],
$emailServerData['MESS_ACCOUNT'],
$emailServerData['MESS_FROM_MAIL']
);
$row = array_change_key_case($row, CASE_LOWER); $row = array_change_key_case($row, CASE_LOWER);
} }
return $row; return $row;

22
workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php
View File

@@ -1395,5 +1395,27 @@ class EmailServer
throw $e; throw $e;
} }
} }
/**
* Define the value for MESS_LABEL
*
* @param string $engine, can be PHPMAILER|MAIL
* @param string $senderAccount, related to the MESS_ACCOUNT
* @param string $senderEmail, related to the MESS_FROM_MAIL
*
* @return string
*/
public static function getMessLabel($engine = 'PHPMAILER', $senderAccount = '', $senderEmail = '')
{
$messLabel = $senderEmail;
if (empty($senderAccount) && $engine === 'MAIL') {
$senderAccount = 'Mail (PHP)';
}
if (empty($senderEmail)) {
$messLabel = $senderAccount;
}
return $messLabel;
}
} }