diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-07-27 10:23:24 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-07-27 10:24:04 +0300 |
| commit | 748a71da2abfd38c02418890e22c5d07f783a0c7 (patch) | |
| tree | 1fb1757a5373a06fd85515a4091efa2bff6cef79 /main/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch | |
| parent | 0cbc94f0e493bf549d8e6db70d9cdc3aa603ea0d (diff) | |
| download | aports-748a71da2abfd38c02418890e22c5d07f783a0c7.tar.bz2 aports-748a71da2abfd38c02418890e22c5d07f783a0c7.tar.xz | |
main/rt4: upgrade to 4.0.15
Diffstat (limited to 'main/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch')
| -rw-r--r-- | main/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch | 39 |
1 files changed, 10 insertions, 29 deletions
diff --git a/main/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch b/main/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch index 6168df1bcb..8e5df099c6 100644 --- a/main/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch +++ b/main/rt4/0001-email-allow-envelope-from-overriding-from-templates.patch @@ -1,19 +1,13 @@ -From f2f3542e163c534a437944089b801f6134c6b02a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Wed, 6 Jul 2011 09:56:57 +0300 Subject: [PATCH] email: allow envelope from overriding from templates Add X-RT-Envelope-From header that will override the envelope from if using sendmailpipe mail sending. ---- - lib/RT/Interface/Email.pm | 11 +++++++---- - 1 files changed, 7 insertions(+), 4 deletions(-) -diff --git a/lib/RT/Interface/Email.pm b/lib/RT/Interface/Email.pm -index 620ca60..8bd94eb 100644 ---- a/lib/RT/Interface/Email.pm -+++ b/lib/RT/Interface/Email.pm -@@ -343,7 +343,10 @@ sub SendEmail { +diff -ru rt-4.0.15.orig/lib/RT/Interface/Email.pm rt-4.0.15/lib/RT/Interface/Email.pm +--- rt-4.0.15.orig/lib/RT/Interface/Email.pm 2013-07-25 23:09:24.000000000 +0300 ++++ rt-4.0.15/lib/RT/Interface/Email.pm 2013-07-27 10:17:42.508546335 +0300 +@@ -376,7 +376,10 @@ my $msgid = $args{'Entity'}->head->get('Message-ID') || ''; chomp $msgid; @@ -25,26 +19,13 @@ index 620ca60..8bd94eb 100644 # If we don't have any recipients to send to, don't send a message; unless ( $args{'Entity'}->head->get('To') || $args{'Entity'}->head->get('Cc') -@@ -408,16 +411,16 @@ sub SendEmail { - if ( $args{'Bounce'} ) { - $args .= ' '. RT->Config->Get('SendmailBounceArguments'); - } elsif ( RT->Config->Get('SetOutgoingMailFrom') ) { -- my $OutgoingMailAddress; -+ my $OutgoingMailAddress = $envelope_from; - - if ($TicketObj) { - my $QueueName = $TicketObj->QueueObj->Name; - my $QueueAddressOverride = RT->Config->Get('OverrideOutgoingMailFrom')->{$QueueName}; - +@@ -442,7 +445,8 @@ if ($QueueAddressOverride) { -- $OutgoingMailAddress = $QueueAddressOverride; -+ $OutgoingMailAddress ||= $QueueAddressOverride; + $OutgoingMailAddress = $QueueAddressOverride; } else { -- $OutgoingMailAddress = $TicketObj->QueueObj->CorrespondAddress; -+ $OutgoingMailAddress ||= $TicketObj->QueueObj->CorrespondAddress; +- $OutgoingMailAddress ||= $TicketObj->QueueObj->CorrespondAddress ++ $OutgoingMailAddress ||= $envelope_from ++ || $TicketObj->QueueObj->CorrespondAddress + || RT->Config->Get('CorrespondAddress'); } } - --- -1.7.1 - |