tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-27 15:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-6043-Bug-consultas-metaconsola-con-tablas-ajenas-a-pandora-fms' into 'develop'

Browse Source 
fixed error with sql query pie graph

See merge request artica/pandorafms!3466
This commit is contained in:
Daniel Rodriguez 2020-10-08 11:54:10 +02:00
commit fc7b096fd1
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pandora_console/include/functions_graph.php
View File

@ -3718,7 +3718,7 @@ function grafico_eventos_usuario($width, $height)
* @param integer Graph type 1 vbar, 2 hbar, 3 pie * @param integer Graph type 1 vbar, 2 hbar, 3 pie
*/ */
function graph_custom_sql_graph( function graph_custom_sql_graph(
$id, $content,
$width, $width,
$height, $height,
$type='sql_graph_vbar', $type='sql_graph_vbar',
@ -3731,26 +3731,29 @@ function graph_custom_sql_graph(
$SQL_GRAPH_MAX_LABEL_SIZE = 20; $SQL_GRAPH_MAX_LABEL_SIZE = 20;
if (is_metaconsole()) { if (is_metaconsole() && $content['server_name'] !== '0') {
$server = metaconsole_get_connection_names(); $server = metaconsole_get_connection_names();
$connection = metaconsole_get_connection($server); $connection = metaconsole_get_connection($server);
metaconsole_connect($connection); metaconsole_connect($connection);
} }
$report_content = db_get_row('treport_content', 'id_rc', $id); $report_content = db_get_row('treport_content', 'id_rc', $content['id_rc']);
if ($report_content == false || $report_content == '') { if ($report_content == false || $report_content == '') {
$report_content = db_get_row('treport_content_template', 'id_rc', $id); $report_content = db_get_row('treport_content_template', 'id_rc', $content['id_rc']);
} }
if ($report_content == false || $report_content == '') { if ($report_content == false || $report_content == '') {
if (is_metaconsole() && $content['server_name'] !== '0') {
enterprise_hook('metaconsole_restore_db'); enterprise_hook('metaconsole_restore_db');
$report_content = db_get_row('treport_content', 'id_rc', $id);
if ($report_content == false || $report_content == '') {
$report_content = db_get_row('treport_content_template', 'id_rc', $id);
} }
if (is_metaconsole()) { $report_content = db_get_row('treport_content', 'id_rc', $content['id_rc']);
if ($report_content == false || $report_content == '') {
$report_content = db_get_row('treport_content_template', 'id_rc', $content['id_rc']);
}
if ((is_metaconsole() & $content['server_name']) !== '0') {
$server = metaconsole_get_connection_names(); $server = metaconsole_get_connection_names();
$connection = metaconsole_get_connection($server); $connection = metaconsole_get_connection($server);
metaconsole_connect($connection); metaconsole_connect($connection);
@ -3758,7 +3761,7 @@ function graph_custom_sql_graph(
} }
if ($id != null) { if ($id != null) {
$historical_db = db_get_value_sql('SELECT historical_db from treport_content where id_rc ='.$id); $historical_db = db_get_value_sql('SELECT historical_db from treport_content where id_rc ='.$content['id_rc']);
} else { } else {
$historical_db = $content['historical_db']; $historical_db = $content['historical_db'];
} }
@ -3772,7 +3775,7 @@ function graph_custom_sql_graph(
$data_result = db_get_all_rows_sql($sql, $historical_db); $data_result = db_get_all_rows_sql($sql, $historical_db);
if (is_metaconsole()) { if ((is_metaconsole() & $content['server_name']) !== '0') {
enterprise_hook('metaconsole_restore_db'); enterprise_hook('metaconsole_restore_db');
} }

2
pandora_console/include/functions_reporting.php
View File

@ -4462,7 +4462,7 @@ function reporting_sql_graph(
case 'dinamic': case 'dinamic':
case 'static': case 'static':
$return['chart'] = graph_custom_sql_graph( $return['chart'] = graph_custom_sql_graph(
$content['id_rc'], $content,
$width, $width,
$height, $height,
$content['type'], $content['type'],