diff options
| author | jim-p <jimp@pfsense.org> | 2011-07-27 14:55:38 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-07-27 14:55:38 -0400 |
| commit | f4a2b3e843a72e4b62c54bc5da4ef4f3c568bd89 (patch) | |
| tree | 202f141eb0bf19fec02fe0f5728a251aa09c00d0 /config/mailreport/mail_reports.inc | |
| parent | 060d043124f5cf83875e2cece7be9d76294e7cab (diff) | |
| download | pfsense-packages-f4a2b3e843a72e4b62c54bc5da4ef4f3c568bd89.tar.gz pfsense-packages-f4a2b3e843a72e4b62c54bc5da4ef4f3c568bd89.tar.bz2 pfsense-packages-f4a2b3e843a72e4b62c54bc5da4ef4f3c568bd89.zip | |
Respect the user-defined interface names in e-mailed RRD graphs, and in drop-downs for building reports.
Diffstat (limited to 'config/mailreport/mail_reports.inc')
| -rw-r--r-- | config/mailreport/mail_reports.inc | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/config/mailreport/mail_reports.inc b/config/mailreport/mail_reports.inc index dc8026cc..d94631cc 100644 --- a/config/mailreport/mail_reports.inc +++ b/config/mailreport/mail_reports.inc @@ -301,16 +301,14 @@ function mail_report_generate_graph($database, $style, $graph, $start, $end) { // log_error("start $start, end $end, archivestart $archivestart, average $average, scale $scale, seconds $seconds"); /* Deduce a interface if possible and use the description */ - $curif = split("-", $curdatabase); - $curif = "$curif[0]"; - $friendly = convert_friendly_interface_to_friendly_descr(strtolower($curif)); - if($friendly == "") { - $friendly = $curif; + $curif = explode("-", $curdatabase); + $curif[1] = str_replace(".rrd", "", $curif[1]); + $friendly = convert_friendly_interface_to_friendly_descr(strtolower($curif[0])); + if(!empty($friendly)) { + $curif[0] = $friendly; } - $search = array("-", ".rrd", $curif); - $replace = array(" :: ", "", $friendly); - $prettydb = ucwords(str_replace($search, $replace, $curdatabase)); - + $prettydb = ucwords(implode(" :: ", $curif)); + $curif = $curif[0]; $rrddbpath = "/var/db/rrd/"; $rrdtmppath = "/tmp/"; @@ -1200,4 +1198,4 @@ function timeDiff($time, $opt = array()) { return $str; } -?>
\ No newline at end of file +?> |