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

Merged in bugfix/HOR-4694 (pull request #6533)

Browse Source 
HOR-4694

Approved-by: Dante Loayza <dante.loayza@colosa.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Julio Cesar Laura Avendaño
2018-06-28 13:24:18 +00:00
parent a9cd348a28 b0dcc51fc2
commit 8d6850ab88
2 changed files with 6 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,6 +61,7 @@ class EmailEvent
$criteria->clearSelectColumns(); $criteria->clearSelectColumns();
$criteria->addSelectColumn(EmailServerPeer::MESS_UID); $criteria->addSelectColumn(EmailServerPeer::MESS_UID);
$criteria->addSelectColumn(EmailServerPeer::MESS_FROM_MAIL); $criteria->addSelectColumn(EmailServerPeer::MESS_FROM_MAIL);
$criteria->addSelectColumn(EmailServerPeer::MESS_FROM_NAME);
$criteria->addSelectColumn(EmailServerPeer::MESS_ACCOUNT); $criteria->addSelectColumn(EmailServerPeer::MESS_ACCOUNT);
$criteria->addSelectColumn(EmailServerPeer::MESS_ENGINE); $criteria->addSelectColumn(EmailServerPeer::MESS_ENGINE);
$criteria->addAsColumn('UID', 'MESS_UID'); $criteria->addAsColumn('UID', 'MESS_UID');
@@ -71,11 +72,6 @@ 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(
$row['MESS_ENGINE'],
$row['MESS_ACCOUNT'],
$row['MESS_FROM_MAIL']
);
$accounts[] = array_change_key_case($row, CASE_LOWER); $accounts[] = array_change_key_case($row, CASE_LOWER);
} }
} }
@@ -107,14 +103,13 @@ class EmailEvent
$row = $rsCriteria->getRow(); $row = $rsCriteria->getRow();
$emailServer = new EmailServer(); $emailServer = new EmailServer();
if ($row) { if ($row) {
$row['MESS_LABEL'] = ""; // We need to initialize these values in empty, in order to return always the same structure
$row['MESS_ENGINE'] = $row['MESS_ACCOUNT'] = $row['MESS_FROM_MAIL'] = '';
if (!empty($row['EMAIL_SERVER_UID'])) { if (!empty($row['EMAIL_SERVER_UID'])) {
$emailServerData = $emailServer->getEmailServer($row['EMAIL_SERVER_UID'], true); $emailServerData = $emailServer->getEmailServer($row['EMAIL_SERVER_UID'], true);
$row['MESS_LABEL'] = EmailServer::getMessLabel( $row['MESS_ENGINE'] = $emailServerData['MESS_ENGINE'];
$emailServerData['MESS_ENGINE'], $row['MESS_ACCOUNT'] = $emailServerData['MESS_ACCOUNT'];
$emailServerData['MESS_ACCOUNT'], $row['MESS_FROM_MAIL'] = $emailServerData['MESS_FROM_MAIL'];
$emailServerData['MESS_FROM_MAIL']
);
} }
$row = array_change_key_case($row, CASE_LOWER); $row = array_change_key_case($row, CASE_LOWER);
} }

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

@@ -1375,26 +1375,5 @@ class EmailServer
} }
} }
/**
* 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;
}
} }