sartak at bestpractical
Nov 6, 2009, 1:03 PM
Post #1 of 1
(69 views)
Permalink
|
|
rt branch, 3.8-trunk, updated. rt-3.8.6-84-g882da8d
|
|
The branch, 3.8-trunk has been updated
via 882da8defc632e57ee56989c22fd4616c6aac812 (commit)
from dfcdec9aa8416d1e1e12bdeb9c95de76a2563954 (commit)
Summary of changes:
lib/RT/Interface/Email.pm | 41 ++++++++++++++++++++---------------------
1 files changed, 20 insertions(+), 21 deletions(-)
- Log -----------------------------------------------------------------
commit 882da8defc632e57ee56989c22fd4616c6aac812
Author: Shawn M Moore <sartak[at]bestpractical.com>
Date: Fri Nov 6 16:03:11 2009 -0500
Tidy
diff --git a/lib/RT/Interface/Email.pm b/lib/RT/Interface/Email.pm
index 2cae7a4..3091625 100755
--- a/lib/RT/Interface/Email.pm
+++ b/lib/RT/Interface/Email.pm
@@ -390,32 +390,31 @@ sub SendEmail {
my $path = RT->Config->Get('SendmailPath');
my $args = RT->Config->Get('SendmailArguments');
- # SetOutgoingMailFrom
-
- if ( RT->Config->Get('SetOutgoingMailFrom') ) {
- my $OutgoingMailAddress;
-
- if ($TicketObj) {
- my $QueueName = $TicketObj->QueueObj->Name;
- my $QueueAddressOverride = RT->Config->Get('OverrideOutgoingMailFrom')->{$QueueName};
-
- if ($QueueAddressOverride) {
- $OutgoingMailAddress = $QueueAddressOverride;
- } else {
- $OutgoingMailAddress = $TicketObj->QueueObj->CorrespondAddress;
+ # SetOutgoingMailFrom
+ if ( RT->Config->Get('SetOutgoingMailFrom') ) {
+ my $OutgoingMailAddress;
+
+ if ($TicketObj) {
+ my $QueueName = $TicketObj->QueueObj->Name;
+ my $QueueAddressOverride = RT->Config->Get('OverrideOutgoingMailFrom')->{$QueueName};
+
+ if ($QueueAddressOverride) {
+ $OutgoingMailAddress = $QueueAddressOverride;
+ } else {
+ $OutgoingMailAddress = $TicketObj->QueueObj->CorrespondAddress;
+ }
}
- }
- $OutgoingMailAddress ||= RT->Config->Get('OverrideOutgoingMailFrom')->{'Default'};
+ $OutgoingMailAddress ||= RT->Config->Get('OverrideOutgoingMailFrom')->{'Default'};
- $args .= ' -f ' . $OutgoingMailAddress
- if $OutgoingMailAddress;
- }
+ $args .= " -f $OutgoingMailAddress"
+ if $OutgoingMailAddress;
+ }
- # Set Bounce Arguments
- $args .= ' '. RT->Config->Get('SendmailBounceArguments') if $args{'Bounce'};
+ # Set Bounce Arguments
+ $args .= ' '. RT->Config->Get('SendmailBounceArguments') if $args{'Bounce'};
- # VERP
+ # VERP
if ( $TransactionObj and
my $prefix = RT->Config->Get('VERPPrefix') and
my $domain = RT->Config->Get('VERPDomain') )
-----------------------------------------------------------------------
_______________________________________________
Rt-commit mailing list
Rt-commit[at]lists.bestpractical.com
http://lists.bestpractical.com/cgi-bin/mailman/listinfo/rt-commit
|
