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

BY-195 Agregando validacion para obtener los datos del proceso hijo al enviar el mail

Browse Source 
BY-195 Agregando validacion para obtener los datos del proceso hijo al enviar el mail

BY-195 Agregando validacion para obtener los datos del proceso hijo al enviar el mail

BY-195 Agregando validacion para obtener los datos del proceso hijo al enviar el mail

Adding validation to get the data of the last task in the parent subprocess when the thread is going back from the son threat.

Fixing merge conflicts
This commit is contained in:
Jenny Murillo
2016-03-11 19:05:40 -04:00
parent 1e5924249c
commit 5e93d7481c
8 changed files with 171 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/public_html/pmGmail/sso.php
View File

@@ -30,8 +30,8 @@ if(curl_exec($gCurl) === false){
} else {
$gCurl_response = curl_exec($gCurl);
curl_close($gCurl);
$gResp = json_decode($gCurl_response);
if ($gResp == false) {
$gResp = G::json_decode($gCurl_response);
if ($gResp === false) {
echo Bootstrap::LoadTranslation('ID_NO_LICENSE_FEATURE_ENABLED');
die;
}
@@ -47,7 +47,7 @@ curl_setopt( $curl, CURLOPT_CONNECTTIMEOUT, 0);
$curl_response = curl_exec( $curl );
curl_close($curl);
$decodedResp = json_decode($curl_response);
$decodedResp = G::json_decode($curl_response);
if(!is_object($decodedResp) || property_exists($decodedResp,'error')) {
die($decodedResp->error->message);
@@ -81,7 +81,7 @@ if( !isset($_SESSION['USER_LOGGED']) || $_SESSION['USER_LOGGED'] != $decodedResp
curl_setopt_array($ch, $optArray);
// execute request and get response
$result = curl_exec($ch);
$response = (json_decode($result));
$response = (G::json_decode($result));
curl_close($ch);
//First validate if this user (mail) corresponds to a PM user