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_edit.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

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

diff --git a/config/mailreport/status_mail_report_edit.php b/config/mailreport/status_mail_report_edit.php
index fe9a5194..3102e958 100644
--- a/config/mailreport/status_mail_report_edit.php
+++ b/config/mailreport/status_mail_report_edit.php
@@ -138,7 +138,6 @@ if ($_POST) {
 	set_mail_report_cron_jobs($a_mailreports);
 	write_config();
 	configure_cron();
-
 	header("Location: status_mail_report.php");
 	exit;
 }
@@ -239,10 +238,13 @@ include("head.inc");
 			<?php endif; ?>
 		</tr>
 		<?php $i = 0; foreach ($a_graphs as $graph): 
-			$optionc = split("-", $graph['graph']);
-			$search = array("-", ".rrd", $optionc);
-			$replace = array(" :: ", "", $friendly);
-			$prettyprint = ucwords(str_replace($search, $replace, $graph['graph']));
+			$optionc = explode("-", $graph['graph']);
+			$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));
 		?>
 		<tr ondblclick="document.location='status_mail_report_edit.php?id=<?=$i;?>'">
 			<td class="listlr"><?php echo $prettyprint; ?></td>
-- 
cgit v1.2.3