tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed UM permission problems.

This commit is contained in:
Junichi Satoh 2020-12-01 16:46:09 +09:00
parent e0266b53ba
commit 75e070ebb0
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/godmode/users/configure_user.php
View File

@ -759,13 +759,13 @@ if (!users_is_admin() && $config['id_user'] != $id && !$new_user) {
$sql = sprintf( $sql = sprintf(
"SELECT tusuario_perfil.* FROM tusuario_perfil "SELECT tusuario_perfil.* FROM tusuario_perfil
INNER JOIN tperfil ON tperfil.id_perfil = tusuario_perfil.id_perfil INNER JOIN tperfil ON tperfil.id_perfil = tusuario_perfil.id_perfil
WHERE id_usuario like '%s' AND id_grupo IN (%s) AND user_management = 0", WHERE id_usuario like '%s' AND id_grupo IN (%s) AND user_management = 1",
$id, $config['id_user'],
$group_um_string $group_um_string
); );
$result = db_get_all_rows_sql($sql); $result = db_get_all_rows_sql($sql);
if ($result == false || $user_info['is_admin']) { if ($result == false && $user_info['is_admin'] == false) {
db_pandora_audit( db_pandora_audit(
'ACL Violation', 'ACL Violation',
'Trying to access User Management' 'Trying to access User Management'

12
pandora_console/godmode/users/user_list.php
View File

@ -491,12 +491,6 @@ foreach ($info as $user_id => $user_info) {
foreach ($group_um as $key => $value) { foreach ($group_um as $key => $value) {
if (isset($user_profiles_aux[$key])) { if (isset($user_profiles_aux[$key])) {
$user_profiles[$key] = $user_profiles_aux[$key]; $user_profiles[$key] = $user_profiles_aux[$key];
if ($user_profiles_aux[$key]['user_management'] == 1) {
$user_info['edit'] = 0;
} else {
$user_info['edit'] = 1;
}
unset($user_profiles_aux[$key]); unset($user_profiles_aux[$key]);
} }
} }
@ -593,8 +587,10 @@ foreach ($info as $user_id => $user_info) {
$total_profile++; $total_profile++;
} }
if (isset($user_info['not_delete'])) {
$data[4] .= '</div>'; $data[4] .= __('Other profiles are also assigned.') . ui_print_help_tip(__('Other profiles you cannot manage are also assigned. These profiles are not shown. You cannot enable/disable or delete this user.'), true);
}
$data[4] .= '</div>';
} else { } else {
$data[4] .= __('The user doesn\'t have any assigned profile/group'); $data[4] .= __('The user doesn\'t have any assigned profile/group');
} }

2
pandora_console/include/functions_profile.php
View File

@ -234,7 +234,7 @@ function profile_print_profile_table($id)
$sql = sprintf( $sql = sprintf(
"SELECT tusuario_perfil.* FROM tusuario_perfil "SELECT tusuario_perfil.* FROM tusuario_perfil
INNER JOIN tperfil ON tperfil.id_perfil = tusuario_perfil.id_perfil INNER JOIN tperfil ON tperfil.id_perfil = tusuario_perfil.id_perfil
WHERE id_usuario like '%s' AND id_grupo IN (%s) AND user_management = 0", WHERE id_usuario like '%s' AND id_grupo IN (%s)",
$id, $id,
$group_um_string $group_um_string
); );

4
pandora_console/include/functions_users.php
View File

@ -752,6 +752,10 @@ function users_get_groups_UM($id_user)
foreach ($groups as $key => $group) { foreach ($groups as $key => $group) {
if (!isset($return[$group['id_grupo']]) || (isset($return[$group['id_grupo']]) && $group['user_management'] != 0)) { if (!isset($return[$group['id_grupo']]) || (isset($return[$group['id_grupo']]) && $group['user_management'] != 0)) {
$return[$group['id_grupo']] = $group['user_management']; $return[$group['id_grupo']] = $group['user_management'];
$children = groups_get_children($group['id_grupo'], false, 'UM', false);
foreach ($children as $key => $child_group) {
$return[$child_group['id_grupo']] = $group['user_management'];
}
if ($group['id_grupo'] == '0') { if ($group['id_grupo'] == '0') {
$return['group_all'] = $group['id_grupo']; $return['group_all'] = $group['id_grupo'];
} }