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

Improvement in the construction of the parameter "From" for the emails

Browse Source
This commit is contained in:
Julio Cesar Laura
2012-09-26 19:12:15 -04:00
parent bde5482461
commit d09b6d73ef
4 changed files with 48 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gulliver/js/ext/pmos-common.js
View File

@@ -354,9 +354,23 @@ function _()
*/
function _FNF(USER_NAME, FIRST_NAME, LAST_NAME, FN_FORMAT)
{
if (USER_NAME == null) {
USER_NAME = '';
}
if (FIRST_NAME == null) {
FIRST_NAME = '';
}
if (LAST_NAME == null) {
LAST_NAME = '';
}
if (typeof FORMATS != 'undefined') {
if (USER_NAME != '' || FIRST_NAME != '' || LAST_NAME != '') {
FN_FORMAT = FORMATS.format;
}
else {
FN_FORMAT = '';
}
}
else {
FN_FORMAT = '(@lastName, @firstName) @userName';
}

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

@@ -4532,6 +4532,9 @@ class Cases
$sFrom = '"ProcessMaker"';
}
$hasEmailFrom = preg_match('/(.+)@(.+)\.(.+)/', $sFrom, $match);
if (!$hasEmailFrom || strpos($sFrom, $aConfiguration['MESS_ACCOUNT']) === false) {
if (($aConfiguration['MESS_ENGINE'] != 'MAIL') && ($aConfiguration['MESS_ACCOUNT'] != '')) {
$sFrom .= ' <' . $aConfiguration['MESS_ACCOUNT'] . '>';
} else {
@@ -4549,6 +4552,7 @@ class Cases
}
}
}
}
if (isset($aTaskInfo['TAS_DEF_SUBJECT_MESSAGE']) && $aTaskInfo['TAS_DEF_SUBJECT_MESSAGE'] != '') {
$sSubject = G::replaceDataField($aTaskInfo['TAS_DEF_SUBJECT_MESSAGE'], $aFields);

2
workflow/engine/classes/class.wsBase.php
View File

@@ -791,7 +791,7 @@ class wsBase
$sBody = G::replaceDataField( $templateContents, $Fields);
$hasEmailFrom = preg_match('/(.+)@(.+)\.(.+)/', $sFrom, $match);
if (!$hasEmailFrom || strtolower($sFrom) != strtolower($aSetup['MESS_ACCOUNT'])) {
if (!$hasEmailFrom || strpos($sFrom, $aSetup['MESS_ACCOUNT']) === false) {
$sFrom = '"' . stripslashes($sFrom) . '" <' . $aSetup['MESS_ACCOUNT'] . ">";
}

4
workflow/engine/classes/model/AppNotes.php
View File

@@ -182,6 +182,9 @@ class AppNotes extends BaseAppNotes {
$sFrom = '"ProcessMaker"';
}
$hasEmailFrom = preg_match('/(.+)@(.+)\.(.+)/', $sFrom, $match);
if (!$hasEmailFrom || strpos($sFrom, $aConfiguration['MESS_ACCOUNT']) === false) {
if (($aConfiguration['MESS_ENGINE'] != 'MAIL') && ($aConfiguration['MESS_ACCOUNT'] != '')) {
$sFrom .= ' <' . $aConfiguration['MESS_ACCOUNT'] . '>';
} else {
@@ -199,6 +202,7 @@ class AppNotes extends BaseAppNotes {
}
}
}
}
$sSubject = G::replaceDataField($configNoteNotification['subject'], $aFields);