X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Commands%2FScans.pm;h=ffc8e184023a0b31d09ce894de92346ae103cff3;hb=a7e034b3599d41cdf5a158b14bd1715451f89a0c;hp=31eea44fb9f940800b58132568c4d9cfc673f0a2;hpb=ae37bc6b64270f8c65298a36fce1f4bad761231f;p=NDIRC.git

diff --git a/Commands/Scans.pm b/Commands/Scans.pm
index 31eea44..ffc8e18 100644
--- a/Commands/Scans.pm
+++ b/Commands/Scans.pm
@@ -70,10 +70,10 @@ sub gs
 	}else{
 		my $req = $c->model->prepare(q{
 SELECT * FROM scan_requests
-WHERE uid = (SELECT uid FROM users WHERE hostmask ILIKE $1)
+WHERE uid = $1
 	AND pid = $2 AND type = $3 AND NOT sent
 		});
-		$req->execute($c->host,$planet,$type);
+		$req->execute($c->uid,$planet,$type);
 
 		my $id;
 		if(my $scan = $req->fetchrow_hashref){
@@ -86,14 +86,14 @@ WHERE id = $2
 		}else{
 			$req = $c->model->prepare(q{
 INSERT INTO scan_requests (uid,nick,pid,type)
-VALUES((SELECT uid FROM users WHERE hostmask ILIKE $1),$2,$3,$4) RETURNING (id)
+VALUES($1,$2,$3,$4) RETURNING (id)
 			});
-			$req->execute($c->host,$c->nick,$planet,$type);
+			$req->execute($c->uid,$c->nick,$planet,$type);
 			$id = $req->fetchrow;
 		}
 
 		if ($id){
-			$c->message("msg $ND::scanchan"
+			$c->message(privmsg => $c->disp->targets->{scan}
 				,"<b>$id</b> http://game.planetarion.com/waves.pl?id=$typeid&x=$x&y=$y&z=$z"
 				. " ($x:$y:$z $type) | <".$c->nick."> $msg"
 			);
@@ -198,9 +198,9 @@ sub anon
 	my ($self, $c, $msg) = @_;
 	my ($target,$mess) = $msg =~ /^(\S+) (.*)$/ or die 'ARGS';
 
-	$c->message("msg $target", "<b>$mess</b> <c04>(reply with /msg "
+	$c->message(privmsg => $target, "<b>$mess</b> <c04>(reply with /msg "
 		.$c->channel.")</c>");
-	$c->message("msg ".$c->channel, "<c03>$target << $mess</c>");
+	$c->message(privmsg => $c->channel, "<c03>$target << $mess</c>");
 }
 
 sub addscan
@@ -217,7 +217,7 @@ WHERE groupscan = $1 AND scan_id = LOWER($2) AND tick >= tick() - 168
 INSERT INTO scans (scan_id,tick,groupscan,uid) VALUES (LOWER($1),tick(),$2,COALESCE($3,-1))
 		});
 	my $user = $dbh->selectrow_hashref(q{SELECT uid,username, scan_points, tick()
-		FROM users WHERE hostmask ILIKE ? },undef,$c->host);
+		FROM users WHERE uid = ? },undef,$c->uid);
 	my $groupscans = 0;
 	my $scans = 0;
 	eval {