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

HOR-2155-E "Send notification in run..."

Browse Source 
HOR-2155-E "Send notification in run..."
This commit is contained in:
Luis Fernando Saisa Lopez
2016-11-16 09:47:48 -05:00
parent 7403f59885
commit fdc173f704
4 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
workflow/engine/classes/class.case.php
View File

@@ -5198,13 +5198,6 @@ class Cases
if (!class_exists('System')) {
G::LoadClass('system');
}
$aConfiguration = System::getEmailConfiguration();
$msgError = "";
if (!isset($aConfiguration['MESS_ENABLED']) || $aConfiguration['MESS_ENABLED'] != '1') {
$msgError = "The default configuration wasn't defined";
$aConfiguration['MESS_ENGINE'] = '';
}
//Send derivation notification - Start
$oTask = new Task();
@@ -5214,6 +5207,31 @@ class Cases
return false;
}
$emailServer = new \ProcessMaker\BusinessModel\EmailServer();
$emailServerUid = $aTaskInfo['TAS_EMAIL_SERVER_UID'];
if ($emailServerUid != '') {
$aConfiguration = $emailServer->getEmailServer($emailServerUid, true);
$aConfiguration['SMTPSecure'] = $aConfiguration['SMTPSECURE'];
} else {
$aConfiguration = $emailServer->getEmailServerDefault();
$aConfiguration['SMTPSecure'] = $aConfiguration['SMTPSECURE'];
}
$msgError = '';
if (empty($aConfiguration)) {
$msgError = G::LoadTranslation('ID_THE_DEFAULT_CONFIGURATION');
}
if ($aTaskInfo['TAS_NOT_EMAIL_FROM_FORMAT']) {
$fromName = $aConfiguration['MESS_FROM_NAME'];
$fromMail = $aConfiguration['MESS_FROM_MAIL'];
$from = $fromName . (($fromMail != '')? ' <' . $fromMail . '>' : '');
}
$from = G::buildFrom($aConfiguration, $from);
if (isset($aTaskInfo['TAS_DEF_SUBJECT_MESSAGE']) && $aTaskInfo['TAS_DEF_SUBJECT_MESSAGE'] != '') {