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

Merged in paulis/processmaker/HOR-871 (pull request #4156)

Browse Source 
HOR-871
This commit is contained in:
Julio Cesar Laura Avendaño
2016-04-26 17:34:13 -04:00
parent 0e653f7c1e f592fa001b
commit 4cc8a1e92a
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,19 +45,24 @@ class actionsByEmailCoreClass extends PMPlugin
throw new Exception('The parameter $data->USR_UID is null.'); throw new Exception('The parameter $data->USR_UID is null.');
} }
if ($data->TAS_UID == '') { if ($data->TAS_UID === '') {
throw new Exception('The parameter $data->TAS_UID is empty.'); throw new Exception('The parameter $data->TAS_UID is empty.');
} }
if ($data->APP_UID == '') { if ($data->APP_UID === '') {
throw new Exception('The parameter $data->APP_UID is empty.'); throw new Exception('The parameter $data->APP_UID is empty.');
} }
if ($data->DEL_INDEX == '') { if ($data->DEL_INDEX === '') {
throw new Exception('The parameter $data->DEL_INDEX is empty.'); throw new Exception('The parameter $data->DEL_INDEX is empty.');
} }
if ($data->USR_UID == '') { if ($data->DEL_INDEX === 1) {
error_log('The parameter $data->DEL_INDEX is 1, you can not use ActionsByEmail in the initial task', 0);
return;
}
if ($data->USR_UID === '') {
error_log('The parameter $data->USR_UID is empty, the routed task may be a self-service type, actions by email does not work with self-service task types.', 0); error_log('The parameter $data->USR_UID is empty, the routed task may be a self-service type, actions by email does not work with self-service task types.', 0);
} }
} catch(Exception $e) { } catch(Exception $e) {

5
workflow/engine/classes/class.pmDynaform.php
View File

@@ -27,7 +27,7 @@ class pmDynaform
$this->getDynaforms(); $this->getDynaforms();
$this->synchronizeSubDynaform(); $this->synchronizeSubDynaform();
$this->getCredentials(); $this->getCredentials();
if (!isset($this->fields["APP_UID"])) { if (is_array($this->fields) && !isset($this->fields["APP_UID"])) {
$this->fields["APP_UID"] = null; $this->fields["APP_UID"] = null;
} }
if (isset($this->fields["APP_DATA"]["DYN_CONTENT_HISTORY"])) { if (isset($this->fields["APP_DATA"]["DYN_CONTENT_HISTORY"])) {
@@ -148,6 +148,9 @@ class pmDynaform
public function jsonr(&$json) public function jsonr(&$json)
{ {
if(empty($json)){
return;
}
foreach ($json as $key => &$value) { foreach ($json as $key => &$value) {
$sw1 = is_array($value); $sw1 = is_array($value);
$sw2 = is_object($value); $sw2 = is_object($value);