From: Michael Andreen <harv@ruin.nu>
Date: Sun, 7 Jan 2007 11:41:13 +0000 (+0000)
Subject: ftid in planets instead of planet in forum_threads
X-Git-Url: https://ruin.nu/git/?a=commitdiff_plain;h=6a442a1f778230dccf47632b30ed9c7db3d6b3d2;p=ndwebbie.git

ftid in planets instead of planet in forum_threads
---

diff --git a/ND/Include.pm b/ND/Include.pm
index 836010a..87d13d0 100644
--- a/ND/Include.pm
+++ b/ND/Include.pm
@@ -47,7 +47,7 @@ sub log_message {
 sub intel_log {
 	my ($uid,$planet, $message) = @_;
 	my $log = $ND::DBH->prepare_cached(q{INSERT INTO forum_posts (ftid,uid,message) VALUES(
-		(SELECT ftid FROM forum_threads WHERE planet = $3),$1,$2)});
+		(SELECT ftid FROM planets WHERE id = $3),$1,$2)});
 	$log->execute($uid,$message,$planet) or $ND::ERROR .= p($ND::DBH->errstr);
 }
 
diff --git a/intel.pl b/intel.pl
index e538411..e5ce1e0 100644
--- a/intel.pl
+++ b/intel.pl
@@ -33,9 +33,9 @@ die "You don't have access" unless isIntel() || isHC();
 
 my $planet;
 if (defined param('coords') && param('coords') =~ /^(\d+)(?: |:)(\d+)(?: |:)(\d+)$/){
-	my $query = $DBH->prepare(q{SELECT x,y,z,coords(x,y,z),id, nick, alliance,alliance_id, planet_status,channel FROM current_planet_stats
+	my $query = $DBH->prepare(q{SELECT x,y,z,coords(x,y,z),id, nick, alliance,alliance_id, planet_status,channel,ftid FROM current_planet_stats
 WHERE  x = ? AND y = ? AND z = ?});
-	$planet = $DBH->selectrow_hashref($query,undef,$1,$2,$3);
+	$planet = $DBH->selectrow_hashref($query,undef,$1,$2,$3) or $ND::ERROR .= p $DBH->errstr;
 }
 
 my $showticks = 'AND (i.tick - i.eta) > (tick() - 48)';
@@ -50,7 +50,7 @@ if (defined param('show')){
 my $thread;
 if (defined $planet){
 	$thread = $DBH->selectrow_hashref(q{SELECT ftid AS id, subject FROM forum_threads
-		where planet = $1},undef,$planet->{id}) or $ERROR .= p($DBH->errstr);
+		where ftid = $1},undef,$planet->{ftid}) or $ERROR .= p($DBH->errstr);
 }
 
 if (defined param('cmd') && param('cmd') eq 'coords'){