Fix email decoding

diff --git a/scripts/ndmail.pl b/scripts/ndmail.pl
index f6fe444bed890b3d80c4bbd09550b8c8725ddbca..8941cc1cf8890ac0cb8a785cbd7412e24259248a 100755 (executable)
--- a/scripts/ndmail.pl
+++ b/scripts/ndmail.pl
@@ -29,7 +29,7 @@ use CGI qw/:standard/;
 
 use Email::Simple;
 use Email::StripMIME;
-use Encode::Encoder qw(encoder);
+use Encode;
 use MIME::QuotedPrint;
 
 use FindBin;
@@ -43,8 +43,8 @@ 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;

diff --git a/scripts/ndreport.pl b/scripts/ndreport.pl
index 079b3f9f20d4d0e47d9b3737e4cdbcf60d2be077..8f2cd3b7aaeb541a07266a2605ff19246c1d61d0 100755 (executable)
--- a/scripts/ndreport.pl
+++ b/scripts/ndreport.pl
@@ -28,7 +28,7 @@ use DBD::Pg qw(:pg_types);
 use CGI qw/:standard/;
 
 use Email::Simple;
-use Encode::Encoder qw(encoder);
+use Encode;
 use MIME::QuotedPrint;
 
 use FindBin;
@@ -46,7 +46,7 @@ my $user = $1;
 
 my $email = Email::Simple->new($text);
 
-my $body =  encoder($email->body,'ISO-8859-15')->utf8;
+my $body =  decode('ISO-8859-1', $email->body);
 
 my $c = $dbh->prepare(q{
 SELECT coords(x,y,z) FROM current_planet_stats WHERE pid = (SELECT pid FROM users WHERE username = $1