From f4a2b3e843a72e4b62c54bc5da4ef4f3c568bd89 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Wed, 27 Jul 2011 14:55:38 -0400
Subject: Respect the user-defined interface names in e-mailed RRD graphs, and
 in drop-downs for building reports.

---
 config/mailreport/status_mail_report_add_graph.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'config/mailreport/status_mail_report_add_graph.php')

diff --git a/config/mailreport/status_mail_report_add_graph.php b/config/mailreport/status_mail_report_add_graph.php
index 17d7731c..c0287367 100644
--- a/config/mailreport/status_mail_report_add_graph.php
+++ b/config/mailreport/status_mail_report_add_graph.php
@@ -183,12 +183,15 @@ include("head.inc");
 				<select name="graph" class="formselect" style="z-index: -10;">
 				<?php
 				foreach ($custom_databases as $db => $database) {
-					$optionc = split("-", $database);
-					$search = array("-", ".rrd", $optionc);
-					$replace = array(" :: ", "", $friendly);
+					$optionc = explode("-", $database);
+					$optionc[1] = str_replace(".rrd", "", $optionc[1]);
+					$friendly = convert_friendly_interface_to_friendly_descr(strtolower($optionc[0]));
+					if(!empty($friendly)) {
+						$optionc[0] = $friendly;
+					}
+					$prettyprint = ucwords(implode(" :: ", $optionc));
 					echo "<option value=\"{$database}\"";
-					$prettyprint = ucwords(str_replace($search, $replace, $database));
-					if($pconfig['graph'] == $database) {
+					if ($pconfig['graph'] == $database) {
 						echo " selected";
 					}
 					echo ">" . htmlspecialchars($prettyprint) . "</option>\n";
-- 
cgit v1.2.3