fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in jennydmz/processmaker/3.0.1.6-Gmail (pull request #3191)

Browse Source 
Validating Session gmail key ang request gmail key.
This commit is contained in:
Dante Loayza
2015-11-20 16:07:29 -04:00
parent cddb0a072c e707052eca
commit 28b4f14e1d
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/classes/class.case.php
View File

@@ -2257,7 +2257,7 @@ class Cases
$sAction = '';
break;
}
if($_SESSION['gmail'] || ($_GET['gmail'] && $_GET['gmail'] == 1)){
if(array_key_exists('gmail',$_SESSION) || (array_key_exists('gmail',$_GET) && $_GET['gmail'] == 1)){
$aNextStep = array(
'TYPE' => $oStep->getStepTypeObj(),
'UID' => $oStep->getStepUidObj(),
@@ -2284,7 +2284,7 @@ class Cases
}
}
if (!$aNextStep) {
if($_SESSION['gmail'] || ($_GET['gmail'] && $_GET['gmail'] == 1)){
if(array_key_exists('gmail',$_SESSION) || (array_key_exists('gmail',$_GET) && $_GET['gmail'] == 1)){
$aNextStep = array(
'TYPE' => 'DERIVATION',
'UID' => -1,

2
workflow/engine/methods/cases/cases_CatchExecute.php
View File

@@ -68,7 +68,7 @@ $aDelegation = $oAppDelegation->load( $sAppUid, $iDelIndex );
if ($aDelegation['USR_UID'] == "") {
$oCase->setCatchUser( $_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['USER_LOGGED'] );
//changing email labels if the claim comes from gmail
if($_SESSION['gmail'] == 1){
if(array_key_exists('gmail',$_SESSION) && $_SESSION['gmail'] == 1){
require_once (PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "class.labelsGmail.php");
$labGmail = new labelsGmail();
$oResponse = $labGmail->setLabels($sAppUid, $iDelIndex, -1, true);

6
workflow/engine/methods/cases/cases_Step.php
View File

@@ -38,7 +38,7 @@ if (!isset($_SESSION['USER_LOGGED'])) {
require_once 'classes/model/AppDelegation.php';
$delegation = new AppDelegation();
if( $delegation->alreadyRouted($_SESSION['APPLICATION'],$_SESSION['INDEX']) ) {
if($_SESSION['gmail'] == 1){
if(array_key_exists('gmail',$_SESSION) && $_SESSION['gmail'] == 1){
$mUrl = '../cases/cases_Open?APP_UID='.$_SESSION['APPLICATION'].'&DEL_INDEX='.$_SESSION['INDEX'].'&action=sent';
header( 'location:' . $mUrl );
die();
@@ -83,7 +83,7 @@ switch ($RBAC->userCanAccess( 'PM_CASES' )) {
break;
}
if($_GET['gmail'] && $_GET['gmail'] == 1){
if(array_key_exists('gmail',$_GET) && $_GET['gmail'] == 1){
$_SESSION['gmail'] = 1;
}
@@ -313,7 +313,7 @@ try {
if ($a->isResponsive()) {
$a->printEdit();
} else {
if($_GET['gmail'] && $_GET['gmail'] == 1){
if(array_key_exists('gmail',$_GET) && $_GET['gmail'] == 1){
$G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_GET['UID'], '', $Fields['APP_DATA'], 'cases_SaveData?UID=' . $_GET['UID'] . '&APP_UID=' . $_SESSION['APPLICATION'] . '&gmail=1', '', (strtolower($oStep->getStepMode()) != 'edit' ? strtolower($oStep->getStepMode()) : ''));
}else{
$G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_GET['UID'], '', $Fields['APP_DATA'], 'cases_SaveData?UID=' . $_GET['UID'] . '&APP_UID=' . $_SESSION['APPLICATION'], '', (strtolower($oStep->getStepMode()) != 'edit' ? strtolower($oStep->getStepMode()) : ''));