diff options
Diffstat (limited to 'ui/include/classes/api/services/CRole.php')
| -rw-r--r-- | ui/include/classes/api/services/CRole.php | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/ui/include/classes/api/services/CRole.php b/ui/include/classes/api/services/CRole.php index 34ff83732d4..fb87a1d1c20 100644 --- a/ui/include/classes/api/services/CRole.php +++ b/ui/include/classes/api/services/CRole.php @@ -700,7 +700,7 @@ class CRole extends CApiService { return; } - $unavailable_moduleids = array_diff(array_keys($moduleids), self::getEnabledModuleIds()); + $unavailable_moduleids = array_diff(array_keys($moduleids), self::getModuleIds()); if ($unavailable_moduleids) { self::exception(ZBX_API_ERROR_PARAMETERS, @@ -1036,7 +1036,7 @@ class CRole extends CApiService { $index = 0; - foreach (self::getEnabledModuleIds() as $moduleid) { + foreach (self::getModuleIds() as $moduleid) { if (array_key_exists($moduleid, $new_modules_rules)) { $module_status = $new_modules_rules[$moduleid]['status']; } @@ -1154,7 +1154,7 @@ class CRole extends CApiService { * @return array */ protected function applyQueryFilterOptions($table_name, $table_alias, array $options, array $sql_parts): array { - $sqlParts = parent::applyQueryFilterOptions($table_name, $table_alias, $options, $sql_parts); + $sql_parts = parent::applyQueryFilterOptions($table_name, $table_alias, $options, $sql_parts); if (self::$userData['type'] != USER_TYPE_SUPER_ADMIN) { $sql_parts['from']['users'] = 'users u'; @@ -1162,7 +1162,7 @@ class CRole extends CApiService { $sql_parts['where'][] = 'u.userid='.self::$userData['userid']; } - return $sqlParts; + return $sql_parts; } /** @@ -1417,7 +1417,7 @@ class CRole extends CApiService { if (in_array('modules', $output, true)) { $modules = []; - foreach (self::getEnabledModuleIds() as $moduleid) { + foreach (self::getModuleIds() as $moduleid) { $modules[$moduleid] = [ 'moduleid' => $moduleid, 'status' => $modules_default_access @@ -1520,12 +1520,9 @@ class CRole extends CApiService { * * @throws APIException */ - private static function getEnabledModuleIds(): array { + private static function getModuleIds(): array { $modules = API::getApiService('module')->get([ 'output' => [], - 'filter' => [ - 'status' => MODULE_STATUS_ENABLED - ], 'preservekeys' => true ], false); |