Make RRD lists global, validate graph name using whitelist of known values rather than blacklist of characters, beef up validation and escaping of related values while here. Fixes #5874 for 2.3

1 files changed, 17 insertions, 0 deletions

diff --git a/src/etc/inc/rrd.inc b/src/etc/inc/rrd.inc
index 11a626e..ff1d3e1 100644
--- a/src/etc/inc/rrd.inc
+++ b/src/etc/inc/rrd.inc
@@ -54,6 +54,23 @@
 
 /* include all configuration functions */
 
+global $rrd_graph_list;
+$rrd_graph_list = array("eighthour", "day", "week", "month", "quarter", "year", "fouryear");
+global $rrd_period_list;
+$rrd_period_list = array("absolute" => gettext("Absolute Timespans"), "current" => gettext("Current Period"), "previous" => gettext("Previous Period"));
+global $rrd_graph_length_list;
+$rrd_graph_length_list = array(
+	"eighthour" => 28800,
+	"day" => 86400,
+	"week" => 604800,
+	"month" => 2678400,
+	"quarter" => 7948800,
+	"year" => 31622400,
+	"fouryear" => 126230400);
+global $rrd_style_list;
+$rrd_style_list = array('inverse' => gettext('Inverse'),
+		'absolute' => gettext('Absolute'));
+
 function dump_rrd_to_xml($rrddatabase, $xmldumpfile) {
 	$rrdtool = "/usr/bin/nice -n20 /usr/local/bin/rrdtool";
 	unlink_if_exists($xmldumpfile);