some restructuring, put intel messages in forum board instead of separate table

[ndwebbie.git] / launchConfirmation.pl

diff --git a/launchConfirmation.pl b/launchConfirmation.pl
index aacb1038dddf18af091b7213dfc175fea6f9573a..ffe6b11b6c1bb39f524e56437006084d82529315 100644 (file)
--- a/launchConfirmation.pl
+++ b/launchConfirmation.pl
@@ -18,18 +18,20 @@
 #**************************************************************************/
 
 use strict;
+use warnings FATAL => 'all';
+use ND::Include;
 
 $ND::TEMPLATE->param(TITLE => 'Launch Confirmation');
 
 our $BODY;
 our $DBH;
-our $LOG;
+my $error;
 
 
 
 die "You don't have access" unless isMember();
 
-if (param('cmd') eq 'submit'){
+if (defined param('cmd') && param('cmd') eq 'submit'){
        my $missions = param('mission');
        my $findplanet = $DBH->prepare("SELECT planetid(?,?,?,?)");
        my $findattacktarget = $DBH->prepare(q{SELECT c.target,c.wave,c.launched FROM  raid_claims c
@@ -40,13 +42,13 @@ if (param('cmd') eq 'submit'){
        my $finddefensetarget = $DBH->prepare(q{SELECT NULL});
        my $addattackpoint = $DBH->prepare('UPDATE users SET attack_points = attack_points + 1 WHERE uid = ?');
        my $launchedtarget = $DBH->prepare('UPDATE raid_claims SET launched = True WHERE uid = ? AND target = ? AND wave = ?');
-       my $addfleet = $DBH->prepare(qq{INSERT INTO fleets (uid,target,mission,landing_tick,fleet,eta) VALUES (?,?,?,?,(SELECT max(fleet)+1 from fleets WHERE uid = ?),?)});
+       my $addfleet = $DBH->prepare(qq{INSERT INTO fleets (uid,target,mission,landing_tick,fleet,eta,back) VALUES (?,?,?,?,(SELECT max(fleet)+1 from fleets WHERE uid = ?),?,?)});
        my $addships = $DBH->prepare('INSERT INTO fleet_ships (fleet,ship,amount) VALUES (?,?,?)');
 
        my $fleet = $DBH->prepare("SELECT id FROM fleets WHERE uid = ? AND fleet = 0");
        my ($basefleet) = $DBH->selectrow_array($fleet,undef,$ND::UID);
        unless ($basefleet){
-               my $insert = $DBH->prepare(q{INSERT INTO fleets (uid,target,mission,landing_tick,fleet,eta) VALUES (?,?,'Base',0,0,0)});
+               my $insert = $DBH->prepare(q{INSERT INTO fleets (uid,target,mission,landing_tick,fleet,eta,back) VALUES (?,?,'Full fleet',0,0,0,0)});
                $insert->execute($ND::UID,$ND::PLANET);
        }
        my @missions;
@@ -54,7 +56,8 @@ if (param('cmd') eq 'submit'){
        while ($missions =~ m/\S+\s+(\d+):(\d+):(\d+)\s+(\d+):(\d+):(\d+)\s+\((?:(\d+)\+)?(\d+)\).*?(?:\d+hrs\s+)?\d+mins\s+(Attack|Defend|Return|Fake Attack|Fake Defend)(.*?)(?:Launching in tick (\d+), arrival in tick (\d+)|ETA: \d+, Return ETA: (\d+))/sg){
                my %mission;
 
-               my $tick = $ND::TICK+$7+$8;
+               my $tick = $ND::TICK+$8;
+               $tick += $7 if defined $7;
                my $eta = $8;
                my $mission = $9;
                my $x = $4;
@@ -90,13 +93,14 @@ if (param('cmd') eq 'submit'){
                                $addattackpoint->execute($ND::UID);
                                $launchedtarget->execute($ND::UID,$claim->{target},$claim->{wave});
                                $mission{Warning} = "OK:$claim->{target},$claim->{wave},$claim->{launched}";
-                               $LOG->execute($ND::UID,"Gave attack point for confirmation on $mission mission to $x:$y:$z, landing tick $tick");
+                               log_message $ND::UID,"Gave attack point for confirmation on $mission mission to $x:$y:$z, landing tick $tick";
                        }
                }
 
-               $addfleet->execute($ND::UID,$planet_id,$mission,$tick,$ND::UID,$eta);
+               $addfleet->execute($ND::UID,$planet_id,$mission,$tick,$ND::UID,$eta,$tick+$eta-1) or $error .= '<p>'.$DBH->errstr.'</p>';
                my $fleet = $DBH->last_insert_id(undef,undef,undef,undef,"fleets_id_seq");
                $mission{Fleet} = $fleet;
+               $mission{Back} = $tick+$eta-1;
                my $ships = $10;
                my @ships;
                while ($ships =~ m/((?:\w+ )*\w+)\s+\w+\s+\w+\s+(?:Steal|Normal|Emp|Normal\s+Cloaked|Pod|Struc)\s+(\d+)/g){
@@ -104,12 +108,13 @@ if (param('cmd') eq 'submit'){
                        push @ships,{Ship => $1, Amount => $2};
                }
                $mission{Ships} = \@ships;
-               $LOG->execute($ND::UID,"Pasted confirmation for $mission mission to $x:$y:$z, landing tick $tick");
+               log_message $ND::UID,"Pasted confirmation for $mission mission to $x:$y:$z, landing tick $tick";
                push @missions,\%mission;
        }
-       $DBH->commit;
+       $DBH->commit or $error .= '<p>'.$DBH->errstr.'</p>';
        $BODY->param(Missions => \@missions);
 }
+$BODY->param(Error => $error);
 
 
 1;