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

HOR-1336

Browse Source
This commit is contained in:
Paula V. Quispe
2016-07-11 15:58:34 -04:00
parent 0759ecb44b
commit fe6965bf39
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
workflow/engine/classes/class.actionsByEmailCore.php
View File

@@ -143,11 +143,6 @@ class actionsByEmailCoreClass extends PMPlugin
$_SESSION['CURRENT_DYN_UID'] = $configuration['DYN_UID']; $_SESSION['CURRENT_DYN_UID'] = $configuration['DYN_UID'];
$scriptCode = ''; $scriptCode = '';
// foreach ($dynaform->fields as $fieldName => $field) {
// if ($field->type == 'submit') {
// unset($dynaform->fields[$fieldName]);
// }
// }
$__ABE__ = ''; $__ABE__ = '';
$link = (G::is_https() ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . '/sys' . SYS_SYS . '/' . SYS_LANG . '/' . SYS_SKIN . '/services/ActionsByEmail'; $link = (G::is_https() ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . '/sys' . SYS_SYS . '/' . SYS_LANG . '/' . SYS_SKIN . '/services/ActionsByEmail';
@@ -266,10 +261,16 @@ class actionsByEmailCoreClass extends PMPlugin
G::LoadClass("Users"); G::LoadClass("Users");
$user = new Users(); $user = new Users();
$userDetails = $user->loadDetails($data->PREVIOUS_USR_UID);
if($configuration['ABE_MAILSERVER_OR_MAILCURRENT'] == 1 && $configuration['ABE_TYPE'] !== ''){ if($configuration['ABE_MAILSERVER_OR_MAILCURRENT'] == 1 && $configuration['ABE_TYPE'] !== ''){
$emailFrom = ($userDetails["USR_FULLNAME"] . ' <' . $userDetails["USR_EMAIL"] . '>'); if($data->PREVIOUS_USR_UID!==''){
$userDetails = $user->loadDetails($data->PREVIOUS_USR_UID);
$emailFrom = ($userDetails["USR_FULLNAME"] . ' <' . $userDetails["USR_EMAIL"] . '>');
} else {
global $RBAC;
$currentUser = $RBAC->aUserInfo['USER_INFO'];
$emailFrom = ($currentUser["USR_FIRSTNAME"] .' '. $currentUser["USR_LASTNAME"] .' <' . $currentUser["USR_EMAIL"] . '>');
}
}else{ }else{
if(isset($emailSetup["MESS_FROM_NAME"]) && isset($emailSetup["MESS_FROM_MAIL"] )){ if(isset($emailSetup["MESS_FROM_NAME"]) && isset($emailSetup["MESS_FROM_MAIL"] )){
$emailFrom = ($emailSetup["MESS_FROM_NAME"] . ' <' . $emailSetup["MESS_FROM_MAIL"] . '>'); $emailFrom = ($emailSetup["MESS_FROM_NAME"] . ' <' . $emailSetup["MESS_FROM_MAIL"] . '>');