diff options
author | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-09 09:54:25 -0300 |
---|---|---|
committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-09 09:54:25 -0300 |
commit | c3ff89b45889c4228002807479f9d607fcc98552 (patch) | |
tree | a614ebb692ab312def9d3fea3beaab0cfc4f402d /usr/local/www/status_rrd_graph.php | |
parent | 3dbd3be91272c4fa095c3478ef06a7b004b272ba (diff) | |
parent | c708bdd490c2652ec055b543cc60a7ad391ef63a (diff) | |
download | pfsense-c3ff89b45889c4228002807479f9d607fcc98552.zip pfsense-c3ff89b45889c4228002807479f9d607fcc98552.tar.gz |
Merge remote branch 'mainline/master'
Conflicts:
usr/local/www/status_captiveportal.php
usr/local/www/status_rrd_graph.php
usr/local/www/status_wireless.php
Diffstat (limited to 'usr/local/www/status_rrd_graph.php')
-rwxr-xr-x | usr/local/www/status_rrd_graph.php | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/usr/local/www/status_rrd_graph.php b/usr/local/www/status_rrd_graph.php index d607021..e4ae38b 100755 --- a/usr/local/www/status_rrd_graph.php +++ b/usr/local/www/status_rrd_graph.php @@ -194,7 +194,7 @@ $ui_databases = array_merge($dbheader, $databases); $styles = array('inverse' => gettext('Inverse'), 'absolute' => gettext('Absolute')); -$graphs = array("day", "week", "month", "quarter", "year", "4year"); +$graphs = array("12hour", "day", "week", "month", "quarter", "year", "4year"); $periods = array("current" => gettext("Current Period"), "previous" => gettext("Previous Period")); $pgtitle = array(gettext("Status"),gettext("RRD Graphs")); @@ -217,6 +217,18 @@ function get_dates($curperiod, $graph) { $offset = 0; } switch($graph) { + case "12hour": + switch($offset) { + case 0; + $houroffset = 0; + break; + default: + $houroffset = ($offset * 12) - 12; + break; + } + $start = mktime((8 + $houroffset), 0, 0, $curmonth, $curday, $curyear); + $end = mktime((8 + $houroffset) + 12, 0, 0, $curmonth, $curday, $curyear); + break; case "day": $start = mktime(0, 0, 0, $curmonth, ($curday + $offset), $curyear); $end = mktime(0, 0, 0, $curmonth, (($curday + $offset) + 1), $curyear); |