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

2011-09-12 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* include/functions_reporting.php: Fixed bad condition in serialized
        reports code.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4934 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2011-09-12 10:01:42 +00:00
parent 607a9dea3c
commit 2018c1f8b0
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2011-09-12 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_reporting.php: Fixed bad condition in serialized
reports code.
2011-09-11 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_action_threshold.php: Added a new help file.

7
pandora_console/include/functions_reporting.php
View File

@ -2725,14 +2725,15 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
WHERE id_agente_modulo = ' . $content['id_agent_module'] . '
AND utimestamp > ' . $datelimit . '
AND utimestamp <= ' . $report["datetime"]);
// Adds string data if there is no numeric data
if ((count($result) >= 0) or (!$result)){
if ((count($result) < 0) or (!$result)){
$result = db_get_all_rows_sql('SELECT *
FROM tagente_datos_string
WHERE id_agente_modulo = ' . $content['id_agent_module'] . '
AND utimestamp > ' . $datelimit . '
AND utimestamp <= ' . $report["datetime"]);
}
}
if ($result === false) {
$result = array();
}
@ -2740,7 +2741,7 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
$table2->data = array();
foreach ($result as $row) {
$date = date ($config["date_format"], $row['utimestamp']);
$serialized = $row['datos'];
$serialized = $row['datos'];
$rowsUnserialize = explode($content['line_separator'], $serialized);
foreach ($rowsUnserialize as $rowUnser) {
$columnsUnserialize = explode($content['column_separator'], $rowUnser);