[Rt-commit] r7916 - in rt/branches/3.7-EXPERIMENTAL-RTIR-2.4/lib/RT: Interface

[ruz at bestpractical.com]

Author: ruz
Date: Wed May 23 22:58:14 2007
New Revision: 7916

Modified:
   rt/branches/3.7-EXPERIMENTAL-RTIR-2.4/lib/RT/Action/SendEmail.pm
   rt/branches/3.7-EXPERIMENTAL-RTIR-2.4/lib/RT/Interface/Email.pm

Log:
* add function AddSubjectTag in RT::InterfaceEmail

Modified: rt/branches/3.7-EXPERIMENTAL-RTIR-2.4/lib/RT/Action/SendEmail.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-RTIR-2.4/lib/RT/Action/SendEmail.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL-RTIR-2.4/lib/RT/Action/SendEmail.pm	Wed May 23 22:58:14 2007
@@ -768,20 +768,12 @@
 
 sub SetSubjectToken {
     my $self = shift;
-    my $sub  = $self->TemplateObj->MIMEObj->head->get('Subject');
-    my $id   = $self->TicketObj->id;
 
-    my $token_re = RT->Config->Get('EmailSubjectTagRegex');
-    unless ( $token_re ) {
-        my $rtname = RT->Config->Get('rtname');
-        $token_re = qr/\Q$rtname\E/o;
-    }
-    return if $sub =~ /\[$token_re\s+#$id\]/;
-
-    $sub =~ s/(\r\n|\n|\s)/ /gi;
-    chomp $sub;
     $self->TemplateObj->MIMEObj->head->replace(
-        Subject => "[". RT->Config->Get('rtname') ." #$id] $sub",
+        Subject => RT::Interface::Email::AddSubjectTag(
+            $self->TemplateObj->MIMEObj->head->get('Subject'),
+            $self->TicketObj->id,
+        ),
     );
 }
 

Modified: rt/branches/3.7-EXPERIMENTAL-RTIR-2.4/lib/RT/Interface/Email.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-RTIR-2.4/lib/RT/Interface/Email.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL-RTIR-2.4/lib/RT/Interface/Email.pm	Wed May 23 22:58:14 2007
@@ -844,6 +844,22 @@
     }
 }
 
+sub AddSubjectTag {
+    my $subject = shift;
+    my $id      = shift;
+
+    my $tag_re = RT->Config->Get('EmailSubjectTagRegex');
+    unless ( $tag_re ) {
+        my $rtname = RT->Config->Get('rtname');
+        $tag_re = qr/\Q$rtname\E/o;
+    }
+    return $subject if $subject =~ /\[$tag_re\s+#$id\]/;
+
+    $subject =~ s/(\r\n|\n|\s)/ /gi;
+    chomp $subject;
+    return "[". RT->Config->Get('rtname') ." #$id] $subject";
+}
+
 
 =head2 Gateway ARGSREF