From a9ecae30b93980bc00da9bb1621713f117d10489 Mon Sep 17 00:00:00 2001 From: dakkar Date: Wed, 8 May 2013 19:34:58 +0200 Subject: migrate Email::Send{,er} --- Makefile.PL | 2 +- lib/URLQueue/MainController.pm | 36 ++++++++++++++++++++---------------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/Makefile.PL b/Makefile.PL index b090229..fe35576 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -13,7 +13,7 @@ WriteMakefile( 'Path::Class' => 0, 'URI::Find' => 0, 'URI::Title' => 0, - 'Email::Send' => 0, + 'Email::Sender' => 0, 'MIME::EncWords' => 1, 'File::ShareDir' => 0, }, diff --git a/lib/URLQueue/MainController.pm b/lib/URLQueue/MainController.pm index dcf83a6..dbd5503 100644 --- a/lib/URLQueue/MainController.pm +++ b/lib/URLQueue/MainController.pm @@ -5,7 +5,9 @@ use base 'Gtk2::GladeXML::Simple'; use Path::Class; use URI::Find; use URI::Title; -use Email::Send; +use Email::Sender::Simple 'sendmail'; +use Email::Sender::Transport::SMTP (); +use Email::Simple; use Encode; use MIME::EncWords; use File::ShareDir 'dist_file'; @@ -181,27 +183,29 @@ sub handle_uris { sub send_email { my ($self,$title,$body)=@_; - my $date=strftime('%a, %d %b %Y %H:%M:%S %z',localtime(time)); - $title=MIME::EncWords::encode_mimewords( Encode::encode('utf-8',$title), Charset=>'utf-8', ); - my $message=<<"EOM"; -From: urlqueue\@thenautilus.net -To: dakkar\@thenautilus.net -Subject: $title -Date: $date -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: 8bit - -$body -EOM + my $message = Email::Simple->create( + header => [ + From => 'urlqueue@thenautilus.net', + To => 'dakkar@thenautilus.net', + Subject => $title, + 'Content-Type' => 'text/plain; charset=utf-8', + 'Content-Transfer-Encoding' => '8bit', + ], + body => Encode::encode('utf-8',$body), + ); - my $sender=Email::Send->new({mailer=>'SMTP'}); - $sender->mailer_args([Host=>'luxion']); - $sender->send(Encode::encode('utf-8',$message)); + sendmail($message,{ + from => 'urlqueue@thenautilus.net', + transport => Email::Sender::Transport::SMTP->new({ + host => 'luxion', + port => 25, + }), + }); } 1; -- cgit v1.2.3