fernando/luos
1
0
Fork 0
Code Releases Activity

Merged master into fixing-broken-features

Browse Source
This commit is contained in:
Veronica Aruquipa
2014-12-19 11:23:27 -04:00
parent bd3b149c55 9a426e3da1
commit cba9508c61
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6569,11 +6569,11 @@ class Cases
}
global $RBAC;
//Adding the actual user if this has the PM_REASSIGNCASE permission assigned.
if ($RBAC->userCanAccess('PM_REASSIGNCASE') == 1){
if(!in_array($RBAC->aUserInfo['USER_INFO']['USR_UID'], $row)){
$row[] = $RBAC->aUserInfo['USER_INFO']['USR_UID'];
}
//Adding the actual user if this has the PM_SUPERVISOR permission assigned.
if ($RBAC->userCanAccess('PM_SUPERVISOR') == 1) {
if(!in_array($RBAC->aUserInfo['USER_INFO']['USR_UID'], $row)) {
$row[] = $RBAC->aUserInfo['USER_INFO']['USR_UID'];
}
}
require_once 'classes/model/Users.php';

2
workflow/engine/methods/login/login.php
View File

@@ -36,7 +36,7 @@ $aFields = array();
if (!isset($_GET['u'])) {
$aFields['URL'] = '';
} else {
$aFields['URL'] = urldecode(htmlentities($_GET['u']));
$aFields['URL'] = htmlspecialchars(addslashes(stripslashes(strip_tags(trim(urldecode($_GET['u']))))));
}
if (!isset($_SESSION['G_MESSAGE'])) {

2
workflow/engine/methods/login/retrivePassword.php
View File

@@ -8,7 +8,7 @@ G::LoadClass("system");
$rbacUser = new RbacUsers();
$user = new Users();
$data['USR_USERNAME'] = strip_tags($data['USR_USERNAME']);
$userData = $rbacUser->getByUsername($data['USR_USERNAME']);
if ($userData['USR_EMAIL'] != '' && $userData['USR_EMAIL'] === $data['USR_EMAIL'] && ($userData['USR_AUTH_TYPE'] === '' || $userData['USR_AUTH_TYPE'] == 'MYSQL') ) {