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

Merge branch '1025-bug-with-more-than-6-months-charts-dev' into 'develop' 

Fixed more than 6 months charts

See merge request !591
This commit is contained in:
slerena 2017-06-19 17:50:48 +02:00
parent 24a9370084 687e970c8e
commit c1166f280a
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pandora_console/include/functions_graph.php
View File

@ -256,7 +256,7 @@ function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_i
for ($i = 0; $i <= $resolution; $i++) { for ($i = 0; $i <= $resolution; $i++) {
$timestamp = $datelimit + ($interval * $i); $timestamp = $datelimit + ($interval * $i);
if ($fullscale && $resolution > 250) { if ($fullscale && ($resolution > ($config['graph_res'] * 50))) {
$timestamp = $data[$i]['utimestamp']; $timestamp = $data[$i]['utimestamp'];
} }
@ -360,7 +360,7 @@ function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_i
$time_format = "M \nd H\h"; $time_format = "M \nd H\h";
} }
else { else {
$time_format = "M Y"; $time_format = "Y M \nd H\h";
} }
} }
else { else {
@ -381,7 +381,7 @@ function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_i
$time_format = "M d H\h"; $time_format = "M d H\h";
} }
else { else {
$time_format = "M Y"; $time_format = "Y M d H\h";
} }
} }
@ -1072,7 +1072,8 @@ function graphic_combined_module ($module_list, $weight_list, $period,
$time_format_2 = 'H\h'; $time_format_2 = 'H\h';
} }
else { else {
$time_format = "M Y"; $time_format = "Y M d";
$time_format_2 = 'H\h';
} }
// Set variables // Set variables
@ -1090,7 +1091,6 @@ function graphic_combined_module ($module_list, $weight_list, $period,
while ($in_range) { while ($in_range) {
$timestamp_f = graph_get_formatted_date($j, $time_format, $time_format_2); $timestamp_f = graph_get_formatted_date($j, $time_format, $time_format_2);
//$timestamp_f = date('d M Y H:i:s', $j);
$before_projection[$timestamp_f] = 0; $before_projection[$timestamp_f] = 0;
if ($j > $date) { if ($j > $date) {
@ -4207,7 +4207,7 @@ function graph_netflow_aggregate_area ($data, $period, $width, $height, $unit =
$chart_time_format = "M d H\h"; $chart_time_format = "M d H\h";
} }
else { else {
$chart_time_format = "M Y"; $chart_time_format = "Y M d H\h";
} }
// Calculate source indexes // Calculate source indexes
@ -4336,7 +4336,7 @@ function graph_netflow_total_area ($data, $period, $width, $height, $unit = '',
$chart_time_format = "M d H\h"; $chart_time_format = "M d H\h";
} }
else { else {
$chart_time_format = "M Y"; $chart_time_format = "Y M d H\h";
} }
// Calculate min, max and avg values // Calculate min, max and avg values
@ -4635,7 +4635,7 @@ function grafico_modulo_string ($agent_module_id, $period, $show_events,
$time_format = "M d H\h"; $time_format = "M d H\h";
} }
else { else {
$time_format = "M Y"; $time_format = "Y M d H\h";
} }
$timestamp_short = date($time_format, $timestamp); $timestamp_short = date($time_format, $timestamp);
@ -4813,7 +4813,7 @@ function graphic_module_events ($id_module, $width, $height, $period = 0, $homeu
$time_format = "M d H\h"; $time_format = "M d H\h";
} }
else { else {
$time_format = "M Y"; $time_format = "Y M d H\h";
} }
$legend = array(); $legend = array();