X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Intel.pm;h=c9fbac1444508cf182d5641f39c2ee6403a007b2;hb=f2a9f7a98baa00d8fdeb1b601b89a5742331ad24;hp=6012491e84a8dec1b468e442e34a35dc45563102;hpb=9e84f393649d1ecbc24a94476352a28f49afa458;p=NDIRC.git

diff --git a/Intel.pm b/Intel.pm
index 6012491..c9fbac1 100644
--- a/Intel.pm
+++ b/Intel.pm
@@ -16,12 +16,13 @@
 #   Free Software Foundation, Inc.,                                       *
 #   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
 #**************************************************************************/
-package ND::IRC::Intel;
+package NDIRC::Intel;
 use strict;
 use warnings;
 use ND::DB;
-use ND::IRC::Access;
-use ND::IRC::Misc;
+use NDIRC::Access;
+use NDIRC::Misc;
+use ND::Include;
 require Exporter;
 
 our @ISA = qw/Exporter/;
@@ -32,11 +33,11 @@ sub checkIntel {
 	my ($x,$y,$z) = @_;
 	DB();
 	if (officer() || dc()){
-		my $f = $ND::DBH->prepare("SELECT nick,alliance,coords(x,y,z),ruler,planet,hit_us,race,score,size,value,planet_status,relationship FROM current_planet_stats WHERE x = ? AND y = ? and z = ?");
+		my $f = $ND::DBH->prepare("SELECT nick,alliance,coords(x,y,z),ruler,planet,hit_us,race,score,size,value,planet_status,relationship,channel FROM current_planet_stats WHERE x = ? AND y = ? and z = ?");
 		$f->execute($x,$y,$z);
 		while (my @row = $f->fetchrow()){
 			@row = map (valuecolor(1),@row);
-			$ND::server->command("notice $ND::target $row[2] - $row[3] OF $row[4], Alliance=$row[1] ($row[11]), Nick=$row[0] ($row[10]), Hostile Count=$row[5], Race=$row[6], Score=$row[7], Size=$row[8], Value=$row[9] ");
+			$ND::server->command("notice $ND::target $row[2] - $row[3] OF $row[4], Alliance=$row[1] ($row[11]), Nick=$row[0] ($row[10]), Channel=$row[12] Hostile Count=$row[5], Race=$row[6], Score=$row[7], Size=$row[8], Value=$row[9] ");
 		}
 	}else{
 		$ND::server->command("msg $ND::target Only officers are allowed to check that");
@@ -46,10 +47,13 @@ sub checkIntel {
 sub setHostile {
 	my ($x,$y,$z) = @_;
 	DB();
-	if(dc()){
-		my $rv = $ND::DBH->do("UPDATE planets SET planet_status = 'Hostile' WHERE id = (SELECT id FROM current_planet_stats WHERE x = ? AND y = ? and z = ?)",undef,$x,$y,$z);
+	if(my $user = dc()){
+		my $findid = $ND::DBH->prepare_cached(q{SELECT planetid(?,?,?,0)});
+		my ($id) = $ND::DBH->selectrow_array($findid,undef,$x,$y,$z);
+		my $rv = $ND::DBH->do(q{UPDATE planets SET planet_status = 'Hostile' WHERE id = $1},undef,$id);
 		if ($rv == 1){
 			$ND::server->command("msg $ND::target $x:$y:$z is now marked s hostile");
+			intel_log $user->{uid},$id,"Set planet_status to: 'Hostile'";
 		}
 	}
 }
@@ -69,10 +73,13 @@ sub findNick {
 sub setNick {
 	my ($x,$y,$z,$nick) = @_;
 	DB();
-	if (officer()){
-		if ($ND::DBH->do("UPDATE planets SET nick = ? WHERE id = planetid(?,?,?,0)"
-				,undef,$nick,$x,$y,$z)){
+	if (my $user = officer){
+		my $findid = $ND::DBH->prepare_cached(q{SELECT planetid(?,?,?,0)});
+		my ($id) = $ND::DBH->selectrow_array($findid,undef,$x,$y,$z);
+		if ($ND::DBH->do('UPDATE planets SET nick = $1 WHERE id = $2'
+				,undef,$nick,$id)){
 			$ND::server->command("msg $ND::target $x:$y:$z has been updated");
+			intel_log $user->{uid},$id,"Set nick to: $nick";
 		}
 	}
 }
@@ -80,15 +87,21 @@ sub setNick {
 sub setAlly {
 	my ($x,$y,$z,$ally) = @_;
 	DB();
-	if (officer()){
+	if (my $user = officer){
 		my $aid;
 		if ($ally ne 'unknown'){
 			($aid,$ally) = $ND::DBH->selectrow_array("SELECT id,name FROM alliances WHERE name ILIKE ?",undef,$ally);
 		}
 		if ($ally){
-			$ND::DBH->do("UPDATE planets SET alliance_id = ? WHERE id = planetid(?,?,?,0)"
-				,undef,$aid,$x,$y,$z);
-			$ND::server->command("msg $ND::target Setting $x:$y:$z as $ally");
+			my $findid = $ND::DBH->prepare_cached(q{SELECT planetid(?,?,?,0)});
+			my ($id) = $ND::DBH->selectrow_array($findid,undef,$x,$y,$z);
+			if($id && $ND::DBH->do('UPDATE planets SET alliance_id = $1 WHERE id = $2'
+				,undef,$aid,$id)){
+				$ND::server->command("msg $ND::target Setting $x:$y:$z as $ally");
+				intel_log $user->{uid},$id,"Set alliance_id to: $aid ($ally)";
+			}else{
+				$ND::server->command("msg $ND::target Couldn't find a planet at $x:$y:$z");
+			}
 		}else{
 			$ND::server->command("msg $ND::target Couldn't find such an alliance");
 		}
@@ -98,10 +111,13 @@ sub setAlly {
 sub setChannel {
 	my ($x,$y,$z,$channel) = @_;
 	DB();
-	if (officer()){
-		if ($ND::DBH->do("UPDATE planets SET channel = ? WHERE id = planetid(?,?,?,0)"
-				,undef,$channel,$x,$y,$z)){
+	if (my $user = officer()){
+		my $findid = $ND::DBH->prepare_cached(q{SELECT planetid(?,?,?,0)});
+		my ($id) = $ND::DBH->selectrow_array($findid,undef,$x,$y,$z);
+		if ($ND::DBH->do('UPDATE planets SET channel = $1 WHERE id = $2'
+				,undef,$channel,$id)){
 			$ND::server->command("msg $ND::target $x:$y:$z relay channel has been set to: $channel");
+			intel_log $user->{uid},$id,"Set channel to: $channel";
 		}
 	}
 }