X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Def.pm;h=9e7f53c76c5bf526b35e9ef61486a0062201e403;hb=ea158d30abf874821b98aa388dd9dcc71b4322dc;hp=a21a17d5963d41c8542de5aab19ff3bdb14c41c4;hpb=51374bc34007df2eddd99153063824d0ab7f19ad;p=NDIRC.git

diff --git a/Def.pm b/Def.pm
index a21a17d..9e7f53c 100644
--- a/Def.pm
+++ b/Def.pm
@@ -23,6 +23,7 @@ use ND::DB;
 use ND::Include;
 use NDIRC::Access;
 use NDIRC::Misc;
+use CGI qw/:standard/;
 require Exporter;
 
 our @ISA = qw/Exporter/;
@@ -98,7 +99,7 @@ sub setType {
 		}elsif (defined $x){
 			$fleet = $ND::DBH->prepare(qq{
 					$query
-					WHERE i.call = ? AND p.id = planetid(?,?,?,0) 
+					WHERE i.call = ? AND p.id = planetid(?,?,?,tick()) 
 				});
 			$fleet->execute($id,$x,$y,$z);
 		}else{
@@ -108,9 +109,10 @@ sub setType {
 				});
 			$fleet->execute($id);
 		}	
+		$type = escapeHTML($type);
 		while (my ($id,$call,$oldtype,$coords,$tick) = $fleet->fetchrow()){
 			if($ND::DBH->do(q{UPDATE incomings SET shiptype = ? WHERE id = ?},undef,$type,$id) == 1){
-				log_message $user->{uid}, "DC set fleet: $id to: $type";
+				def_log $user->{uid}, $call , "Set fleet: [B] $id [/B] to: [B] $type [/B]";
 				$ND::server->command("msg $ND::target Set fleet from $coords on call $call to $type (previously $oldtype)");
 				if ($tick < 0 && not (defined $x && $x eq 'call')){
 					$ND::server->command("msg $ND::target This call is old, did you use the call id, instead of inc id by accident? You can use .settypeall callid to set the type on all incs in a call.");
@@ -128,10 +130,11 @@ sub takeCall {
 		$ND::server->command("notice $ND::nick Usage: $command callid");
 		return;
 	}
-	if (dc()){
+	if (my $user = dc()){
 		if ($ND::DBH->do(q{UPDATE calls SET dc = (SELECT uid FROM users WHERE hostmask ILIKE ?) WHERE id = ?}
 				,undef,$ND::address,$id) == 1){
 			$ND::server->command("msg $ND::target Updated the DC for call $id");
+			def_log $user->{uid}, $id , "Used: [B] $command [/B]";
 		}
 	}
 }
@@ -145,10 +148,11 @@ sub covCall {
 		$ND::server->command("notice $ND::nick Usage: $command callid");
 		return;
 	}
-	if (dc()){
+	if (my $user = dc()){
 		if($ND::DBH->do(q{UPDATE calls SET dc = (SELECT uid FROM users WHERE hostmask ILIKE ?), covered = TRUE, open = FALSE WHERE id = ?}
 				,undef,$ND::address,$id) == 1){
 			$ND::server->command("msg $ND::target Marked call $id as covered");
+			def_log $user->{uid}, $id , "Used: [B] $command [/B]";
 		}
 	}
 }
@@ -162,10 +166,11 @@ sub ignoreCall {
 		$ND::server->command("notice $ND::nick Usage: $command callid");
 		return;
 	}
-	if (dc()){
+	if (my $user = dc()){
 		if($ND::DBH->do(q{UPDATE calls SET dc = (SELECT uid FROM users WHERE hostmask ILIKE ?), covered = FALSE, open = FALSE WHERE id = ?}
 				,undef,$ND::address,$id) == 1){
 			$ND::server->command("msg $ND::target Marked call $id as ignored");
+			def_log $user->{uid}, $id , "Used: [B] $command [/B]";
 		}
 	}
 }