diff --git a/workflow/engine/classes/class.pmDynaform.php b/workflow/engine/classes/class.pmDynaform.php index b50accfd6..f8cc14557 100644 --- a/workflow/engine/classes/class.pmDynaform.php +++ b/workflow/engine/classes/class.pmDynaform.php @@ -68,8 +68,15 @@ class pmDynaform public function getCredentials() { + $flagTrackerUser = false; + if (!isset($_SESSION['USER_LOGGED'])) { - return; + if (!preg_match("/^.*\/" . SYS_SKIN . "\/tracker\/.*$/", $_SERVER["REQUEST_URI"])) { + return; + } + + $_SESSION["USER_LOGGED"] = "00000000000000000000000000000001"; + $flagTrackerUser = true; } if ($this->credentials != null) { return $this->credentials; @@ -84,6 +91,11 @@ class pmDynaform "clientId" => $a["client_id"], "clientSecret" => $a["client_secret"] ); + + if ($flagTrackerUser) { + unset($_SESSION["USER_LOGGED"]); + } + return $this->credentials; } @@ -163,7 +175,7 @@ class pmDynaform array_push($json->options, $option); } } catch (Exception $e) { - + } } if (isset($json->options[0])) { diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php index eab37c401..6102a6e9e 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php @@ -358,6 +358,7 @@ class Light case 'REPORT_TO': case 'BALANCED': case 'SELF_SERVICE': + $taskAss = array(); $taskAss['taskId'] = $aValues['NEXT_TASK']['TAS_UID']; $taskAss['taskName'] = $aValues['NEXT_TASK']['TAS_TITLE']; $taskAss['taskAssignType'] = $aValues['NEXT_TASK']['TAS_ASSIGN_TYPE']; @@ -371,6 +372,7 @@ class Light $response[] = $taskAss; break; case 'MANUAL': + $manual = array(); $manual['taskId'] = $aValues['NEXT_TASK']['TAS_UID']; $manual['taskName'] = $aValues['NEXT_TASK']['TAS_TITLE']; $manual['taskAssignType'] = $aValues['NEXT_TASK']['TAS_ASSIGN_TYPE'];