When viewing graph data, non-numeric values may appear (#4461)

Closes #4461
Cacti · Nov 14, 2021 · 9b9754e · 9b9754e
1 parent d1c1380
commit 9b9754e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -5,6 +5,7 @@ Cacti CHANGELOG
 -issue#4451: Remote pollers may not get settings when system-wide polling is turn off
 -issue#4455: When updating poller name, matches may be too wide in scope
 -issue#4458: MIB Cache column check causes poller crash under PHP 8.x
+-issue#4461: When viewing graph data, non-numeric values may appear
 
 1.2.19
 -security#4356: Further fixes for grave character security protection

diff --git a/graph_xport.php b/graph_xport.php
@@ -262,13 +262,18 @@
 			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>";
 
 			for ($i = 1; $i <= $xport_array['meta']['columns']; $i++) {
-				if ($row['col' . $i] > 1) {
-					print "<td class='right'>" . trim(number_format_i18n(round($row['col' . $i],3),2,$graph_info['base_value'])) . '</td>';
-				} elseif($row['col' . $i] == 0) {
-					print "<td class='right'>-</td>";
+				$row_data = floatval($row['col'.$i]);
+				if ($row_data > 1) {
+					$row_data = trim(number_format_i18n(round($row_data,3),2,$graph_info['base_value']));
+				} elseif($row_data == 0) {
+					$row_data = '-';
+					if (!is_numeric($row['col'.$i])) {
+						$row_data .= '(unexpected: ' . $row['col'.$i].')';
+					}
 				} else {
-					print "<td class='right'>" . round($row['col' . $i],4) . '</td>';
+					$row_data = trim(number_format_i18n(round($row_data,5),4));
 				}
+				print "<td class='right'>$row_data</td>";
 			}
 
 			print "</tr>\n";