[Rt-commit] r14722 - in rt/branches/3.999-DANGEROUS: lib/RT/Interface lib/RT/ScripAction

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Fri Aug  1 23:10:41 2008
New Revision: 14722

Modified:
   rt/branches/3.999-DANGEROUS/   (props changed)
   rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email.pm
   rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Notify.pm
   rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/SendEmail.pm

Log:
 r15206 at sunnavys-mb:  sunnavy | 2008-08-02 10:41:32 +0800
 cleaned Mail::Address


Modified: rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Interface/Email.pm	Fri Aug  1 23:10:41 2008
@@ -50,7 +50,7 @@
 use strict;
 use warnings;
 
-use Mail::Address;
+use Email::Address;
 use MIME::Entity;
 use RT::EmailParser;
 use File::Temp;
@@ -418,7 +418,7 @@
 
         # duplicate head as we want drop Bcc field
         my $head = $args{'entity'}->head->dup;
-        my @recipients = map $_->address, Mail::Address->parse( map $head->get($_), qw(To Cc Bcc) );
+        my @recipients = map $_->address, Email::Address->parse( map $head->get($_), qw(To Cc Bcc) );
         $head->delete('Bcc');
 
         my $sender = RT->config->get('SMTPFrom')
@@ -695,7 +695,7 @@
     }
     return 0 unless @bad_recipients;
 
-    $_->{'address_obj'} = ( Mail::Address->parse( $_->{'Recipient'} ) )[0] foreach @bad_recipients;
+    $_->{'address_obj'} = ( Email::Address->parse( $_->{'Recipient'} ) )[0] foreach @bad_recipients;
 
     foreach my $recipient (@bad_recipients) {
         my $status = send_email_using_template(
@@ -814,7 +814,7 @@
 
     my @recipients
         = map lc $_->address,
-        map Mail::Address->parse( $args{'Head'}->get($_) ), qw(To Cc);
+        map Email::Address->parse( $args{'Head'}->get($_) ), qw(To Cc);
 
     my @res;
     foreach my $address (@recipients) {
@@ -888,7 +888,7 @@
 
     # Some broken mailers send:  ""Vincent, Jesse"" <jesse at fsck.com>. Hate
     $Addr =~ s/\"\"(.*?)\"\"/\"$1\"/g;
-    my @Addresses = Mail::Address->parse($Addr);
+    my @Addresses = Email::Address->parse($Addr);
 
     my ($AddrObj) = grep ref $_, @Addresses;
     unless ($AddrObj) {
@@ -918,7 +918,7 @@
         $head->set(
             $field => join ', ',
             map $_->format, grep !$skip{ lc $_->address },
-            Mail::Address->parse( $head->get($field) )
+            Email::Address->parse( $head->get($field) )
         );
     }
 }

Modified: rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Notify.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Notify.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/Notify.pm	Fri Aug  1 23:10:41 2008
@@ -53,7 +53,7 @@
 
 use base qw(RT::ScripAction::SendEmail);
 
-use Mail::Address;
+use Email::Address;
 
 =head2 prepare
 
@@ -86,8 +86,8 @@
 
     if ( $arg =~ /\bOther_?Recipients\b/i ) {
         if ( my $attachment = $self->transaction_obj->attachments->first ) {
-            push @Cc,  map { $_->address } Mail::Address->parse( $attachment->get_header('RT-Send-Cc') );
-            push @Bcc, map { $_->address } Mail::Address->parse( $attachment->get_header('RT-Send-Bcc') );
+            push @Cc,  map { $_->address } Email::Address->parse( $attachment->get_header('RT-Send-Cc') );
+            push @Bcc, map { $_->address } Email::Address->parse( $attachment->get_header('RT-Send-Bcc') );
         }
     }
 

Modified: rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/SendEmail.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/SendEmail.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/ScripAction/SendEmail.pm	Fri Aug  1 23:10:41 2008
@@ -58,7 +58,7 @@
 
 use RT::EmailParser;
 use RT::Interface::Email;
-use Mail::Address;
+use Email::Address;
 
 =head1 name
 
@@ -238,7 +238,7 @@
 
 =head2 to
 
-Returns an array of L<Mail::Address> objects containing all the To: recipients for this notification
+Returns an array of L<Email::Address> objects containing all the To: recipients for this notification
 
 =cut
 
@@ -249,7 +249,7 @@
 
 =head2 cc
 
-Returns an array of L<Mail::Address> objects containing all the Cc: recipients for this notification
+Returns an array of L<Email::Address> objects containing all the Cc: recipients for this notification
 
 =cut
 
@@ -260,7 +260,7 @@
 
 =head2 bcc
 
-Returns an array of L<Mail::Address> objects containing all the Bcc: recipients for this notification
+Returns an array of L<Email::Address> objects containing all the Bcc: recipients for this notification
 
 =cut
 
@@ -274,7 +274,7 @@
     my $self      = shift;
     my $field     = shift;
     my $header    = $self->template_obj->mime_obj->head->get($field);
-    my @addresses = Mail::Address->parse($header);
+    my @addresses = Email::Address->parse($header);
 
     return (@addresses);
 }