diff --git a/access_element.php b/access_element.php index 87be76b..e02ee99 100644 --- a/access_element.php +++ b/access_element.php @@ -14,16 +14,16 @@ include_once './settings/settings_redirector.php'; $_SESSION['prev_origin_access_element'] = $_SERVER['REQUEST_URI']; $page = 'access_element'; //Check if allowed -if (isAllowed($page,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'R') === 0){ +if (isAllowed($page,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R') === 0){ header('location: index.php'); exit; } //PAGE Security $page_manage = 'access_element_manage'; -$update_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'U'); -$update_allowed_edit = isAllowed($page_manage ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'U'); -$delete_allowed = isAllowed($page_manage ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'D'); -$create_allowed = isAllowed($page_manage ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'C'); +$update_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'U'); +$update_allowed_edit = isAllowed($page_manage ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'U'); +$delete_allowed = isAllowed($page_manage ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'D'); +$create_allowed = isAllowed($page_manage ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'C'); //GET Details from URL $GET_VALUES = urlGETdetails($_GET) ?? ''; diff --git a/access_element_manage.php b/access_element_manage.php index 2100be2..1394bae 100644 --- a/access_element_manage.php +++ b/access_element_manage.php @@ -12,14 +12,14 @@ include_once './settings/settings_redirector.php'; $page = 'access_element_manage'; //Check if allowed -if (isAllowed($page,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'R') === 0){ +if (isAllowed($page,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R') === 0){ header('location: index.php'); exit; } //PAGE Security -$update_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'U'); -$delete_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'D'); -$create_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'C'); +$update_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'U'); +$delete_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'D'); +$create_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'C'); // Default input values $element = [ diff --git a/access_elements.php b/access_elements.php index 57363d1..6dac667 100644 --- a/access_elements.php +++ b/access_elements.php @@ -17,15 +17,15 @@ $page = $_SESSION['origin'] = 'access_elements'; $back_btn_orgin = ($prev_page != '')? '←':''; //Check if allowed -if (isAllowed($page,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'R') === 0){ +if (isAllowed($page,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R') === 0){ header('location: index.php'); exit; } //PAGE Security $page_manage = 'access_element_manage'; -$update_allowed = isAllowed($page_manage ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'U'); -$delete_allowed = isAllowed($page_manage ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'D'); -$create_allowed = isAllowed($page_manage ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'C'); +$update_allowed = isAllowed($page_manage ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'U'); +$delete_allowed = isAllowed($page_manage ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'D'); +$create_allowed = isAllowed($page_manage ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'C'); // Function to scan project for new PHP files and add to access_elements function scan_and_update_access_elements() { diff --git a/account.php b/account.php index 3303a0a..0a03500 100644 --- a/account.php +++ b/account.php @@ -15,15 +15,15 @@ $_SESSION['prev_origin'] = $_SERVER['REQUEST_URI']; $page = $_SESSION['origin'] = 'account'; //Check if allowed -if (isAllowed($page,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'R') === 0){ +if (isAllowed($page,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R') === 0){ header('location: index.php'); exit; } //PAGE Security -$update_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'U'); -$delete_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'D'); -$create_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'C'); -$healthindex_allowed = isAllowed('report_healthindex' ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'R'); +$update_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'U'); +$delete_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'D'); +$create_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'C'); +$healthindex_allowed = isAllowed('report_healthindex' ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R'); //GET Details from URL $GET_VALUES = urlGETdetails($_GET) ?? ''; diff --git a/account_manage.php b/account_manage.php index 14e3003..eb225fa 100644 --- a/account_manage.php +++ b/account_manage.php @@ -3,14 +3,14 @@ defined(page_security_key) or exit; $page = 'account'; //Check if allowed -if (isAllowed($page,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'R') === 0){ +if (isAllowed($page,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R') === 0){ header('location: index.php'); exit; } //PAGE Security -$update_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'U'); -$delete_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'D'); -$create_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'C'); +$update_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'U'); +$delete_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'D'); +$create_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'C'); // Default input product values $account = [ diff --git a/accounts.php b/accounts.php index 5970a50..00c6705 100644 --- a/accounts.php +++ b/accounts.php @@ -15,15 +15,15 @@ $_SESSION['prev_origin'] = ''; $page = 'accounts'; //Check if allowed -if (isAllowed($page,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'R') === 0){ +if (isAllowed($page,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R') === 0){ header('location: index.php'); exit; } //PAGE Security $page_manage = 'account_manage'; -$update_allowed = isAllowed($page_manage ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'U'); -$delete_allowed = isAllowed($page_manage ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'D'); -$create_allowed = isAllowed($page_manage ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'C'); +$update_allowed = isAllowed($page_manage ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'U'); +$delete_allowed = isAllowed($page_manage ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'D'); +$create_allowed = isAllowed($page_manage ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'C'); //GET PARAMETERS $pagination_page = isset($_GET['p']) ? $_GET['p'] : 1; diff --git a/api/v2/get/user_credentials.php b/api/v2/get/user_credentials.php index 8ee04a2..d6ccdba 100644 --- a/api/v2/get/user_credentials.php +++ b/api/v2/get/user_credentials.php @@ -19,7 +19,7 @@ if ($stmt->rowCount() == 1) { //Define User data $partnerhierarchy = $user_data['partnerhierarchy']; $permission = userRights($user_data['view']); - $profile= getProfile($user_data['settings'],$permission); + $profile= getUserPermissions($pdo, $user_data['id']); //getProfile($user_data['settings'],$permission); $username = $user_data['username']; $useremail = $user_data['email']; $servicekey = $user_data['service']; diff --git a/assets/functions.php b/assets/functions.php index 939bd98..25a3eb0 100644 --- a/assets/functions.php +++ b/assets/functions.php @@ -304,7 +304,7 @@ function menu($selected,$selected_child){ $menu = ''; //filter the main_menu array based on profile - $filteredMenu = filterMenuByProfile($main_menu, $_SESSION['authorization']['profile']); + $filteredMenu = filterMenuByProfile($main_menu, $_SESSION['authorization']['permissions']); foreach ($filteredMenu as $menu_item){ //Main Item @@ -1539,13 +1539,15 @@ function getProfile($profile, $permission){ //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ //Is allowed (yes=1)++++++++++++++++++++++++++++++++++++++++ //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - function isAllowed($page,$profile,$permission,$action){ - - //override for testing only - return 1; - - //Include settingsa - include dirname(__FILE__,2).'/settings/settings_redirector.php'; + // RBAC-based permission check + // $access_element = the page/element to check access for (e.g., 'user', 'equipment') + // $permissions = array of user permissions from $_SESSION['authorization']['permissions'] (from getUserPermissions()) + // $basic_permission_level = optional legacy permission level (5 = system, always allowed) + // $action = C, R, U, or D + function isAllowed($access_element, $permissions, $basic_permission_level = null, $action = 'R'){ + + $date = date('Y-m-d H:i:s'); + $filelocation = dirname(__FILE__,2).'/log/permission_log_'.date('d').'.txt'; // Always allowed collections: [collection => allowed_actions_string] $always_allowed = [ @@ -1563,87 +1565,70 @@ function getProfile($profile, $permission){ 'marketing_delete' => 'CRUD' ]; - // Group permissions: [granting_page => [collection => allowed_actions_string]] - $group_permissions = [ - 'products_software' => [ - 'products_software_version_access_rules' => 'CRU', - 'products_software_licenses' => 'CRU', - 'products_software_upgrade_paths' => 'CRU', - 'products_software_versions' => 'CRU', - 'products_software_assignment' => 'CRU', - 'products_software_assignments' => 'CRU' - ] - ]; - - // Debug log + // Debug log - initial call if(debug){ - $test = "$date - isAllowed called: page=$page, permission=$permission, action=$action".PHP_EOL; - $filelocation = dirname(__FILE__,2).'/log/permission_log_'.date('d').'.txt'; - error_log($test, 3, $filelocation); - } - // 1. Check always allowed - if (isset($always_allowed[$page]) && str_contains($always_allowed[$page], $action)) { - - if(debug){ - $test = "$date - Allowed by always_allowed".PHP_EOL; - $filelocation = dirname(__FILE__,2).'/log/permission_log_'.date('d').'.txt'; - error_log($test, 3, $filelocation); - } - - return 1; - } - - //GET ALLOWED ACTIONS - $user_permission = ${'permission_'.$permission}; - - //CHECK ALLOWED - $page_action = str_contains($user_permission,$action) > 0 ? 1 : 0; //CHECK IF USER IS ALLOWED TO DO THE ACTION - $page_access = str_contains($profile,$page) > 0 ? 1 : 0; //CHECK USER IS ALLOWED TO ACCESS PAGE - - if(debug){ - $test = "$date - user_permission=$user_permission, page_action=$page_action, page_access=$page_access".PHP_EOL; - $filelocation = dirname(__FILE__,2).'/log/permission_log_'.date('d').'.txt'; + $perm_count = is_array($permissions) ? count($permissions) : 'not_array'; + $test = "$date - isAllowed called: access_element=$access_element, basic_permission_level=$basic_permission_level, action=$action, permissions_count=$perm_count".PHP_EOL; error_log($test, 3, $filelocation); } - // 2. Check user permissions (standard) - if ($page_access == 1 && $page_action == 1){ + // 1. Check if basic_permission_level is 5 (System) - always allow + if ($basic_permission_level !== null && $basic_permission_level == 5) { if(debug){ - $test = "$date - Allowed by user permissions".PHP_EOL; - $filelocation = dirname(__FILE__,2).'/log/permission_log_'.date('d').'.txt'; + $test = "$date - Allowed by system permission (level 5)".PHP_EOL; error_log($test, 3, $filelocation); - } return 1; } - // 3. If not allowed by user, check group permissions - if ($page_access == 0) { - foreach ($group_permissions as $granting_page => $grants) { - if (str_contains($profile, $granting_page)) { - if(debug){ - $test = "$date - Found granting_page: $granting_page".PHP_EOL; - $filelocation = dirname(__FILE__,2).'/log/permission_log_'.date('d').'.txt'; - error_log($test, 3, $filelocation); - } - if (isset($grants[$page]) && str_contains($grants[$page], $action)) { - if(debug){ - $test = "$date - Allowed by group permissions".PHP_EOL; - $filelocation = dirname(__FILE__,2).'/log/permission_log_'.date('d').'.txt'; - error_log($test, 3, $filelocation); - } - return 1; - } + // 2. Check always_allowed list + if (isset($always_allowed[$access_element]) && str_contains($always_allowed[$access_element], $action)) { + if(debug){ + $test = "$date - Allowed by always_allowed list".PHP_EOL; + error_log($test, 3, $filelocation); + } + return 1; + } + + // 3. Check RBAC permissions array (from getUserPermissions()) + if (is_array($permissions) && isset($permissions[$access_element])) { + $element_permissions = $permissions[$access_element]; + + // Map action letter to permission key + $action_map = [ + 'C' => 'can_create', + 'R' => 'can_read', + 'U' => 'can_update', + 'D' => 'can_delete' + ]; + + $permission_key = $action_map[$action] ?? null; + + if ($permission_key && isset($element_permissions[$permission_key]) && $element_permissions[$permission_key] == 1) { + if(debug){ + $test = "$date - Allowed by RBAC permissions: $access_element -> $permission_key = 1".PHP_EOL; + error_log($test, 3, $filelocation); } + return 1; + } + + if(debug){ + $perm_value = $element_permissions[$permission_key] ?? 'not_set'; + $test = "$date - RBAC check failed: $access_element -> $permission_key = $perm_value".PHP_EOL; + error_log($test, 3, $filelocation); + } + } else { + if(debug){ + $test = "$date - Access element '$access_element' not found in permissions array".PHP_EOL; + error_log($test, 3, $filelocation); } } - if(debug){ - $test = "$date - Not allowed".PHP_EOL; - $filelocation = dirname(__FILE__,2).'/log/permission_log_'.date('d').'.txt'; - error_log($test, 3, $filelocation); - } // Not allowed + if(debug){ + $test = "$date - Not allowed: access_element=$access_element, action=$action".PHP_EOL; + error_log($test, 3, $filelocation); + } return 0; } diff --git a/buildtool.php b/buildtool.php index 9de2e31..a34bd1d 100644 --- a/buildtool.php +++ b/buildtool.php @@ -12,7 +12,7 @@ include_once './settings/settings_redirector.php'; $page = 'buildtool'; //Check if allowed -if (isAllowed($page,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'R') === 0){ +if (isAllowed($page,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R') === 0){ header('location: index.php'); exit; } diff --git a/cartest.php b/cartest.php index 8ff8f5c..cb60ce3 100644 --- a/cartest.php +++ b/cartest.php @@ -13,14 +13,14 @@ include_once './settings/systemcartest.php'; $page = 'cartest'; //Check if allowed -if (isAllowed($page,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'R') === 0){ +if (isAllowed($page,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R') === 0){ header('location: index.php'); exit; } //PAGE Security -$update_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'U'); -$delete_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'D'); -$create_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'C'); +$update_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'U'); +$delete_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'D'); +$create_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'C'); //CALL TO API FOR cartest $api_url = '/v1/cartests/rowID='.$_GET['rowID']; diff --git a/cartest_manage.php b/cartest_manage.php index a4f3334..75bfa2c 100644 --- a/cartest_manage.php +++ b/cartest_manage.php @@ -13,14 +13,14 @@ include_once './settings/systemcartest.php'; $page = 'cartest_manage'; //Check if allowed -if (isAllowed($page,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'R') === 0){ +if (isAllowed($page,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R') === 0){ header('location: index.php'); exit; } //PAGE Security -$update_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'U'); -$delete_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'D'); -$create_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'C'); +$update_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'U'); +$delete_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'D'); +$create_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'C'); $bearertoken = createCommunicationToken($_SESSION['authorization']['userkey']); diff --git a/cartests.php b/cartests.php index 141b967..8fb8062 100644 --- a/cartests.php +++ b/cartests.php @@ -11,14 +11,14 @@ include_once './settings/settings_redirector.php'; $page = 'cartests'; //Check if allowed -if (isAllowed($page,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'R') === 0){ +if (isAllowed($page,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R') === 0){ header('location: index.php'); exit; } //PAGE Security -$update_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'U'); -$delete_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'D'); -$create_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'C'); +$update_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'U'); +$delete_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'D'); +$create_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'C'); //GET PARAMETERS diff --git a/catalog.php b/catalog.php index 5bbed4b..bfaf6dd 100644 --- a/catalog.php +++ b/catalog.php @@ -15,7 +15,7 @@ $prev_page = $_SESSION['prev_origin'] ?? ''; $page = $_SESSION['origin'] = 'catalog'; //Check if allowed -if (isAllowed($page,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'R') === 0){ +if (isAllowed($page,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R') === 0){ header('location: index.php'); exit; } diff --git a/categories.php b/categories.php index 6e887e0..5b4b157 100644 --- a/categories.php +++ b/categories.php @@ -15,7 +15,7 @@ $prev_page = $_SESSION['prev_origin'] ?? ''; $page = $_SESSION['origin'] = 'categories'; //Check if allowed -if (isAllowed($page,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'R') === 0){ +if (isAllowed($page,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R') === 0){ header('location: index.php'); exit; } diff --git a/category.php b/category.php index 7228cc6..d896ad3 100644 --- a/category.php +++ b/category.php @@ -3,14 +3,14 @@ defined(page_security_key) or exit; $page = 'category'; //Check if allowed -if (isAllowed($page,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'R') === 0){ +if (isAllowed($page,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R') === 0){ header('location: index.php'); exit; } //PAGE Security -$update_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'U'); -$delete_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'D'); -$create_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'C'); +$update_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'U'); +$delete_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'D'); +$create_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'C'); $category = [ 'rowID' => '', diff --git a/communication.php b/communication.php index c3d8e3d..452ac13 100644 --- a/communication.php +++ b/communication.php @@ -3,14 +3,14 @@ defined(page_security_key) or exit; $page = 'communication'; //Check if allowed -if (isAllowed($page,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'R') === 0){ +if (isAllowed($page,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R') === 0){ header('location: index.php'); exit; } //PAGE Security -$update_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'U'); -$delete_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'D'); -$create_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'C'); +$update_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'U'); +$delete_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'D'); +$create_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'C'); // Default input communication values $communication = [ diff --git a/communication_send.php b/communication_send.php index 7b9a652..c5a6391 100644 --- a/communication_send.php +++ b/communication_send.php @@ -3,14 +3,14 @@ defined(page_security_key) or exit; $page = 'communication_send'; //Check if allowed -if (isAllowed($page,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'R') === 0){ +if (isAllowed($page,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R') === 0){ header('location: index.php'); exit; } //PAGE Security -$update_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'U'); -$delete_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'D'); -$create_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'C'); +$update_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'U'); +$delete_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'D'); +$create_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'C'); $url = 'index.php?page=communications'; diff --git a/communications.php b/communications.php index b3eaf24..67bee9d 100644 --- a/communications.php +++ b/communications.php @@ -19,15 +19,15 @@ $back_btn_orgin = ($prev_page != '')? ''.$button_create_communication.''; } -if (isAllowed('communication_send',$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'U') === 1){ +if (isAllowed('communication_send',$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'U') === 1){ $view .= ''.$button_create_communication_send.''; } diff --git a/contract.php b/contract.php index 15ff325..6c4bfa9 100644 --- a/contract.php +++ b/contract.php @@ -17,7 +17,7 @@ $page = 'contract'; $back_btn_orgin = ($prev_page != '')? '←':''; //Check if allowed -if (isAllowed($page,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'R') === 0){ +if (isAllowed($page,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R') === 0){ header('location: index.php'); exit; } @@ -27,11 +27,11 @@ $pagination_page = $_SESSION['p'] = isset($_GET['p']) ? $_GET['p'] : 1; //PAGE Security $page_manage = 'contract_manage'; -$update_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'U'); -$update_allowed_edit = isAllowed($page_manage ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'U'); -$delete_allowed = isAllowed($page_manage ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'D'); -$create_allowed = isAllowed($page_manage ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'C'); -$view_equipment = isAllowed('equipment' ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'R'); +$update_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'U'); +$update_allowed_edit = isAllowed($page_manage ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'U'); +$delete_allowed = isAllowed($page_manage ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'D'); +$create_allowed = isAllowed($page_manage ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'C'); +$view_equipment = isAllowed('equipment' ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R'); //GET Details from URL $GET_VALUES = urlGETdetails($_GET) ?? ''; diff --git a/contract_manage.php b/contract_manage.php index 80c0f23..7c46e33 100644 --- a/contract_manage.php +++ b/contract_manage.php @@ -3,14 +3,14 @@ defined(page_security_key) or exit; $page = 'contract_manage'; //Check if allowed -if (isAllowed($page,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'R') === 0){ +if (isAllowed($page,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R') === 0){ header('location: index.php'); exit; } //PAGE Security -$update_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'U'); -$delete_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'D'); -$create_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'C'); +$update_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'U'); +$delete_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'D'); +$create_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'C'); // Default input product values $contract = [ diff --git a/contracts.php b/contracts.php index 50d7e99..f7dba17 100644 --- a/contracts.php +++ b/contracts.php @@ -18,15 +18,15 @@ $prev_page = ($_SESSION['origin'] == 'equipments') ? $_SESSION['prev_origin_equi $back_btn_orgin = ($prev_page != '')? '←':''; //Check if allowed -if (isAllowed($page,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'R') === 0){ +if (isAllowed($page,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R') === 0){ header('location: index.php'); exit; } //PAGE Security $page_manage = 'contract_manage'; -$update_allowed = isAllowed($page_manage ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'U'); -$delete_allowed = isAllowed($page_manage ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'D'); -$create_allowed = isAllowed($page_manage ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'C'); +$update_allowed = isAllowed($page_manage ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'U'); +$delete_allowed = isAllowed($page_manage ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'D'); +$create_allowed = isAllowed($page_manage ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'C'); //Close Contracts when end_date expired closeContract(); diff --git a/dashboard.php b/dashboard.php index 5aee031..7328425 100644 --- a/dashboard.php +++ b/dashboard.php @@ -11,7 +11,7 @@ include_once './assets/functions.php'; include_once './settings/settings_redirector.php'; //Check if allowed -if (isAllowed('dashboard',$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'R') === 0){ +if (isAllowed('dashboard',$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R') === 0){ header('location: index.php'); exit; } diff --git a/dealer.php b/dealer.php index a513523..224dadd 100644 --- a/dealer.php +++ b/dealer.php @@ -15,15 +15,15 @@ $_SESSION['prev_origin_dealer'] = $_SERVER['REQUEST_URI']; $page = 'dealer'; //Check if allowed -if (isAllowed($page,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'R') === 0){ +if (isAllowed($page,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R') === 0){ header('location: index.php'); exit; } //PAGE Security $page_manage = 'dealer_manage'; -$update_allowed = isAllowed($page_manage ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'U'); -$delete_allowed = isAllowed($page_manage ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'D'); -$create_allowed = isAllowed($page_manage ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'C'); +$update_allowed = isAllowed($page_manage ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'U'); +$delete_allowed = isAllowed($page_manage ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'D'); +$create_allowed = isAllowed($page_manage ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'C'); //GET Details from URL $GET_VALUES = urlGETdetails($_GET) ?? ''; diff --git a/dealer_manage.php b/dealer_manage.php index ce474c5..2bb5d9b 100644 --- a/dealer_manage.php +++ b/dealer_manage.php @@ -3,14 +3,14 @@ defined(page_security_key) or exit; $page = 'dealer_manage'; //Check if allowed -if (isAllowed($page,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'R') === 0){ +if (isAllowed($page,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R') === 0){ header('location: index.php'); exit; } //PAGE Security -$update_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'U'); -$delete_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'D'); -$create_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'C'); +$update_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'U'); +$delete_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'D'); +$create_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'C'); if (isset($_GET['rowID']) && $_GET['rowID'] !=''){ diff --git a/dealers.php b/dealers.php index c0b01e4..7612a80 100644 --- a/dealers.php +++ b/dealers.php @@ -15,7 +15,7 @@ $prev_page = $_SESSION['prev_origin'] ?? ''; $page = $_SESSION['origin'] = 'dealers'; //Check if allowed -if (isAllowed($page,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'R') === 0){ +if (isAllowed($page,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R') === 0){ header('location: index.php'); exit; } diff --git a/discount.php b/discount.php index ae47aa5..54564ca 100644 --- a/discount.php +++ b/discount.php @@ -3,14 +3,14 @@ defined(page_security_key) or exit; $page = 'discount'; //Check if allowed -if (isAllowed($page,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'R') === 0){ +if (isAllowed($page,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R') === 0){ header('location: index.php'); exit; } //PAGE Security -$update_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'U'); -$delete_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'D'); -$create_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'C'); +$update_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'U'); +$delete_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'D'); +$create_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'C'); $discount = [ 'id' =>'', diff --git a/discounts.php b/discounts.php index 0b3cc31..f4409fc 100644 --- a/discounts.php +++ b/discounts.php @@ -15,7 +15,7 @@ $prev_page = $_SESSION['prev_origin'] ?? ''; $page = $_SESSION['origin'] = 'discounts'; //Check if allowed -if (isAllowed($page,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'R') === 0){ +if (isAllowed($page,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R') === 0){ header('location: index.php'); exit; } diff --git a/equipment.php b/equipment.php index f02b6b6..67e0d1e 100644 --- a/equipment.php +++ b/equipment.php @@ -14,19 +14,19 @@ include_once './settings/settings_redirector.php'; $_SESSION['prev_origin_equipment'] = $_SERVER['REQUEST_URI']; $page = 'equipment'; //Check if allowed -if (isAllowed($page,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'R') === 0){ +if (isAllowed($page,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R') === 0){ header('location: index.php'); exit; } //PAGE Security $page_manage = 'equipment_manage'; -$update_allowed = isAllowed($page ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'U'); -$update_allowed_edit = isAllowed($page_manage ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'U'); -$delete_allowed = isAllowed($page_manage ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'D'); -$create_allowed = isAllowed($page_manage ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'C'); -$view_product = isAllowed('product' ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'R'); -$view_history = isAllowed('history' ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'C'); -$view_contracts = isAllowed('contracts' ,$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'R'); +$update_allowed = isAllowed($page ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'U'); +$update_allowed_edit = isAllowed($page_manage ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'U'); +$delete_allowed = isAllowed($page_manage ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'D'); +$create_allowed = isAllowed($page_manage ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'C'); +$view_product = isAllowed('product' ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R'); +$view_history = isAllowed('history' ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'C'); +$view_contracts = isAllowed('contracts' ,$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R'); //GET Details from URL $GET_VALUES = urlGETdetails($_GET) ?? ''; @@ -108,7 +108,7 @@ if (!empty($responses->sw_version_upgrade) && isset($products_software) && $prod } //Calculate Healthindex based on last test -$total_score = assetHealthIndex($_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],$equipment_data,0); +$total_score = assetHealthIndex($_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],$equipment_data,0); //GetPartnerDetails $partner_data = json_decode($responses->accounthierarchy); @@ -369,7 +369,7 @@ if (!empty($responses->geolocation) || $responses->geolocation != ''){ } //Get all related service events -if (isAllowed('servicereports',$_SESSION['authorization']['profile'],$_SESSION['authorization']['permission'],'R') === 1){ +if (isAllowed('servicereports',$_SESSION['authorization']['permissions'],$_SESSION['authorization']['permission'],'R') === 1){ $service_events = serviceEvents($history,$page); $view .= '