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

Merged in release/3.2 (pull request #5477)

Browse Source 
Release/3.2

Approved-by: Paula Quispe
This commit is contained in:
Paula Quispe
2017-03-01 14:38:47 +00:00
parent 61c960e11f 73b9b8a6fe
commit e2d9a4d7c9
27 changed files with 254 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
workflow/engine/methods/cases/main_init.php
View File

@@ -69,7 +69,6 @@ if (isset($_SESSION['__OPEN_APPLICATION_UID__'])) {
$confDefaultOption = 'CASES_SEARCH';
$action = 'search';
$arrayResult = $case->getStatusInfo($_SESSION['__OPEN_APPLICATION_UID__'], 0, $_SESSION['USER_LOGGED']);
$arrayDelIndex = [];
@@ -89,9 +88,21 @@ if (isset($_SESSION['__OPEN_APPLICATION_UID__'])) {
$arrayDelIndex = $arrayResult['DEL_INDEX'];
} else {
$arrayResult = $case->getStatusInfo($_SESSION['__OPEN_APPLICATION_UID__']);
$arrayDelIndex = $arrayResult['DEL_INDEX'];
$arrayResultData = $case->getStatusInfo($_SESSION['__OPEN_APPLICATION_UID__']);
$supervisor = new \ProcessMaker\BusinessModel\ProcessSupervisor();
$isSupervisor = $supervisor->isUserProcessSupervisor($arrayResultData['PRO_UID'], $_SESSION['USER_LOGGED']);
if ($isSupervisor) {
$arrayResult = $arrayResultData;
$arrayDelIndex = $arrayResultData['DEL_INDEX'];
} else {
$_SESSION['PROCESS'] = $arrayResultData['PRO_UID'];
$_GET['APP_UID'] = $_SESSION['__OPEN_APPLICATION_UID__'];
$_SESSION['ACTION'] = 'jump';
$_SESSION['APPLICATION'] = $_SESSION['__OPEN_APPLICATION_UID__'];
$_SESSION['INDEX'] = $arrayResultData['DEL_INDEX'][0];
require_once(PATH_METHODS . 'cases' . PATH_SEP . 'cases_Resume.php');
exit();
}
}
if (count($arrayDelIndex) == 1) {

63
workflow/engine/methods/cases/opencase.php
View File

@@ -1,36 +1,29 @@
<?php
$RBAC->requirePermissions('PM_CASES');
$isBrowserMobile = G::check_is_mobile(strtolower($_SERVER['HTTP_USER_AGENT']));
if (!((defined('REDIRECT_TO_MOBILE') && REDIRECT_TO_MOBILE == 1 && $isBrowserMobile))) {
$isBrowserMobile = false;
if ($RBAC->userCanAccess('PM_CASES') != 1) {
header('location: ' . SYS_URI . 'login/login' . '?u=' . urlencode($_SERVER['REQUEST_URI']));
die();
}
}
$G_MAIN_MENU = 'processmaker';
$G_ID_MENU_SELECTED = 'CASES';
$_POST['qs'] = '';
$arrayAux = explode('?', $_SERVER['REQUEST_URI']);
preg_match('/^.*\/cases\/opencase\/([\w\-]{32})$/', $arrayAux[0], $arrayMatch);
$applicationUid = $arrayMatch[1];
$case = new \ProcessMaker\BusinessModel\Cases();
$arrayApplicationData = $case->getApplicationRecordByPk($applicationUid, [], false);
$G_PUBLISH = new Publisher();
if ($arrayApplicationData !== false) {
$isBrowserMobile = G::check_is_mobile(strtolower($_SERVER['HTTP_USER_AGENT']));
if (!(defined('REDIRECT_TO_MOBILE') && REDIRECT_TO_MOBILE == 1 && $isBrowserMobile)) {
$_SESSION['__CD__'] = '../';
$_SESSION['__OPEN_APPLICATION_UID__'] = $applicationUid;
$G_PUBLISH->AddContent('view', 'cases/cases_Load');
$headPublisher = &headPublisher::getSingleton();
$headPublisher->addScriptFile('/jscore/src/PM.js');
$headPublisher->addScriptFile('/jscore/src/Sessions.js');
} else {
if ($isBrowserMobile) {
$delIndex = 0;
if ($arrayApplicationData !== false) {
$case = new \ProcessMaker\BusinessModel\Cases();
$arrayResult = $case->getStatusInfo($applicationUid, 0, $_SESSION['USER_LOGGED']);
@@ -42,26 +35,30 @@ if ($arrayApplicationData !== false) {
$arrayResult = $case->getStatusInfo($applicationUid);
$arrayDelIndex = $arrayResult['DEL_INDEX'];
}
$delIndex = 0;
if (count($arrayDelIndex) == 1) {
$delIndex = $arrayDelIndex[0];
}
$urlMobile = G::caseLinkMobile($applicationUid, $delIndex);
G::header('Location: ' . $urlMobile);
exit(0);
}
$urlMobile = 'processmakerMobile://' . $applicationUid . '/' . $delIndex;
G::header('Location: ' . $urlMobile);
exit(0);
} else {
$G_PUBLISH->AddContent(
'xmlform',
'xmlform',
'login/showMessage',
'',
['MESSAGE' => \G::LoadTranslation('ID_CASE_DOES_NOT_EXIST2', ['app_uid', $applicationUid])]
);
if ($arrayApplicationData !== false) {
$_SESSION['__CD__'] = '../';
$_SESSION['__OPEN_APPLICATION_UID__'] = $applicationUid;
$G_PUBLISH->AddContent('view', 'cases/cases_Load');
$headPublisher = &headPublisher::getSingleton();
$headPublisher->addScriptFile('/jscore/src/PM.js');
$headPublisher->addScriptFile('/jscore/src/Sessions.js');
} else {
$G_PUBLISH->AddContent(
'xmlform',
'xmlform',
'login/showMessage',
'',
['MESSAGE' => \G::LoadTranslation('ID_CASE_DOES_NOT_EXIST2', ['app_uid', $applicationUid])]
);
}
}
G::RenderPage('publish');

2
workflow/engine/methods/oauth2/grant.php
View File

@@ -7,7 +7,7 @@ if (! empty($_GET['error'])) {
die();
}
$http = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http';
$http = G::is_https() ? 'https' : 'http';
$host = $_SERVER['SERVER_NAME'] . ($_SERVER['SERVER_PORT'] != '80' ? ':' . $_SERVER['SERVER_PORT'] : '');
$endpoint = sprintf('%s://%s/%s/oauth2/token', $http, $host, SYS_SYS);
$code = empty($_GET['code']) ? 'NN' : $_GET['code'];