From 6fc32123543416dff79f9b095357c5de6805cfd4 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Tue, 16 Sep 2014 15:31:47 -0400
Subject: Follow 2.2 and change 8hour->eighthour and 4year->fouryear to avoid
 having a numeral start an ID. Add some code so it will fix up existing values
 as they are changed.

---
 config/mailreport/mail_reports.inc                 | 17 +++++++++++++++--
 config/mailreport/mailreport.xml                   |  2 +-
 config/mailreport/status_mail_report_add_graph.php |  7 ++++---
 pkg_config.10.xml                                  |  2 +-
 pkg_config.8.xml                                   |  2 +-
 pkg_config.8.xml.amd64                             |  2 +-
 6 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/config/mailreport/mail_reports.inc b/config/mailreport/mail_reports.inc
index 0119457a..6dddf7cd 100644
--- a/config/mailreport/mail_reports.inc
+++ b/config/mailreport/mail_reports.inc
@@ -35,13 +35,13 @@ require_once("filter.inc");
 require_once("rrd.inc");
 
 $graph_length = array(
-	"8hour" => 28800,
+	"eighthour" => 28800,
 	"day" => 86400,
 	"week" => 604800,
 	"month" => 2764800,
 	"quarter" => 8035200,
 	"year" => 31622400,
-	"4year" => 126489600);
+	"fouryear" => 126489600);
 
 $logfile_friendly = array(
 	"dhcpd"      => "DHCP",
@@ -88,6 +88,7 @@ function get_dates($curperiod, $graph) {
 				$offset = 0;
 		}
 		switch($graph) {
+			case "eighthour":
 			case "8hour":
 				if($curhour < 24)
 					$starthour = 16;
@@ -142,6 +143,7 @@ function get_dates($curperiod, $graph) {
 				if($offset != 0)
 					$end = mktime(0, 0, 0, 1, 0, (($curyear + $offset) +1));
 				break;
+			case "fouryear":
 			case "4year":
 				$start = mktime(0, 0, 0, 1, 0, (($curyear - 3) + $offset));
 				if($offset != 0)
@@ -1263,4 +1265,15 @@ function get_friendly_log_name($logfile) {
 	return $friendly;
 }
 
+function fixup_graph_timespan($timespan) {
+	switch ($timespan) {
+		case "8hour":
+			return "eighthour";
+		case "4year":
+			return "fouryear";
+		default:
+			return $timespan;
+	}
+}
+
 ?>
diff --git a/config/mailreport/mailreport.xml b/config/mailreport/mailreport.xml
index 9239f82e..803e205b 100644
--- a/config/mailreport/mailreport.xml
+++ b/config/mailreport/mailreport.xml
@@ -37,7 +37,7 @@
 		]]>
 	</copyright>
 	<name>mailreport</name>
-	<version>2.0.12</version>
+	<version>2.1</version>
 	<title>Status: Email Reports</title>
 	<additional_files_needed>
 		<prefix>/usr/local/bin/</prefix>
diff --git a/config/mailreport/status_mail_report_add_graph.php b/config/mailreport/status_mail_report_add_graph.php
index 3f629d56..d6f0d362 100644
--- a/config/mailreport/status_mail_report_add_graph.php
+++ b/config/mailreport/status_mail_report_add_graph.php
@@ -130,16 +130,16 @@ $custom_databases = array_merge($dbheader_custom, $databases);
 
 $styles = array('inverse' => gettext('Inverse'),
 		'absolute' => gettext('Absolute'));
-$graphs = array("8hour", "day", "week", "month", "quarter", "year", "4year");
+$graphs = array("eighthour", "day", "week", "month", "quarter", "year", "fouryear");
 $periods = array("absolute" => gettext("Absolute Timespans"), "current" => gettext("Current Period"), "previous" => gettext("Previous Period"));
 $graph_length = array(
-	"8hour" => 28800,
+	"eighthour" => 28800,
 	"day" => 86400,
 	"week" => 604800,
 	"month" => 2764800,
 	"quarter" => 8035200,
 	"year" => 31622400,
-	"4year" => 126489600);
+	"fouryear" => 126489600);
 
 if ($_POST) {
 	unset($_POST['__csrf_magic']);
@@ -219,6 +219,7 @@ include("head.inc");
 				<select name="timespan" class="formselect" style="z-index: -10;">
 				<?php
 				foreach (array_keys($graph_length) as $timespan) {
+					$pconfig['timespan'] = fixup_graph_timespan($pconfig['timespan']);
 					echo "<option value=\"$timespan\"";
 					if ($timespan == $pconfig['timespan']) echo " selected";
 					echo ">" . htmlspecialchars(ucwords($timespan)) . "</option>\n";
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 775050dc..bb594d46 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1249,7 +1249,7 @@
 		<name>mailreport</name>
 		<descr>Allows you to setup periodic e-mail reports containing command output, log file contents, and RRD graphs.</descr>
 		<category>Network Management</category>
-		<version>2.0.12</version>
+		<version>2.1</version>
 		<status>Stable</status>
 		<required_version>2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/mailreport/mailreport.xml</config_file>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 52cf7772..b1cbf799 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1635,7 +1635,7 @@
 		<name>mailreport</name>
 		<descr>Allows you to setup periodic e-mail reports containing command output, log file contents, and RRD graphs.</descr>
 		<category>Network Management</category>
-		<version>2.0.12</version>
+		<version>2.1</version>
 		<status>Stable</status>
 		<required_version>2.0</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/mailreport/mailreport.xml</config_file>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index b06a4747..085493c2 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1622,7 +1622,7 @@
 		<name>mailreport</name>
 		<descr>Allows you to setup periodic e-mail reports containing command output, log file contents, and RRD graphs.</descr>
 		<category>Network Management</category>
-		<version>2.0.12</version>
+		<version>2.1</version>
 		<status>Stable</status>
 		<required_version>2.0</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/mailreport/mailreport.xml</config_file>
-- 
cgit v1.2.3