tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones

Browse Source
This commit is contained in:
Jose Gonzalez 2023-02-27 09:55:59 +01:00
commit 6f16c45285
1 changed files with 49 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pandora_console/operation/agentes/status_monitor.php
View File

@ -366,7 +366,7 @@ if ($module_option !== 0) {
} }
} }
if ($datatype != '') { if (empty($datatype) === false) {
$sql_conditions .= sprintf(' AND ttipo_modulo.id_tipo '.$condition_query.' '.$datatype); $sql_conditions .= sprintf(' AND ttipo_modulo.id_tipo '.$condition_query.' '.$datatype);
} }
@ -1265,15 +1265,15 @@ switch ($sortField) {
break; break;
} }
$sql = 'SELECT $sql = 'SELECT
(SELECT GROUP_CONCAT(ttag.name SEPARATOR \',\') (SELECT GROUP_CONCAT(ttag.name SEPARATOR \',\')
FROM ttag FROM ttag
WHERE ttag.id_tag IN ( WHERE ttag.id_tag IN (
SELECT ttag_module.id_tag SELECT ttag_module.id_tag
FROM ttag_module FROM ttag_module
WHERE ttag_module.id_agente_modulo = tagente_modulo.id_agente_modulo)) WHERE ttag_module.id_agente_modulo = tagente_modulo.id_agente_modulo
AS tags, )
) AS tags,
tagente_modulo.id_agente_modulo, tagente_modulo.id_agente_modulo,
tagente_modulo.id_modulo, tagente_modulo.id_modulo,
tagente.intervalo AS agent_interval, tagente.intervalo AS agent_interval,
@ -1394,12 +1394,6 @@ if ($autosearch) {
} }
} }
// Oracle legacy code.
// if (($config['dbtype'] == 'oracle') && ($result !== false)) {
// for ($i = 0; $i < count($result); $i++) {
// unset($result[$i]['rnum']);
// }
// }
// Urls to sort the table. // Urls to sort the table.
$url_agent_name = 'index.php?sec='.$section.'&sec2=operation/agentes/status_monitor'; $url_agent_name = 'index.php?sec='.$section.'&sec2=operation/agentes/status_monitor';
$url_type = 'index.php?sec='.$section.'&sec2=operation/agentes/status_monitor'; $url_type = 'index.php?sec='.$section.'&sec2=operation/agentes/status_monitor';
@ -1435,7 +1429,6 @@ if ($autosearch) {
$url_timestamp_up .= '&recursion='.$recursion; $url_timestamp_up .= '&recursion='.$recursion;
$url_timestamp_down .= '&recursion='.$recursion; $url_timestamp_down .= '&recursion='.$recursion;
$url_agent_name .= '&sort_field=agent_alias&sort='; $url_agent_name .= '&sort_field=agent_alias&sort=';
$url_type .= '&sort_field=type&sort='; $url_type .= '&sort_field=type&sort=';
$url_module_name .= '&sort_field=module_name&sort='; $url_module_name .= '&sort_field=module_name&sort=';
@ -1472,7 +1465,6 @@ if (empty($result) === false) {
$show_fields = explode(',', $config['status_monitor_fields']); $show_fields = explode(',', $config['status_monitor_fields']);
if (in_array('policy', $show_fields)) { if (in_array('policy', $show_fields)) {
if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) { if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
$table->head[0] = '<span title=\''.__('Policy').'\'>'.__('P.').'</span>'; $table->head[0] = '<span title=\''.__('Policy').'\'>'.__('P.').'</span>';