From 0daeb906f100ded397ffd4d33e3fdaa05a4280d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= Date: Tue, 6 Sep 2022 14:58:38 +0200 Subject: [PATCH 1/8] WIP --- .../operation/agentes/status_monitor.php | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index 7f78680d9a..c39b2cabf3 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -1216,6 +1216,35 @@ if ($autosearch) { $result = array_merge($result, $result_server); } + + /** + * 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 === 'up') { + if (is_string($a[$sortField]) === true) { + return strnatcmp($a[$sortField], $b[$sortField]); + } else { + return ($a[$sortField] - $b[$sortField]); + } + } else { + if (is_string($a[$sortField]) === true) { + return strnatcmp($b[$sortField], $a[$sortField]); + } else { + return ($a[$sortField] + $b[$sortField]); + } + } + }; + } + + + usort($result, arrayOutputSorting($sort, $sortField)); + metaconsole_restore_db(); } From 68654804b4be4d8e4f2e2b1412f88c0ac8193047 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= Date: Wed, 14 Sep 2022 17:18:39 +0200 Subject: [PATCH 2/8] Fixed minor issue --- pandora_console/include/functions.php | 28 +++++++++++++++++++ .../operation/agentes/status_monitor.php | 27 ------------------ 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index ca958dd4a3..f206800c61 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -6217,3 +6217,31 @@ function notify_reporting_console_node() return $return; } + + +/** + * Auxiliar Ordenation function + * + * @param string $sort Direction of sort. + * @param string $sortField Field for perform the sorting. + * + * @return mixed + */ +function arrayOutputSorting($sort, $sortField) +{ + return function ($a, $b) use ($sort, $sortField) { + if ($sort === 'up') { + if (is_string($a[$sortField]) === true) { + return strnatcmp($a[$sortField], $b[$sortField]); + } else { + return ($a[$sortField] - $b[$sortField]); + } + } else { + if (is_string($a[$sortField]) === true) { + return strnatcmp($b[$sortField], $a[$sortField]); + } else { + return ($a[$sortField] + $b[$sortField]); + } + } + }; +} diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index c39b2cabf3..bff5c006f3 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -1216,33 +1216,6 @@ if ($autosearch) { $result = array_merge($result, $result_server); } - - /** - * 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 === 'up') { - if (is_string($a[$sortField]) === true) { - return strnatcmp($a[$sortField], $b[$sortField]); - } else { - return ($a[$sortField] - $b[$sortField]); - } - } else { - if (is_string($a[$sortField]) === true) { - return strnatcmp($b[$sortField], $a[$sortField]); - } else { - return ($a[$sortField] + $b[$sortField]); - } - } - }; - } - - usort($result, arrayOutputSorting($sort, $sortField)); metaconsole_restore_db(); From 2a63f19d38b47f09027dde2c2b91a04b8b9bbad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= Date: Tue, 20 Sep 2022 11:13:02 +0200 Subject: [PATCH 3/8] Fix --- pandora_console/include/functions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index f206800c61..381ec23d9c 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -6232,13 +6232,13 @@ function arrayOutputSorting($sort, $sortField) return function ($a, $b) use ($sort, $sortField) { if ($sort === 'up') { if (is_string($a[$sortField]) === true) { - return strnatcmp($a[$sortField], $b[$sortField]); + return strcasecmp($a[$sortField], $b[$sortField]); } else { return ($a[$sortField] - $b[$sortField]); } } else { if (is_string($a[$sortField]) === true) { - return strnatcmp($b[$sortField], $a[$sortField]); + return strcasecmp($b[$sortField], $a[$sortField]); } else { return ($a[$sortField] + $b[$sortField]); } From 1460e63f22b722a27b6bcf48cefff4cce5d1f9b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= <79-jose.gonzalez@users.noreply.brutus.artica.es> Date: Tue, 20 Sep 2022 09:20:46 +0000 Subject: [PATCH 4/8] Fix --- pandora_console/include/functions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index f206800c61..381ec23d9c 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -6232,13 +6232,13 @@ function arrayOutputSorting($sort, $sortField) return function ($a, $b) use ($sort, $sortField) { if ($sort === 'up') { if (is_string($a[$sortField]) === true) { - return strnatcmp($a[$sortField], $b[$sortField]); + return strcasecmp($a[$sortField], $b[$sortField]); } else { return ($a[$sortField] - $b[$sortField]); } } else { if (is_string($a[$sortField]) === true) { - return strnatcmp($b[$sortField], $a[$sortField]); + return strcasecmp($b[$sortField], $a[$sortField]); } else { return ($a[$sortField] + $b[$sortField]); } From 09c6c5a0f90a370adfdfaf5ee40ae3833f83c876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= Date: Fri, 23 Sep 2022 12:54:51 +0200 Subject: [PATCH 5/8] Fix --- pandora_console/operation/agentes/status_monitor.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index bff5c006f3..0d810f3edb 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -899,6 +899,7 @@ $order = null; switch ($sortField) { case 'agent_alias': + $fieldForSorting = 'alias'; switch ($sort) { case 'up': $selectAgentNameUp = $selected; @@ -919,6 +920,7 @@ switch ($sortField) { break; case 'type': + $fieldForSorting = 'id_tipo_modulo'; switch ($sort) { case 'up': $selectDataTypeUp = $selected; @@ -939,6 +941,7 @@ switch ($sortField) { break; case 'moduletype': + $fieldForSorting = 'id_modulo'; switch ($sort) { case 'up': $selectTypeUp = $selected; @@ -959,6 +962,7 @@ switch ($sortField) { break; case 'module_name': + $fieldForSorting = 'nombre'; switch ($sort) { case 'up': $selectModuleNameUp = $selected; @@ -979,6 +983,7 @@ switch ($sortField) { break; case 'interval': + $fieldForSorting = 'module_interval'; switch ($sort) { case 'up': $selectIntervalUp = $selected; @@ -999,6 +1004,7 @@ switch ($sortField) { break; case 'status': + $fieldForSorting = 'estado'; switch ($sort) { case 'up': $selectStatusUp = $selected; @@ -1019,6 +1025,7 @@ switch ($sortField) { break; case 'last_status_change': + $fieldForSorting = 'last_status_change'; switch ($sort) { case 'up': $selectStatusUp = $selected; @@ -1039,6 +1046,7 @@ switch ($sortField) { break; case 'timestamp': + $fieldForSorting = 'utimestamp'; switch ($sort) { case 'up': $selectTimestampUp = $selected; @@ -1059,6 +1067,7 @@ switch ($sortField) { break; case 'data': + $fieldForSorting = 'datos'; switch ($sort) { case 'up': $selectDataUp = $selected; @@ -1079,6 +1088,7 @@ switch ($sortField) { break; default: + $fieldForSorting = 'alias'; $selectAgentNameUp = $selected; $selectAgentNameDown = false; $selectDataTypeUp = false; @@ -1216,7 +1226,7 @@ if ($autosearch) { $result = array_merge($result, $result_server); } - usort($result, arrayOutputSorting($sort, $sortField)); + usort($result, arrayOutputSorting($sort, $fieldForSorting)); metaconsole_restore_db(); } From 1ae6267acca7e5de8f2db277e9fd56af8e77cd5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= Date: Tue, 27 Sep 2022 11:14:18 +0200 Subject: [PATCH 6/8] Fix issue with agent_alias --- pandora_console/operation/agentes/status_monitor.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index 0d810f3edb..bd84af1d8f 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -899,7 +899,7 @@ $order = null; switch ($sortField) { case 'agent_alias': - $fieldForSorting = 'alias'; + $fieldForSorting = 'agent_alias'; switch ($sort) { case 'up': $selectAgentNameUp = $selected; @@ -1088,7 +1088,7 @@ switch ($sortField) { break; default: - $fieldForSorting = 'alias'; + $fieldForSorting = 'agent_alias'; $selectAgentNameUp = $selected; $selectAgentNameDown = false; $selectDataTypeUp = false; From f8efbc5fce6ac5ec19d33cca3526d726c29c887c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= Date: Wed, 28 Sep 2022 16:29:18 +0200 Subject: [PATCH 7/8] Fixed issue with module name --- pandora_console/operation/agentes/status_monitor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index bd84af1d8f..e5ce270125 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -962,7 +962,7 @@ switch ($sortField) { break; case 'module_name': - $fieldForSorting = 'nombre'; + $fieldForSorting = 'module_name'; switch ($sort) { case 'up': $selectModuleNameUp = $selected; From a4be805ba4d1657fa2489b4723e499c253d24445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Gonz=C3=A1lez?= Date: Thu, 29 Sep 2022 00:24:31 +0200 Subject: [PATCH 8/8] Fix --- pandora_console/operation/agentes/status_monitor.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index e5ce270125..320282e403 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -920,7 +920,7 @@ switch ($sortField) { break; case 'type': - $fieldForSorting = 'id_tipo_modulo'; + $fieldForSorting = 'module_type'; switch ($sort) { case 'up': $selectDataTypeUp = $selected; @@ -941,7 +941,7 @@ switch ($sortField) { break; case 'moduletype': - $fieldForSorting = 'id_modulo'; + $fieldForSorting = 'module_type'; switch ($sort) { case 'up': $selectTypeUp = $selected; @@ -1112,6 +1112,7 @@ switch ($sortField) { break; } + $sql = 'SELECT (SELECT GROUP_CONCAT(ttag.name SEPARATOR \',\') FROM ttag