[Rt-commit] r12546 - in rt/branches/3.8-TESTING: .

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Tue May 20 02:48:37 2008
New Revision: 12546

Modified:
   rt/branches/3.8-TESTING/   (props changed)
   rt/branches/3.8-TESTING/lib/RT/Action/Autoreply.pm
   rt/branches/3.8-TESTING/lib/RT/Action/SendEmail.pm

Log:
 r12608 at sunnavys-mb:  sunnavy | 2008-05-20 14:42:41 +0800
 RT-Ticket: 9095
 RT-Status: resolved
 
 Autoreply.pm duplicates a large sub (SetReturnAddress) from SendEmail.pm for a
 single line of code change. should be refactored
 


Modified: rt/branches/3.8-TESTING/lib/RT/Action/Autoreply.pm
==============================================================================
--- rt/branches/3.8-TESTING/lib/RT/Action/Autoreply.pm	(original)
+++ rt/branches/3.8-TESTING/lib/RT/Action/Autoreply.pm	Tue May 20 02:48:37 2008
@@ -96,38 +96,15 @@
 
 sub SetReturnAddress {
     my $self = shift;
-    my %args = ( is_comment => 0,
-		 @_
-	       );
     
-    my $replyto;
-    if ($args{'is_comment'}) { 
-	$replyto = $self->TicketObj->QueueObj->CommentAddress || 
-		     RT->Config->Get('CommentAddress');
-    }
-    else {
-	$replyto = $self->TicketObj->QueueObj->CorrespondAddress ||
-		     RT->Config->Get('CorrespondAddress');
-    }
-    
-    unless ($self->TemplateObj->MIMEObj->head->get('From')) {
+    my $friendly_name;
+
 	if (RT->Config->Get('UseFriendlyFromLine')) {
-	    my $friendly_name = $self->TicketObj->QueueObj->Description ||
+	    $friendly_name = $self->TicketObj->QueueObj->Description ||
 		    $self->TicketObj->QueueObj->Name;
-	    $friendly_name =~ s/"/\\"/g;
-	    $self->SetHeader( 'From',
-		        sprintf(RT->Config->Get('FriendlyFromLineFormat'), 
-                $self->MIMEEncodeString( $friendly_name, RT->Config->Get('EmailOutputEncoding') ), $replyto),
-	    );
-	}
-	else {
-	    $self->SetHeader( 'From', $replyto );
 	}
-    }
-    
-    unless ($self->TemplateObj->MIMEObj->head->get('Reply-To')) {
-	$self->SetHeader('Reply-To', "$replyto");
-    }
+
+    $self->SUPER::SetReturnAddress( @_, friendly_name => $friendly_name );
     
 }
   

Modified: rt/branches/3.8-TESTING/lib/RT/Action/SendEmail.pm
==============================================================================
--- rt/branches/3.8-TESTING/lib/RT/Action/SendEmail.pm	(original)
+++ rt/branches/3.8-TESTING/lib/RT/Action/SendEmail.pm	Tue May 20 02:48:37 2008
@@ -832,6 +832,7 @@
     my $self = shift;
     my %args = (
         is_comment => 0,
+        friendly_name => undef,
         @_
     );
 
@@ -849,9 +850,13 @@
 
     unless ( $self->TemplateObj->MIMEObj->head->get('From') ) {
         if ( RT->Config->Get('UseFriendlyFromLine') ) {
-            my $friendly_name = $self->TransactionObj->CreatorObj->FriendlyName;
-            if ( $friendly_name =~ /^"(.*)"$/ ) {    # a quoted string
-                $friendly_name = $1;
+            my $friendly_name = $args{friendly_name};
+
+            unless ( $friendly_name ) {
+                $friendly_name = $self->TransactionObj->CreatorObj->FriendlyName;
+                if ( $friendly_name =~ /^"(.*)"$/ ) {    # a quoted string
+                    $friendly_name = $1;
+                }
             }
 
             $friendly_name =~ s/"/\\"/g;