diff --git a/pandora_console/include/ajax/alert_list.ajax.php b/pandora_console/include/ajax/alert_list.ajax.php index 6c16e9595d..227435858f 100644 --- a/pandora_console/include/ajax/alert_list.ajax.php +++ b/pandora_console/include/ajax/alert_list.ajax.php @@ -900,13 +900,13 @@ if ($get_agent_alerts_datatable === true) { return function ($a, $b) use ($sort, $sortField) { if ($sort === 'asc') { if (is_string($a[$sortField]) === true) { - return strcmp($a[$sortField], $b[$sortField]); + return strnatcasecmp($a[$sortField], $b[$sortField]); } else { return ($a[$sortField] - $b[$sortField]); } } else { if (is_string($a[$sortField]) === true) { - return strcmp($b[$sortField], $a[$sortField]); + return strnatcasecmp($b[$sortField], $a[$sortField]); } else { return ($a[$sortField] + $b[$sortField]); } @@ -916,7 +916,7 @@ if ($get_agent_alerts_datatable === true) { usort($alerts['alerts_simple'], arrayOutputSorting($sort, $sortField)); - $data = array_slice($alerts['alerts_simple'], $start, $length); + $alerts['alerts_simple'] = array_slice($alerts['alerts_simple'], $start, $length); } $data = []; diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index d30171eba3..c368782489 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -1075,7 +1075,7 @@ function ui_format_alert_row( } } - if (is_metaconsole() === true) { + if (is_metaconsole() === true && (int) $server_id !== 0) { $server = db_get_row('tmetaconsole_setup', 'id', $alert['server_data']['id']); if (metaconsole_connect($server) == NOERR) { diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php index 9dcc079baf..4c2fa2bc73 100755 --- a/pandora_console/operation/agentes/alerts_status.php +++ b/pandora_console/operation/agentes/alerts_status.php @@ -359,7 +359,7 @@ if ($free_search != '') { ], 'drawCallback' => 'alerts_table_controls()', 'order' => [ - 'field' => 'module_name', + 'field' => 'agent_module_name', 'direction' => 'asc', ], 'zeroRecords' => __('No alerts found'), @@ -400,7 +400,7 @@ if ($free_search != '') { ], 'drawCallback' => 'alerts_table_controls()', 'order' => [ - 'field' => 'module', + 'field' => 'agent_module_name', 'direction' => 'asc', ], 'zeroRecords' => __('No alerts found'),