HOR-3956
Fix CR
This commit is contained in:
@@ -768,8 +768,8 @@ class RBAC
|
|||||||
* $rbac->userCanAccess("PM_CASES");
|
* $rbac->userCanAccess("PM_CASES");
|
||||||
*
|
*
|
||||||
* Alias of permissions:
|
* Alias of permissions:
|
||||||
* PM_CASES has alias: PM_GUES_CASE
|
* PM_CASES has alias: PM_GUEST_CASE
|
||||||
* This means that a role with PM_GUES_CASE could access like one with PM_CASES
|
* This means that a role with PM_GUEST_CASE could access like one with PM_CASES
|
||||||
* unless the permission is required as strict, like this:
|
* unless the permission is required as strict, like this:
|
||||||
* $rbac->userCanAccess("PM_CASES/strict");
|
* $rbac->userCanAccess("PM_CASES/strict");
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ class RbacUsers extends BaseRbacUsers
|
|||||||
if ($aFields['USR_DUE_DATE'] < date('Y-m-d')) {
|
if ($aFields['USR_DUE_DATE'] < date('Y-m-d')) {
|
||||||
return -4;
|
return -4;
|
||||||
}
|
}
|
||||||
if ($aFields['USR_STATUS'] != 1 && $aFields['USR_UID']!== RBAC::GUEST_USER_UID) {
|
if ($aFields['USR_STATUS'] != 1 && $aFields['USR_UID'] !== RBAC::GUEST_USER_UID) {
|
||||||
return -3;
|
return -3;
|
||||||
}
|
}
|
||||||
$role = $this->getUserRole($aFields['USR_UID']);
|
$role = $this->getUserRole($aFields['USR_UID']);
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ class WsBase
|
|||||||
$RBAC->loadUserRolePermission($RBAC->sSystem, $uid);
|
$RBAC->loadUserRolePermission($RBAC->sSystem, $uid);
|
||||||
$res = $RBAC->userCanAccess("PM_LOGIN");
|
$res = $RBAC->userCanAccess("PM_LOGIN");
|
||||||
|
|
||||||
if ($res != 1 && $uid!== RBAC::GUEST_USER_UID) {
|
if ($res != 1 && $uid !== RBAC::GUEST_USER_UID) {
|
||||||
$wsResponse = new WsResponse(2, G::loadTranslation('ID_USER_HAVENT_RIGHTS_SYSTEM'));
|
$wsResponse = new WsResponse(2, G::loadTranslation('ID_USER_HAVENT_RIGHTS_SYSTEM'));
|
||||||
throw (new Exception(serialize($wsResponse)));
|
throw (new Exception(serialize($wsResponse)));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,38 +1,16 @@
|
|||||||
<?php
|
<?php
|
||||||
/**
|
$RBAC->requirePermissions('PM_CASES/strict');
|
||||||
* main.php Cases List main processor
|
|
||||||
*
|
|
||||||
* ProcessMaker Open Source Edition
|
|
||||||
* Copyright (C) 2004 - 2008 Colosa Inc.23
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as
|
|
||||||
* published by the Free Software Foundation, either version 3 of the
|
|
||||||
* License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*
|
|
||||||
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
|
|
||||||
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
|
|
||||||
*/
|
|
||||||
|
|
||||||
$RBAC->requirePermissions( 'PM_CASES/strict' );
|
|
||||||
|
|
||||||
$G_MAIN_MENU = 'processmaker';
|
$G_MAIN_MENU = 'processmaker';
|
||||||
$G_ID_MENU_SELECTED = 'CASES';
|
$G_ID_MENU_SELECTED = 'CASES';
|
||||||
|
|
||||||
$_POST['qs'] = isset( $_SERVER['QUERY_STRING'] ) && $_SERVER['QUERY_STRING'] != '' ? '?' . $_SERVER['QUERY_STRING'] : '';
|
$_POST['qs'] = isset($_SERVER['QUERY_STRING'])
|
||||||
|
&& $_SERVER['QUERY_STRING'] != '' ? '?' . $_SERVER['QUERY_STRING'] : '';
|
||||||
|
|
||||||
$G_PUBLISH = new Publisher();
|
$G_PUBLISH = new Publisher();
|
||||||
$G_PUBLISH->AddContent( 'view', 'cases/cases_Load' );
|
$G_PUBLISH->AddContent('view', 'cases/cases_Load');
|
||||||
$oHeadPublisher = & headPublisher::getSingleton();
|
$oHeadPublisher = & headPublisher::getSingleton();
|
||||||
$oHeadPublisher->addScriptFile('/jscore/src/PM.js');
|
$oHeadPublisher->addScriptFile('/jscore/src/PM.js');
|
||||||
$oHeadPublisher->addScriptFile('/jscore/src/Sessions.js');
|
$oHeadPublisher->addScriptFile('/jscore/src/Sessions.js');
|
||||||
G::RenderPage( 'publish' );
|
G::RenderPage('publish');
|
||||||
|
|
||||||
|
|||||||
@@ -1,32 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
/**
|
$RBAC->requirePermissions('PM_DASHBOARD');
|
||||||
* dashboard.php
|
|
||||||
*
|
|
||||||
* ProcessMaker Open Source Edition
|
|
||||||
* Copyright (C) 2004 - 2008 Colosa Inc.23
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as
|
|
||||||
* published by the Free Software Foundation, either version 3 of the
|
|
||||||
* License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*
|
|
||||||
* For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
|
|
||||||
* Coral Gables, FL, 33134, USA, or email info@colosa.com.
|
|
||||||
*/
|
|
||||||
|
|
||||||
$RBAC->requirePermissions( 'PM_DASHBOARD' );
|
|
||||||
$licensedFeatures = & PMLicensedFeatures::getSingleton();
|
$licensedFeatures = & PMLicensedFeatures::getSingleton();
|
||||||
if (!$licensedFeatures->verifyfeature('r19Vm5DK1UrT09MenlLYjZxejlhNUZ1b1NhV0JHWjBsZEJ6dnpJa3dTeWVLVT0=')) {
|
if (!$licensedFeatures->verifyfeature('r19Vm5DK1UrT09MenlLYjZxejlhNUZ1b1NhV0JHWjBsZEJ6dnpJa3dTeWVLVT0=')) {
|
||||||
G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
|
G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
|
||||||
G::header( 'location: ../login/login' );
|
G::header('location: ../login/login');
|
||||||
die;
|
die;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -34,10 +11,10 @@ $G_MAIN_MENU = 'processmaker';
|
|||||||
$G_ID_MENU_SELECTED = 'DASHBOARD+';
|
$G_ID_MENU_SELECTED = 'DASHBOARD+';
|
||||||
|
|
||||||
$G_PUBLISH = new Publisher();
|
$G_PUBLISH = new Publisher();
|
||||||
$G_PUBLISH->AddContent( 'view', 'strategicDashboard/load' );
|
$G_PUBLISH->AddContent('view', 'strategicDashboard/load');
|
||||||
$oHeadPublisher = & headPublisher::getSingleton();
|
$oHeadPublisher = & headPublisher::getSingleton();
|
||||||
$oHeadPublisher->addScriptFile('/jscore/src/PM.js');
|
$oHeadPublisher->addScriptFile('/jscore/src/PM.js');
|
||||||
$oHeadPublisher->addScriptFile('/jscore/src/Sessions.js');
|
$oHeadPublisher->addScriptFile('/jscore/src/Sessions.js');
|
||||||
G::RenderPage( 'publish' );
|
G::RenderPage('publish');
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user