diff --git a/workflow/engine/classes/class.pmFunctions.php b/workflow/engine/classes/class.pmFunctions.php index adf879124..55b1f3864 100755 --- a/workflow/engine/classes/class.pmFunctions.php +++ b/workflow/engine/classes/class.pmFunctions.php @@ -2281,6 +2281,16 @@ function PMFCancelCase ($caseUid, $delIndex, $userUid) $result = $ws->cancelCase( $caseUid, $delIndex, $userUid ); if ($result->status_code == 0) { + if (isset($_SESSION['APPLICATION']) && isset($_SESSION['INDEX'])) { + if ($_SESSION['APPLICATION'] == $caseUid && $_SESSION['INDEX'] == $delIndex) { + if (!defined('WEB_SERVICE_VERSION')) { + G::header('Location: ../cases/casesListExtJsRedirector'); + die(); + } else { + die(__('ID_PM_FUNCTION_CHANGE_CASE', SYS_LANG, array('PMFCancelCase', G::LoadTranslation('ID_CANCELLED')))); + } + } + } return 1; } else { return 0; @@ -2303,12 +2313,22 @@ function PMFCancelCase ($caseUid, $delIndex, $userUid) */ function PMFPauseCase ($caseUid, $delIndex, $userUid, $unpauseDate = null) { - G::LoadClass( "wsBase" ); + G::LoadClass('wsBase'); $ws = new wsBase(); - $result = $ws->pauseCase( $caseUid, $delIndex, $userUid, $unpauseDate ); + $result = $ws->pauseCase($caseUid, $delIndex, $userUid, $unpauseDate); if ($result->status_code == 0) { + if (isset($_SESSION['APPLICATION']) && isset($_SESSION['INDEX'])) { + if ($_SESSION['APPLICATION'] == $caseUid && $_SESSION['INDEX'] == $delIndex) { + if (!defined('WEB_SERVICE_VERSION')) { + G::header('Location: ../cases/casesListExtJsRedirector'); + die(); + } else { + die(__('ID_PM_FUNCTION_CHANGE_CASE', SYS_LANG, array('PMFPauseCase', G::LoadTranslation('ID_PAUSED')))); + } + } + } return 1; } else { return 0; diff --git a/workflow/engine/methods/cases/casesListExtJsRedirector.php b/workflow/engine/methods/cases/casesListExtJsRedirector.php index cc1fd2f64..3013d1233 100755 --- a/workflow/engine/methods/cases/casesListExtJsRedirector.php +++ b/workflow/engine/methods/cases/casesListExtJsRedirector.php @@ -23,6 +23,4 @@ if (isset( $_GET['ux'] )) { } ?> } - - \ No newline at end of file