Fix email decoding

[ndwebbie.git] / scripts / ndmail.pl

diff --git a/scripts/ndmail.pl b/scripts/ndmail.pl
index a47a33c50702941eac1d5d9158bc2066ab132478..8941cc1cf8890ac0cb8a785cbd7412e24259248a 100755 (executable)
--- a/scripts/ndmail.pl
+++ b/scripts/ndmail.pl
@@ -22,32 +22,29 @@ q{
 
 use strict;
 use warnings;
+use local::lib;
 use DBI;
 use DBD::Pg qw(:pg_types);
 use CGI qw/:standard/;
 
 use Email::Simple;
 use Email::StripMIME;
-use Encode::Encoder qw(encoder);
+use Encode;
 use MIME::QuotedPrint;
 
-our $dbh;
-for my $file ("/home/whale/nddb.pl")
-{
-       unless (my $return = do $file){
-               warn "couldn't parse $file: $@" if $@;
-               warn "couldn't do $file: $!"    unless defined $return;
-               warn "couldn't run $file"       unless $return;
-       }
-}
+use FindBin;
+use lib "$FindBin::Bin/../lib";
+use ND::DB;
+
+my $dbh = ND::DB::DB();
 
 my @text = <>;
 my $text = join '',@text;
 
 my $email = Email::Simple->new(Email::StripMIME::strip_mime($text));;
 
-my $subject = encoder(decode_qp($email->header('Subject')))->utf8;
-my $body = 'FROM:'.encoder(decode_qp($email->header('From')))->utf8 . "\n\n" . encoder($email->body)->utf8;
+my $subject = decode('MIME-Header', $email->header('Subject'));
+my $body = 'FROM:' . decode('UTF-8', decode_qp($email->header('From'))) . "\n\n" . decode('UTF-8',$email->body);
 
 
 $dbh->begin_work;