From 9bb239d4732cfd2b3ee6a5ade5839267563a6d0b Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Fri, 29 Mar 2013 10:31:21 -0400
Subject: Some more refinements for the mail reports package.

---
 config/mailreport/mail_reports_generate.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/config/mailreport/mail_reports_generate.php b/config/mailreport/mail_reports_generate.php
index 81205ecb..a784c596 100644
--- a/config/mailreport/mail_reports_generate.php
+++ b/config/mailreport/mail_reports_generate.php
@@ -69,7 +69,7 @@ if ((!is_array($cmds) || !(count($cmds) > 0))
 $cmdtext = "";
 foreach ($cmds as $cmd) {
 	$output = "";
-	$cmdtext .= "Command output for {$cmd['descr']}<br />\n";
+	$cmdtext .= "Command output: {$cmd['descr']} (" . htmlspecialchars($cmd['detail']) . ")<br />\n";
 	exec($cmd['detail'], $output);
 	$cmdtext .= "<pre>\n";
 	$cmdtext .= implode("\n", $output);
@@ -81,7 +81,7 @@ $logtext = "";
 foreach ($logs as $log) {
 	$lines = empty($log['lines']) ? 50 : $log['lines'];
 	$filter = empty($log['detail']) ? null : array($log['detail']);
-	$logtext .= "Log output for {$log['logfile']}<br />\n";
+	$logtext .= "Log output: " . get_friendly_log_name($log['logfile']) . " ({$log['logfile']})<br />\n";
 	$logtext .= "<pre>\n";
 	$logtext .= implode("\n", mail_report_get_log($log['logfile'], $lines, $filter));
 	$logtext .= "\n</pre>";
-- 
cgit v1.2.3