diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index f4dfe62fbf..4f048e3e8f 100644 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -98,7 +98,7 @@ function reporting_get_name($id_report) { function reporting_make_reporting_data($report = null, $id_report, $date, $time, $period = null, $type = 'dinamic', - $force_width_chart = null, $force_height_chart = null) { + $force_width_chart = null, $force_height_chart = null, $pdf= false) { global $config; @@ -164,7 +164,8 @@ function reporting_make_reporting_data($report = null, $id_report, case 'availability_graph': $report['contents'][] = reporting_availability_graph( $report, - $content); + $content, + $pdf); break; case 'sql': $report['contents'][] = reporting_sql( @@ -4973,10 +4974,14 @@ function reporting_availability($report, $content, $date=false, $time=false) { * Generates a structure the report. * */ -function reporting_availability_graph($report, $content, $date=false, $time=false) { +function reporting_availability_graph($report, $content, $pdf=false) { global $config; $return = array(); $return['type'] = 'availability_graph'; + $ttl = 1; + if ($pdf){ + $ttl = 2; + } if (empty($content['name'])) { $content['name'] = __('Availability'); @@ -5258,7 +5263,7 @@ function reporting_availability_graph($report, $content, $date=false, $time=fals 1920, 50, $urlImage, - 1, + $ttl, $raw_graph, false); diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php index e537d74f58..c9aacc65e8 100644 --- a/pandora_console/include/functions_reporting_html.php +++ b/pandora_console/include/functions_reporting_html.php @@ -1609,7 +1609,7 @@ function reporting_html_network_interfaces_report($table, $item) { /** * Unified alert report HTML */ -function reporting_html_alert_report($table, $item) { +function reporting_html_alert_report($table, $item, $pdf = 0) { $table->colspan['alerts']['cell'] = 3; $table->cellstyle['alerts']['cell'] = 'text-align: left;'; @@ -1642,25 +1642,25 @@ function reporting_html_alert_report($table, $item) { foreach ($information["alerts"] as $alert) { $row['template'] = $alert["template"]; - $row['actions'] = '