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

Merge branch '1156-Serialize_data_en_metaconsola_no_funciona' into 'develop' 

fixed errors metaconsole reports serialize data

See merge request !712
This commit is contained in:
vgilc 2017-08-14 12:24:43 +02:00
parent 90644f1805 c4171ac248
commit aa54f0cc9a
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pandora_console/include/functions_reporting.php
View File

@ -2447,7 +2447,14 @@ function reporting_database_serialized($report, $content) {
$return['agent_name'] = $agent_name;
$return['module_name'] = $module_name;
if ($config['metaconsole']) {
$id_meta = metaconsole_get_id_server($content["server_name"]);
$server = metaconsole_get_connection_by_id ($id_meta);
metaconsole_connect($server);
}
$datelimit = $report["datetime"] - $content['period'];
$search_in_history_db = db_search_in_history_db($datelimit);
@ -2523,6 +2530,10 @@ function reporting_database_serialized($report, $content) {
$data[] = $row;
}
}
if ($config['metaconsole']) {
metaconsole_restore_db();
}
$return["data"] = $data;