X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=scripts%2Fndreport.pl;h=079b3f9f20d4d0e47d9b3737e4cdbcf60d2be077;hb=d786ab3e431fdb29854f4d80fe430c5438d649b6;hp=ed2c9450320cb0cf466d0df9d0a32c8b55e16404;hpb=79f96e8569b30cf0a0ee0cc698acc98ff2d67725;p=ndwebbie.git

diff --git a/scripts/ndreport.pl b/scripts/ndreport.pl
index ed2c945..079b3f9 100755
--- a/scripts/ndreport.pl
+++ b/scripts/ndreport.pl
@@ -22,12 +22,12 @@ 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 MIME::QuotedPrint;
 
@@ -44,12 +44,13 @@ $text =~ /ndreport\+(.+?)\@ruin\.nu/;
 
 my $user = $1;
 
-my $email = Email::Simple->new(Email::StripMIME::strip_mime($text));
+my $email = Email::Simple->new($text);
 
-my $body =  encoder($email->body)->utf8;
+my $body =  encoder($email->body,'ISO-8859-15')->utf8;
 
 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{
@@ -63,9 +64,11 @@ while($body =~ /jumpgate from (.+?), located at (\d+):(\d+):(\d+).+?our system i
 
 	my ($coords) = $dbh->selectrow_array($c, undef, $user);
 
+	$coords //= '(no coords entered)';
+
 	my ($race,$eta) = $dbh->selectrow_array($a,undef, $tick,$x,$y,$z);
 
-	$report->execute(-5,"$user has incs: $coords $x:$y:$z $fleet $race $amount Attack $eta");
+	$report->execute(-5,"$user has incs: $coords $x:$y:$z $fleet $race $amount $eta");
 }
 
 $dbh->disconnect;