diff --git a/workflow/engine/methods/cases/cases_Ajax.php b/workflow/engine/methods/cases/cases_Ajax.php index 0cec77b67..760cd964e 100644 --- a/workflow/engine/methods/cases/cases_Ajax.php +++ b/workflow/engine/methods/cases/cases_Ajax.php @@ -1029,13 +1029,13 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) { ); //Check if the user is a supervisor to this Process - if(isset($_POST['actionFromList']) && $_POST['actionFromList']==='to_revise'){ - if(!$aUserCanAccess['supervisor']){ + if (isset($_POST['actionFromList']) && $_POST['actionFromList']==='to_revise') { + if (!$aUserCanAccess['supervisor']) { $response['exists'] = false; $response['message'] = G::LoadTranslation('ID_NO_PERMISSION_NO_PARTICIPATED'); } } else {//Check if the user participated in this case - if(!$aUserCanAccess['participated'] && !$aUserCanAccess['rolesPermissions']['PM_ALLCASES'] && !$aUserCanAccess['objectPermissions']['SUMMARY_FORM']){ + if (!$aUserCanAccess['participated'] && !$aUserCanAccess['rolesPermissions']['PM_ALLCASES'] && !$aUserCanAccess['objectPermissions']['SUMMARY_FORM']) { $response['exists'] = false; $response['message'] = G::LoadTranslation('ID_NO_PERMISSION_NO_PARTICIPATED'); } diff --git a/workflow/engine/methods/cases/cases_Resume.php b/workflow/engine/methods/cases/cases_Resume.php index 935a4755c..e7692ce77 100644 --- a/workflow/engine/methods/cases/cases_Resume.php +++ b/workflow/engine/methods/cases/cases_Resume.php @@ -141,19 +141,19 @@ $oHeadPublisher = & headPublisher::getSingleton(); $oHeadPublisher->addScriptFile( '/jscore/cases/core/cases_Step.js' ); $G_PUBLISH = new Publisher(); $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_Resume.xml', '', $Fields, '' ); -if($Fields['APP_STATUS'] != 'COMPLETED'){ +if ($Fields['APP_STATUS'] != 'COMPLETED') { $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_Resume_Current_Task_Title.xml', '', $Fields, '' ); $objDel = new AppDelegation(); $parallel = $objDel->LoadParallel($Fields['APP_UID']); $FieldsPar = $Fields; - foreach($parallel as $row){ + foreach ($parallel as $row) { $FieldsPar['TAS_UID'] = $row['TAS_UID']; $aTask = $objTask->load( $row['TAS_UID'] ); $FieldsPar['TAS_TITLE'] = $aTask['TAS_TITLE']; $FieldsPar['USR_UID'] = $row['USR_UID']; - if(isset($row['USR_UID']) && !empty($row['USR_UID'])) { - $aUser = $objUser->loadDetails ($row['USR_UID']); - $FieldsPar['CURRENT_USER'] = $aUser['USR_FULLNAME']; + if (isset($row['USR_UID']) && !empty($row['USR_UID'])) { + $aUser = $objUser->loadDetails ($row['USR_UID']); + $FieldsPar['CURRENT_USER'] = $aUser['USR_FULLNAME']; } $FieldsPar['DEL_DELEGATE_DATE'] = $row['DEL_DELEGATE_DATE']; $FieldsPar['DEL_INIT_DATE'] = $row['DEL_INIT_DATE']; diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php index 59ed4a651..e3502bc61 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php @@ -3263,7 +3263,7 @@ class Cases * @param array $objectPermissions * @return array Returns array with all access */ - public static function userAuthorization($usrUid, $proUid, $appUid, $rolesPermissions=array(), $objectPermissions=array()){ + public function userAuthorization($usrUid, $proUid, $appUid, $rolesPermissions=array(), $objectPermissions=array()){ $arrayAccess = array(); //User has participated @@ -3277,7 +3277,7 @@ class Cases $arrayAccess['supervisor'] = (!in_array($proUid, $aProcesses)) ? false : true; //Roles Permissions - if (sizeof($rolesPermissions)) { + if (count($rolesPermissions)>0) { global $RBAC; foreach ($rolesPermissions as $value) { $arrayAccess['rolesPermissions'][$value] = ($RBAC->userCanAccess($value) < 0) ? false : true; @@ -3285,11 +3285,11 @@ class Cases } //Object Permissions - if (sizeof($objectPermissions)) { + if (count($objectPermissions) > 0) { $oCase = new \Cases(); foreach ($objectPermissions as $key => $value) { $resPermission = $oCase->getAllObjectsFrom($proUid, $appUid, '', $usrUid, $value); - if(isset($resPermission[$key])){ + if (isset($resPermission[$key])) { $arrayAccess['objectPermissions'][$key] = $resPermission[$key]; } }