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

Merged in bugfix/HOR-3618 (pull request #5849)

Browse Source 
HOR-3618

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
This commit is contained in:
Paula Quispe
2017-08-04 17:53:36 +00:00
parent 76f0a7ad42 6e13a722df
commit 980998681b
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@@ -59,6 +59,7 @@
"thirdparty/pear", "thirdparty/pear",
"thirdparty/html2ps_pdf", "thirdparty/html2ps_pdf",
"thirdparty/phing", "thirdparty/phing",
"thirdparty/phpmailer",
"rbac/engine/classes/" "rbac/engine/classes/"
], ],
"files": [ "files": [

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

@@ -84,8 +84,6 @@ class actionsByEmailCoreClass extends PMPlugin
$emailServer->getEmailServerDefault(); $emailServer->getEmailServerDefault();
if (!empty($emailSetup)) { if (!empty($emailSetup)) {
require_once 'classes/model/AbeConfiguration.php';
$cases = new Cases(); $cases = new Cases();
$caseFields = $cases->loadCase($data->APP_UID); $caseFields = $cases->loadCase($data->APP_UID);
$criteria = new Criteria(); $criteria = new Criteria();
@@ -113,8 +111,6 @@ class actionsByEmailCoreClass extends PMPlugin
if ($configuration['ABE_EMAIL_FIELD'] != '' && isset($caseFields['APP_DATA'][$configuration['ABE_EMAIL_FIELD']])) { if ($configuration['ABE_EMAIL_FIELD'] != '' && isset($caseFields['APP_DATA'][$configuration['ABE_EMAIL_FIELD']])) {
$email = trim($caseFields['APP_DATA'][$configuration['ABE_EMAIL_FIELD']]); $email = trim($caseFields['APP_DATA'][$configuration['ABE_EMAIL_FIELD']]);
} else { } else {
require_once 'classes/model/Users.php';
$userInstance = new Users(); $userInstance = new Users();
$userInfo = $userInstance->getAllInformation($data->USR_UID); $userInfo = $userInstance->getAllInformation($data->USR_UID);
$email = $userInfo['mail']; $email = $userInfo['mail'];
@@ -126,9 +122,6 @@ class actionsByEmailCoreClass extends PMPlugin
$subject = $caseFields['APP_TITLE']; $subject = $caseFields['APP_TITLE'];
} }
// Create
require_once 'classes/model/AbeRequests.php';
$abeRequest = array(); $abeRequest = array();
$abeRequest['ABE_REQ_UID'] = ''; $abeRequest['ABE_REQ_UID'] = '';
$abeRequest['ABE_UID'] = $configuration['ABE_UID']; $abeRequest['ABE_UID'] = $configuration['ABE_UID'];