[Rt-commit] r2968 - in rt/branches/3.4-RELEASE: . lib/RT/Action lib/RT/Interface

[jesse at bestpractical.com]

Author: jesse
Date: Wed May 25 22:46:40 2005
New Revision: 2968

Modified:
   rt/branches/3.4-RELEASE/   (props changed)
   rt/branches/3.4-RELEASE/lib/RT/Action/SendEmail.pm
   rt/branches/3.4-RELEASE/lib/RT/Interface/Web.pm
Log:
 r17717 at hualien:  jesse | 2005-05-25 22:43:35 -0400
 * Better in-reply-to when replying to a message generated via the webui
 * Now only hang onto the first four and the last six References headers.
 


Modified: rt/branches/3.4-RELEASE/lib/RT/Action/SendEmail.pm
==============================================================================
--- rt/branches/3.4-RELEASE/lib/RT/Action/SendEmail.pm	(original)
+++ rt/branches/3.4-RELEASE/lib/RT/Action/SendEmail.pm	Wed May 25 22:46:40 2005
@@ -781,9 +781,16 @@
     }
   
     my $pseudo_ref = $self->PseudoReference;
-    @references = grep { $_ ne $pseudo_ref } @references;
+    @references = ($pseudo_ref, grep { $_ ne $pseudo_ref } @references , @msgid);
 
-    $self->SetHeader( 'References', join( " ",  ( $pseudo_ref, @references, @msgid )));
+    # If there are more than 10 references headers, remove all but the first four and the last six
+    # (Gotta keep this from growing forever)
+    splice(@references, 4, -6) if ($#references >= 10);
+
+
+
+    $self->SetHeader( 'References', join( " ",   @references) );
+    $self->TemplateObj->MIMEObj->head->fold_length( 'References', 80 );
 
 }
 

Modified: rt/branches/3.4-RELEASE/lib/RT/Interface/Web.pm
==============================================================================
--- rt/branches/3.4-RELEASE/lib/RT/Interface/Web.pm	(original)
+++ rt/branches/3.4-RELEASE/lib/RT/Interface/Web.pm	Wed May 25 22:46:40 2005
@@ -460,6 +460,14 @@
             Body    => $args{ARGSRef}->{'UpdateContent'},
         );
 
+        $Message->head->add( 'Message-Id' => "<rt-"
+              . $RT::VERSION . "-"
+              . $args{TicketObj}->id . "-"
+              . $$ . "-"
+              . time() . "-"
+              . rand(2000) . '@'
+              . $RT::Organization
+              . ">" );
         my $old_txn = RT::Transaction->new( $session{'CurrentUser'} );
         if ( $args{ARGSRef}->{'QuoteTransaction'} ) {
             $old_txn->Load( $args{ARGSRef}->{'QuoteTransaction'} );