Fix email decoding

[ndwebbie.git] / scripts / ndreport.pl

diff --git a/scripts/ndreport.pl b/scripts/ndreport.pl
index 7300e01093772e1f87cee18b030517d1abc77112..8f2cd3b7aaeb541a07266a2605ff19246c1d61d0 100755 (executable)
--- a/scripts/ndreport.pl
+++ b/scripts/ndreport.pl
@@ -22,12 +22,13 @@ q{
 
 use strict;
 use warnings;
+use local::lib;
 use DBI;
 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;
@@ -45,10 +46,11 @@ 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)
+SELECT coords(x,y,z) FROM current_planet_stats WHERE pid = (SELECT pid FROM users WHERE username = $1
+       AND uid IN (SELECT uid FROM groupmembers WHERE gid = 'M'))
 });
 
 my $a = $dbh->prepare(q{