multiple fixes

This commit is contained in:
fbsanchez 2021-02-02 11:25:26 +01:00
parent 231981bcc9
commit 0ddc1929fa
4 changed files with 34 additions and 19 deletions

View File

@ -66,6 +66,7 @@ if (is_ajax()) {
function ($counter, $server) use ($id_tag) { function ($counter, $server) use ($id_tag) {
if (metaconsole_connect($server) === NOERR) { if (metaconsole_connect($server) === NOERR) {
$counter += tags_get_local_modules_count($id_tag); $counter += tags_get_local_modules_count($id_tag);
metaconsole_restore_db();
} }
return $counter; return $counter;
@ -83,6 +84,7 @@ if (is_ajax()) {
function ($counter, $server) use ($id_tag) { function ($counter, $server) use ($id_tag) {
if (metaconsole_connect($server) === NOERR) { if (metaconsole_connect($server) === NOERR) {
$counter += tags_get_policy_modules_count($id_tag); $counter += tags_get_policy_modules_count($id_tag);
metaconsole_restore_db();
} }
return $counter; return $counter;
@ -261,6 +263,7 @@ if (!empty($result)) {
function ($counter, $server) use ($tag_id) { function ($counter, $server) use ($tag_id) {
if (metaconsole_connect($server) === NOERR) { if (metaconsole_connect($server) === NOERR) {
$counter += tags_get_modules_count($tag_id); $counter += tags_get_modules_count($tag_id);
metaconsole_restore_db();
} }
return $counter; return $counter;

View File

@ -232,21 +232,21 @@ if (isset($_GET['user_del'])) {
if (defined('METACONSOLE') && isset($_GET['delete_all'])) { if (defined('METACONSOLE') && isset($_GET['delete_all'])) {
$servers = metaconsole_get_servers(); $servers = metaconsole_get_servers();
foreach ($servers as $server) { foreach ($servers as $server) {
// Connect to the remote console // Connect to the remote console.
metaconsole_connect($server); if (metaconsole_connect($server) === NOERR) {
// Delete the user
$result = delete_user($id_user);
if ($result) {
db_pandora_audit(
'User management',
__('Deleted user %s from metaconsole', io_safe_input($id_user))
);
}
// Delete the user // Restore the db connection.
$result = delete_user($id_user); metaconsole_restore_db();
if ($result) {
db_pandora_audit(
'User management',
__('Deleted user %s from metaconsole', io_safe_input($id_user))
);
} }
// Restore the db connection
metaconsole_restore_db();
// Log to the metaconsole too // Log to the metaconsole too
if ($result) { if ($result) {
db_pandora_audit( db_pandora_audit(
@ -613,7 +613,9 @@ foreach ($info as $user_id => $user_info) {
$data[6] .= '<a href="index.php?sec='.$sec.'&amp;sec2=godmode/users/configure_user&pure='.$pure.'&amp;id='.$user_id.'">'.html_print_image('images/config.png', true, ['title' => __('Edit')]).'</a>'; $data[6] .= '<a href="index.php?sec='.$sec.'&amp;sec2=godmode/users/configure_user&pure='.$pure.'&amp;id='.$user_id.'">'.html_print_image('images/config.png', true, ['title' => __('Edit')]).'</a>';
if ($config['admin_can_delete_user'] && $user_info['id_user'] != $config['id_user'] && !isset($user_info['not_delete'])) { if ($config['admin_can_delete_user'] && $user_info['id_user'] != $config['id_user'] && !isset($user_info['not_delete'])) {
$data[6] .= "<a href='index.php?sec=".$sec.'&sec2=godmode/users/user_list&user_del=1&pure='.$pure.'&delete_user='.$user_info['id_user']."'>".html_print_image('images/cross.png', true, ['title' => __('Delete'), 'onclick' => "if (! confirm ('".__('Deleting User').' '.$user_info['id_user'].'. '.__('Are you sure?')."')) return false"]).'</a>'; $data[6] .= "<a href='index.php?sec=".$sec.'&sec2=godmode/users/user_list&user_del=1&pure='.$pure.'&delete_user='.$user_info['id_user']."'>".html_print_image('images/cross.png', true, ['title' => __('Delete'), 'onclick' => "if (! confirm ('".__('Deleting User').' '.$user_info['id_user'].'. '.__('Are you sure?')."')) return false"]).'</a>';
if (defined('METACONSOLE')) { if ((bool) is_metaconsole() === true
&& (bool) can_user_access_node() === true
) {
$data[6] .= "<a href='index.php?sec=".$sec.'&sec2=godmode/users/user_list&user_del=1&pure='.$pure.'&delete_user='.$user_info['id_user']."&delete_all=1'>".html_print_image('images/cross_double.png', true, ['title' => __('Delete from all consoles'), 'onclick' => "if (! confirm ('".__('Deleting User %s from all consoles', $user_info['id_user']).'. '.__('Are you sure?')."')) return false"]).'</a>'; $data[6] .= "<a href='index.php?sec=".$sec.'&sec2=godmode/users/user_list&user_del=1&pure='.$pure.'&delete_user='.$user_info['id_user']."&delete_all=1'>".html_print_image('images/cross_double.png', true, ['title' => __('Delete from all consoles'), 'onclick' => "if (! confirm ('".__('Deleting User %s from all consoles', $user_info['id_user']).'. '.__('Are you sure?')."')) return false"]).'</a>';
} }
} else { } else {

View File

@ -1436,15 +1436,21 @@ if ($get_extended_event) {
$related = events_page_related($event, $server); $related = events_page_related($event, $server);
} }
$connected = true;
if ($meta) { if ($meta) {
metaconsole_connect($server); if (metaconsole_connect($server) === NOERR) {
$connected = true;
} else {
$connected = false;
}
} }
$custom_fields = events_page_custom_fields($event); if ($connected === true) {
$custom_fields = events_page_custom_fields($event);
$custom_data = events_page_custom_data($event);
}
$custom_data = events_page_custom_data($event); if ($meta && $connected === true) {
if ($meta) {
metaconsole_restore_db(); metaconsole_restore_db();
} }

View File

@ -2850,7 +2850,11 @@ function can_user_access_node()
{ {
global $config; global $config;
$userinfo = get_user_info($config['id_user']); static $userinfo;
if ($userinfo === null) {
$userinfo = get_user_info($config['id_user']);
}
if (is_metaconsole()) { if (is_metaconsole()) {
return $userinfo['is_admin'] == 1 ? 1 : $userinfo['metaconsole_access_node']; return $userinfo['is_admin'] == 1 ? 1 : $userinfo['metaconsole_access_node'];