diff options
| author | jim-p <jimp@pfsense.org> | 2014-09-16 15:31:47 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2014-09-16 15:35:21 -0400 |
| commit | 6fc32123543416dff79f9b095357c5de6805cfd4 (patch) | |
| tree | 12cf7f22048cf35ad889e2993da70d0882d26b97 /config | |
| parent | c77104440623b60b8fb2a1d2f09c8c554e3cba68 (diff) | |
| download | pfsense-packages-6fc32123543416dff79f9b095357c5de6805cfd4.tar.gz pfsense-packages-6fc32123543416dff79f9b095357c5de6805cfd4.tar.bz2 pfsense-packages-6fc32123543416dff79f9b095357c5de6805cfd4.zip | |
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.
Diffstat (limited to 'config')
| -rw-r--r-- | config/mailreport/mail_reports.inc | 17 | ||||
| -rw-r--r-- | config/mailreport/mailreport.xml | 2 | ||||
| -rw-r--r-- | config/mailreport/status_mail_report_add_graph.php | 7 |
3 files changed, 20 insertions, 6 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"; |