diff options
Diffstat (limited to 'FS/FS/Cron')
| -rw-r--r-- | FS/FS/Cron/agent_email.pm | 5 | ||||
| -rw-r--r-- | FS/FS/Cron/upload.pm | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/FS/FS/Cron/agent_email.pm b/FS/FS/Cron/agent_email.pm index 992aa35..623b920 100644 --- a/FS/FS/Cron/agent_email.pm +++ b/FS/FS/Cron/agent_email.pm @@ -29,7 +29,10 @@ sub agent_email { RT::ConnectToDatabase(); } - my $from = $conf->config('invoice_from'); + my $from = $conf->config('invoice_from_name') ? + $conf->config('invoice_from_name') . ' <' . + $conf->config('invoice_from') . '>' : + $conf->config('invoice_from'); my $outbuf = '';; my( $fs_interp, $rt_interp ) = mason_interps('standalone', 'outbuf'=>\$outbuf); diff --git a/FS/FS/Cron/upload.pm b/FS/FS/Cron/upload.pm index 03ed366..fa1762f 100644 --- a/FS/FS/Cron/upload.pm +++ b/FS/FS/Cron/upload.pm @@ -508,7 +508,10 @@ sub prepare_report { ( to => $to, - from => $conf->config('invoice_from', $agentnum), + from => $conf->config('invoice_from_name', $agentnum) ? + $conf->config('invoice_from_name', $agentnum) . ' <' . + $conf->config('invoice_from', $agentnum) . '>' : + $conf->config('invoice_from', $agentnum), subject => $subject, body => $body, ); |