need masterop

[ndwebbie.git] / intel.pl

diff --git a/intel.pl b/intel.pl
index 5db6f9bdbe1ef9a7fffca368b4fb2324ffb64034..7f1ec4a71ded074fc31410ff4e686cbb44b43da6 100644 (file)
--- a/intel.pl
+++ b/intel.pl
@@ -19,11 +19,12 @@
 
 use strict;
 use warnings FATAL => 'all';
-no warnings qw(uninitialized);
-use POSIX;
+use ND::Web::Forum;
+
 our $BODY;
 our $DBH;
 our $LOG;
+our $ERROR;
 my $error;
 
 $ND::TEMPLATE->param(TITLE => 'Intel');
@@ -31,20 +32,28 @@ $ND::TEMPLATE->param(TITLE => 'Intel');
 die "You don't have access" unless isIntel() || isHC();
 
 my $planet;
-if (param('coords') =~ /^(\d+)(?: |:)(\d+)(?: |:)(\d+)$/){
+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
 WHERE  x = ? AND y = ? AND z = ?});
        $planet = $DBH->selectrow_hashref($query,undef,$1,$2,$3);
 }
 
 my $showticks = 'AND (i.tick - i.eta) > (tick() - 48)';
-if (param('show') eq 'all'){
-       $showticks = '';
-}elsif (param('show') =~ /^(\d+)$/){
-       $showticks = "AND (i.tick - i.eta) > (tick() - $1)";
+if (defined param('show')){
+       if (param('show') eq 'all'){
+               $showticks = '';
+       }elsif (param('show') =~ /^(\d+)$/){
+               $showticks = "AND (i.tick - i.eta) > (tick() - $1)";
+       }
+}
+
+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);
 }
 
-if (param('cmd') eq 'coords'){
+if (defined param('cmd') && param('cmd') eq 'coords'){
        my $coords = param('coords');
        $DBH->do(q{CREATE TEMPORARY TABLE coordlist (
        x integer NOT NULL,
@@ -66,8 +75,11 @@ ORDER BY alliance, p.x, p.y, p.z});
        }
        $BODY->param(CoordList => \@planets);
 }
+if (defined $thread and defined param('cmd') and param('cmd') eq 'forumpost'){
+       addForumPost($DBH,$thread,$ND::UID,param('message'));
+}
 
-if ($planet){
+if ($planet && defined param('cmd')){
        if (param('cmd') eq 'change'){
                $DBH->begin_work;
                if (param('cnick')){
@@ -128,12 +140,14 @@ if ($planet){
        $BODY->param(Channel => $planet->{channel});
        my @status;
        for my $status (" ","Friendly", "NAP", "Hostile"){
-               push @status,{Status => $status, Selected => $status eq $planet->{planet_status}}
+               push @status,{Status => $status, Selected => defined $planet->{planet_status} && $status eq $planet->{planet_status}}
        }
        $BODY->param(PlanetStatus => \@status);
        my @alliances = alliances($planet->{alliance_id});
        $BODY->param(Alliances => \@alliances);
 
+       $BODY->param(Thread => viewForumThread $thread);
+
        my $query = $DBH->prepare(intelquery('o.alliance AS oalliance,coords(o.x,o.y,o.z) AS origin',"t.id = ? $showticks"));
        $query->execute($planet->{id}) or $error .= $DBH->errstr;
        my @intellists;
@@ -202,6 +216,6 @@ while (my $message = $query->fetchrow_hashref){
        $message->{message} = parseMarkup($message->{message});
        push @messages,$message;
 }
-$BODY->param(IntelMessages => \@messages);
+#$BODY->param(IntelMessages => \@messages);
 $BODY->param(Error => $error);
 1;