Merged in mcuiza/processmaker/HOR-1378 (pull request #4498)

HOR-1378

workflow/engine/methods/cases/ajaxListener.php

@@ -34,6 +34,15 @@
 //require_once 'classes/model/Process.php';
 //require_once 'classes/model/Task.php';
 
+if (!isset($_SESSION['USER_LOGGED'])) {
+    $responseObject = new stdclass();
+    $responseObject->error = G::LoadTranslation('ID_LOGIN_AGAIN');
+    $responseObject->success = true;
+    $responseObject->lostSession = true;
+    print G::json_encode( $responseObject );
+    die();
+}
+
 G::LoadSystem('inputfilter');
 $filter = new InputFilter();
 $_REQUEST = $filter->xssFilterHard($_REQUEST);

workflow/engine/methods/cases/casesStreamingFile.php

@@ -1,5 +1,12 @@
 <?php
-
+if (!isset($_SESSION['USER_LOGGED'])) {
+    $responseObject = new stdclass();
+    $responseObject->error = G::LoadTranslation('ID_LOGIN_AGAIN');
+    $responseObject->success = true;
+    $responseObject->lostSession = true;
+    print G::json_encode( $responseObject );
+    die();
+}
 
 $actionAjax = isset( $_REQUEST['actionAjax'] ) ? $_REQUEST['actionAjax'] : null;
 

workflow/engine/methods/cases/cases_CatchExecute.php

@@ -22,18 +22,12 @@
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
 if (!isset($_SESSION['USER_LOGGED'])) {
-    G::SendTemporalMessage( 'ID_LOGIN_AGAIN', 'warning', 'labels' );
+    $responseObject = new stdclass();
-    die( '<script type="text/javascript">
+    $responseObject->error = G::LoadTranslation('ID_LOGIN_AGAIN');
-              try 
+    $responseObject->success = true;
-                 {
+    $responseObject->lostSession = true;
-                   prnt = parent.parent;
+    print G::json_encode( $responseObject );
-                   top.location = top.location;
+    die();
-                 }
-              catch (err) 
-                 {
-                   parent.location = parent.location;
-                 }
-          </script>');
 }
 /* Permissions */
 switch ($RBAC->userCanAccess( 'PM_CASES' )) {

workflow/engine/methods/cases/cases_SaveData.php

@@ -23,8 +23,16 @@
  */
 //validate the data post
 if (!isset($_SESSION['USER_LOGGED'])) {
-    G::SendTemporalMessage( 'ID_LOGIN_AGAIN', 'warning', 'labels' );
+    if(!strpos($_SERVER['REQUEST_URI'], 'gmail')) {
-    die( '<script type="text/javascript">
+        $responseObject = new stdclass();
+        $responseObject->error = G::LoadTranslation('ID_LOGIN_AGAIN');
+        $responseObject->success = true;
+        $responseObject->lostSession = true;
+        print G::json_encode( $responseObject );
+        die();
+    } else {
+        G::SendTemporalMessage('ID_LOGIN_AGAIN', 'warning', 'labels');
+        die('<script type="text/javascript">
                     try
                       {
     					var olink = document.location.href;
@@ -58,6 +66,7 @@ if (!isset($_SESSION['USER_LOGGED'])) {
                         parent.location = parent.location;
                       }
                     </script>');
+    }
 }
 
 /**

workflow/engine/methods/cases/cases_Step.php

@@ -1,7 +1,15 @@
 <?php
 if (!isset($_SESSION['USER_LOGGED'])) {
-	G::SendTemporalMessage( 'ID_LOGIN_AGAIN', 'warning', 'labels' );
+    if(!strpos($_SERVER['REQUEST_URI'], 'gmail')) {
-	die( '<script type="text/javascript">
+        $responseObject = new stdclass();
+        $responseObject->error = G::LoadTranslation('ID_LOGIN_AGAIN');
+        $responseObject->success = true;
+        $responseObject->lostSession = true;
+        print G::json_encode( $responseObject );
+        die();
+    } else {
+        G::SendTemporalMessage( 'ID_LOGIN_AGAIN', 'warning', 'labels' );
+        die( '<script type="text/javascript">
 				try
 				{
 				var olink = document.location.href;
@@ -36,6 +44,7 @@ if (!isset($_SESSION['USER_LOGGED'])) {
 				parent.location = parent.location;
 			}
 		</script>');
+    }
 }
 
 require_once 'classes/model/AppDelegation.php';

workflow/engine/methods/cases/proxyCasesList.php

@@ -1,10 +1,4 @@
 <?php
-G::LoadSystem('inputfilter');
-$filter = new InputFilter();
-$_GET = $filter->xssFilterHard($_GET);
-$_REQUEST = $filter->xssFilterHard($_REQUEST);
-$_SESSION['USER_LOGGED'] = $filter->xssFilterHard($_SESSION['USER_LOGGED']);
-
 if (!isset($_SESSION['USER_LOGGED'])) {
     $responseObject = new stdclass();
     $responseObject->error = G::LoadTranslation('ID_LOGIN_AGAIN');
@@ -14,6 +8,12 @@ if (!isset($_SESSION['USER_LOGGED'])) {
     die();
 }
 
+G::LoadSystem('inputfilter');
+$filter = new InputFilter();
+$_GET = $filter->xssFilterHard($_GET);
+$_REQUEST = $filter->xssFilterHard($_REQUEST);
+$_SESSION['USER_LOGGED'] = $filter->xssFilterHard($_SESSION['USER_LOGGED']);
+
 //Getting the extJs parameters
 $callback = isset( $_REQUEST["callback"] ) ? $_REQUEST["callback"] : "stcCallback1001";
 $dir = isset( $_REQUEST["dir"] ) ? $_REQUEST["dir"] : "DESC";

workflow/engine/methods/cases/proxyNewCasesList.php

@@ -1,10 +1,4 @@
 <?php
-G::LoadSystem('inputfilter');
-$filter = new InputFilter();
-$_GET = $filter->xssFilterHard($_GET);
-$_REQUEST = $filter->xssFilterHard($_REQUEST);
-$_SESSION['USER_LOGGED'] = $filter->xssFilterHard($_SESSION['USER_LOGGED']);
-
 if (!isset($_SESSION['USER_LOGGED'])) {
     $responseObject = new stdclass();
     $responseObject->error = G::LoadTranslation('ID_LOGIN_AGAIN');
@@ -14,6 +8,12 @@ if (!isset($_SESSION['USER_LOGGED'])) {
     die();
 }
 
+G::LoadSystem('inputfilter');
+$filter = new InputFilter();
+$_GET = $filter->xssFilterHard($_GET);
+$_REQUEST = $filter->xssFilterHard($_REQUEST);
+$_SESSION['USER_LOGGED'] = $filter->xssFilterHard($_SESSION['USER_LOGGED']);
+
 try {
     $userUid = $_SESSION['USER_LOGGED'];
     $filters['paged']    = isset( $_REQUEST["paged"] ) ? $filter->sanitizeInputValue($_REQUEST["paged"], 'nosql') : true;