[Rt-commit] rt branch, 3.8-trunk, updated. rt-3.8.7-187-g3a8fef3

[Kevin Falcone]

The branch, 3.8-trunk has been updated
       via  3a8fef3101fe8b4915798f29eeed64a9d30f2410 (commit)
       via  f6176ebfafd6a88cbd5962de65ddbdc7f1b0b63a (commit)
      from  998b48b688b4fe7ec678b32f4ec9108e854fef66 (commit)

Summary of changes:
 etc/RT_Config.pm.in        |   12 ++++++++++++
 lib/RT/Action/SendEmail.pm |    4 +++-
 2 files changed, 15 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit f6176ebfafd6a88cbd5962de65ddbdc7f1b0b63a
Author: Loos, Christian <CLoos at netcologne.de>
Date:   Sat Feb 27 00:05:04 2010 +0100

    RT-Originator header config option
    
    patch introduces a config option to prevent the RT-Originator header in
    outgoing mails.  A recipient can look-up the header and then send mail
    to a user's personal address instead of the RT queue mail address.

diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
index a04ba95..179c05e 100755
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
@@ -458,6 +458,18 @@ Set($DefaultErrorMailPrecedence, 'bulk');
 
 =back
 
+=item C<$UseOriginatorHeader>
+
+C<$UseOriginatorHeader> is used to control the insert of an 
+RT-Originator Header in every outgoing mail, containing the 
+mail address of the transaction creator.
+
+=cut
+
+Set($UseOriginatorHeader, 1);
+
+=back
+
 =head1 Sendmail Configuration
 
 These options only take effect if C<$MailCommand> is 'sendmail' or
diff --git a/lib/RT/Action/SendEmail.pm b/lib/RT/Action/SendEmail.pm
index 850abb3..662ffa8 100755
--- a/lib/RT/Action/SendEmail.pm
+++ b/lib/RT/Action/SendEmail.pm
@@ -621,7 +621,9 @@ sub SetRTSpecialHeaders {
 
 # XXX, TODO: use /ShowUser/ShowUserEntry(or something like that) when it would be
 #            refactored into user's method.
-    if ( my $email = $self->TransactionObj->CreatorObj->EmailAddress ) {
+    if ( my $email = $self->TransactionObj->CreatorObj->EmailAddress 
+         and RT->Config->Get('UseOriginatorHeader')
+    ) {
         $self->SetHeader( 'RT-Originator', $email );
     }
 

commit 3a8fef3101fe8b4915798f29eeed64a9d30f2410
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Tue Mar 9 15:45:08 2010 -0500

    slight cleanup to rt-originator patch

diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
index 179c05e..19ff1fd 100755
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
@@ -460,8 +460,8 @@ Set($DefaultErrorMailPrecedence, 'bulk');
 
 =item C<$UseOriginatorHeader>
 
-C<$UseOriginatorHeader> is used to control the insert of an 
-RT-Originator Header in every outgoing mail, containing the 
+C<$UseOriginatorHeader> is used to control the insertion of an
+RT-Originator Header in every outgoing mail, containing the
 mail address of the transaction creator.
 
 =cut
diff --git a/lib/RT/Action/SendEmail.pm b/lib/RT/Action/SendEmail.pm
index 662ffa8..8b682c1 100755
--- a/lib/RT/Action/SendEmail.pm
+++ b/lib/RT/Action/SendEmail.pm
@@ -621,7 +621,7 @@ sub SetRTSpecialHeaders {
 
 # XXX, TODO: use /ShowUser/ShowUserEntry(or something like that) when it would be
 #            refactored into user's method.
-    if ( my $email = $self->TransactionObj->CreatorObj->EmailAddress 
+    if ( my $email = $self->TransactionObj->CreatorObj->EmailAddress
          and RT->Config->Get('UseOriginatorHeader')
     ) {
         $self->SetHeader( 'RT-Originator', $email );

-----------------------------------------------------------------------