fix CSV export - missing first row and wrong start time (Cacti#5586)

Author: xmacan

graph_xport.php

@@ -247,7 +247,7 @@
 
 if (isset($xport_array['data']) && is_array($xport_array['data'])) {
 	if (!$html) {
-		$j = 1;
+		$j = 0;
 
 		foreach ($xport_array['data'] as $row) {
 			$data = '"' . date('Y-m-d H:i:s', (isset($row['timestamp']) ? $row['timestamp'] : $xport_array['meta']['start'] + $j * $xport_array['meta']['step'])) . '"';
@@ -264,7 +264,7 @@
 		print "\xEF\xBB\xBF";
 		print $output;
 	} else {
-		$j = 1;
+		$j = 0;
 
 		foreach ($xport_array['data'] as $row) {
 			print "<tr><td class='left'>" . date('Y-m-d H:i:s', (isset($row['timestamp']) ? $row['timestamp'] : $xport_array['meta']['start'] + $j * $xport_array['meta']['step'])) . '</td>';

lib/rrd.php

@@ -1624,7 +1624,7 @@ function rrdtool_function_graph($local_graph_id, $rra_id, $graph_data_array, $rr
 	} else {
 		/* basic export options */
 		$graph_opts =
-			'--start=' . cacti_escapeshellarg($graph_start) . RRD_NL .
+			'--start=' . cacti_escapeshellarg($graph_start-1) . RRD_NL .
 			'--end=' . cacti_escapeshellarg($graph_end) . RRD_NL .
 			'--maxrows=10000' . RRD_NL;
 	}