diff --git a/pandora_console/include/ajax/alert_list.ajax.php b/pandora_console/include/ajax/alert_list.ajax.php index 5b7262be83..ae7ff1501b 100644 --- a/pandora_console/include/ajax/alert_list.ajax.php +++ b/pandora_console/include/ajax/alert_list.ajax.php @@ -892,34 +892,6 @@ if ($get_agent_alerts_datatable === true) { // Order and pagination metacosole. if (is_metaconsole() === true) { - - - /** - * Auxiliar Ordenation function - * - * @param string $sort Direction of sort. - * @param string $sortField Field for perform the sorting. - */ - function arrayOutputSorting($sort, $sortField) - { - return function ($a, $b) use ($sort, $sortField) { - if ($sort === 'asc') { - if (is_string($a[$sortField]) === true) { - return strnatcasecmp($a[$sortField], $b[$sortField]); - } else { - return ($a[$sortField] - $b[$sortField]); - } - } else { - if (is_string($a[$sortField]) === true) { - return strnatcasecmp($b[$sortField], $a[$sortField]); - } else { - return ($a[$sortField] + $b[$sortField]); - } - } - }; - } - - // Status order. if ($sortField === 'status') { foreach ($alerts['alerts_simple'] as $i => $alert) { diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index 381ec23d9c..db89bc3fe4 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -6230,15 +6230,15 @@ function notify_reporting_console_node() function arrayOutputSorting($sort, $sortField) { return function ($a, $b) use ($sort, $sortField) { - if ($sort === 'up') { + if ($sort === 'up' || $sort === 'asc') { if (is_string($a[$sortField]) === true) { - return strcasecmp($a[$sortField], $b[$sortField]); + return strnatcasecmp($a[$sortField], $b[$sortField]); } else { return ($a[$sortField] - $b[$sortField]); } } else { if (is_string($a[$sortField]) === true) { - return strcasecmp($b[$sortField], $a[$sortField]); + return strnatcasecmp($b[$sortField], $a[$sortField]); } else { return ($a[$sortField] + $b[$sortField]); } diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php index fc8446ca08..1e06abbcfc 100755 --- a/pandora_console/operation/agentes/alerts_status.php +++ b/pandora_console/operation/agentes/alerts_status.php @@ -28,7 +28,7 @@ global $config; -// Login check +// Login check. check_login(); if (is_ajax()) { @@ -37,7 +37,7 @@ if (is_ajax()) { $get_alert_fired = get_parameter('get_alert_fired', 0); if ($get_alert_fired) { - // Calculate alerts fired + // Calculate alerts fired. $data_reporting = reporting_get_group_stats(); echo $data_reporting['monitor_alerts_fired']; }