tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add new macros #3763

This commit is contained in:
Daniel Barbero Martin 2022-01-19 12:18:23 +01:00
parent a86ddc043f
commit 6be6b1a95d
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/ajax/module.php
View File

@ -1396,11 +1396,11 @@ if (check_login()) {
$output .= grafico_modulo_sparse($params); $output .= grafico_modulo_sparse($params);
} }
echo $output;
if (is_metaconsole() === true && empty($server_id) === false) { if (is_metaconsole() === true && empty($server_id) === false) {
metaconsole_restore_db(); metaconsole_restore_db();
} }
echo $output;
return; return;
} }

4
pandora_console/include/functions_reporting.php
View File

@ -14165,7 +14165,7 @@ function reporting_module_histogram_graph($report, $content, $pdf=0)
if (modules_is_disable_agent($content['id_agent_module']) if (modules_is_disable_agent($content['id_agent_module'])
|| modules_is_not_init($content['id_agent_module']) || modules_is_not_init($content['id_agent_module'])
) { ) {
if ($metaconsole_on) { if ($metaconsole_on && $server_name != '') {
// Restore db connection. // Restore db connection.
metaconsole_restore_db(); metaconsole_restore_db();
} }
@ -14429,7 +14429,7 @@ function reporting_module_histogram_graph($report, $content, $pdf=0)
); );
} }
if ($metaconsole_on) { if ($metaconsole_on && $server_name != '') {
// Restore db connection. // Restore db connection.
metaconsole_restore_db(); metaconsole_restore_db();
} }

2
pandora_console/include/javascript/tree/TreeController.js
View File

@ -990,7 +990,7 @@ var TreeController = {
typeof element.showGraphs != "undefined" && typeof element.showGraphs != "undefined" &&
element.showGraphs != 0 element.showGraphs != 0
) { ) {
// Graph hisstogram pop-up // Graph histogram pop-up
if (typeof element.histogramGraph != "undefined") { if (typeof element.histogramGraph != "undefined") {
var graphImageHistogram = $( var graphImageHistogram = $(
'<img src="' + '<img src="' +

8
pandora_console/operation/agentes/stat_win.php
View File

@ -504,7 +504,13 @@ ui_print_message_dialog(
); );
$menu_form .= '</span>'; $menu_form .= '</span>';
$menu_form .= '</div>'; $menu_form .= '</div>';
$menu_form .= '<div class="module_graph_menu_content module_graph_menu_content_closed invisible">';
$class = 'module_graph_menu_content';
if ($histogram === false) {
$class .= ' module_graph_menu_content_closed invisible';
}
$menu_form .= '<div class="'.$class.'">';
$menu_form .= $form_table; $menu_form .= $form_table;
$menu_form .= '</div>'; $menu_form .= '</div>';
$menu_form .= '</div>'; $menu_form .= '</div>';