aboutsummaryrefslogtreecommitdiffstats
path: root/config/mailreport/mail_reports_generate.php
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2013-03-29 10:31:21 -0400
committerjim-p <jimp@pfsense.org>2013-03-29 10:31:21 -0400
commit9bb239d4732cfd2b3ee6a5ade5839267563a6d0b (patch)
tree6dd45a9e69281aecf9038c8aa071babc97a7c587 /config/mailreport/mail_reports_generate.php
parente95e1e535d60d7cfbf87a8ee56bd3eb01a24656b (diff)
downloadpfsense-packages-9bb239d4732cfd2b3ee6a5ade5839267563a6d0b.tar.gz
pfsense-packages-9bb239d4732cfd2b3ee6a5ade5839267563a6d0b.tar.bz2
pfsense-packages-9bb239d4732cfd2b3ee6a5ade5839267563a6d0b.zip
Some more refinements for the mail reports package.
Diffstat (limited to 'config/mailreport/mail_reports_generate.php')
-rw-r--r--config/mailreport/mail_reports_generate.php4
1 files changed, 2 insertions, 2 deletions
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>";