target list more ajax:ish

[ndwebbie.git] / calls.pl

diff --git a/calls.pl b/calls.pl
index e063882ec01720443c9f82a8105fbc15f9336770..ad7e13c449c20ed2cc8506a9e0b5831d33691c28 100644 (file)
--- a/calls.pl
+++ b/calls.pl
@@ -22,10 +22,11 @@ use POSIX;
 our $BODY;
 our $DBH;
 our $LOG;
+my $error;
 
 $ND::TEMPLATE->param(TITLE => 'Defense Calls');
 
-die "You don't have access" unless isBC();
+die "You don't have access" unless isDC();
 
 my $call;
 if (param('call') =~ /^(\d+)$/){
@@ -40,27 +41,28 @@ WHERE c.id = ?});
 }
 if ($call){
        if (param('cmd') eq 'Submit'){
-       }elsif (param('cmd') eq 'Submit'){
                $DBH->begin_work;
                if (param('ctick')){
                        if ($DBH->do(q{UPDATE calls SET landing_tick = ? WHERE id = ?}
                                        ,undef,param('tick'),$call->{id})){
                                $call->{landing_tick} = param('tick');
+                               $LOG->execute($ND::UID,"DC updated landing tick for call $call->{id}");
                        }else{
-                               print "<p> Something went wrong: ".$DBH->errstr."</p>";
+                               $error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
                        }
                }
-               if (param('info')){
+               if (param('cinfo')){
                        if ($DBH->do(q{UPDATE calls SET info = ? WHERE id = ?}
                                        ,undef,param('info'),$call->{id})){
                                $call->{info} = param('info');
+                               $LOG->execute($ND::UID,"DC updated info for call $call->{id}");
                        }else{
-                               print "<p> Something went wrong: ".$DBH->errstr."</p>";
+                               $error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
                        }
                }
-               $DBH->commit or print "<p> Something went wrong: ".$DBH->errstr."</p>";
+               $DBH->commit or $error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
        }elsif(param('cmd') =~ /^(Cover|Uncover|Ignore|Open|Take) call$/){
-               print "test";
+               $error .= "test";
                my $extra_vars = '';
                if (param('cmd') eq 'Cover call'){
                        $extra_vars = ", covered = TRUE, open = FALSE";
@@ -77,7 +79,7 @@ if ($call){
                        $call->{open} = (param('cmd') =~ /^(Uncover|Open) call$/);
                        $call->{DC} = $ND::USER;
                }else{
-                       print "<p> Something went wrong: ".$DBH->errstr."</p>";
+                       $error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
                }
        }elsif(param('cmd') eq 'Remove'){
                $DBH->begin_work;
@@ -87,11 +89,11 @@ if ($call){
                                if($query->execute($1,$call->{id})){
                                        $LOG->execute($ND::UID,"DC deleted fleet: $1, call $call->{id}");
                                }else{
-                                       print "<p> Something went wrong: ".$DBH->errstr."</p>";
+                                       $error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
                                }
                        }
                }
-               $DBH->commit or print "<p> Something went wrong: ".$DBH->errstr."</p>";
+               $DBH->commit or $error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
        }elsif(param('cmd') eq 'Change'){
                $DBH->begin_work;
                my $query = $DBH->prepare(q{UPDATE incomings SET shiptype = ? WHERE id = ? AND call = ?});
@@ -101,11 +103,11 @@ if ($call){
                                if($query->execute($shiptype,$1,$call->{id})){
                                        $LOG->execute($ND::UID,"DC set fleet: $1, call $call->{id} to: $shiptype");
                                }else{
-                                       print "<p> Something went wrong: ".$DBH->errstr."</p>";
+                                       $error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
                                }
                        }
                }
-               $DBH->commit or print "<p> Something went wrong: ".$DBH->errstr."</p>";
+               $DBH->commit or $error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
        }
 }
 
@@ -170,11 +172,11 @@ ORDER BY p.x,p.y,p.z});
        }
        my $query = $DBH->prepare(qq{
 SELECT c.id, coords(p.x,p.y,p.z), u.defense_points, c.landing_tick, 
-       TRIM('/' FROM concat(p2.race||'/')) AS race, TRIM('/' FROM concat(i.amount||'/')) AS amount,
-       TRIM('/' FROM concat(i.eta||'/')) AS eta, TRIM('/' FROM concat(i.shiptype||'/')) AS shiptype,
-       TRIM('/' FROM concat(c.landing_tick - tick() ||'/')) AS curreta,
-       TRIM('/' FROM concat(p2.alliance ||'/')) AS alliance,
-       TRIM('/' FROM concat(coords(p2.x,p2.y,p2.z) ||'/')) AS attackers
+       TRIM('/' FROM concat(p2.race||' /')) AS race, TRIM('/' FROM concat(i.amount||' /')) AS amount,
+       TRIM('/' FROM concat(i.eta||' /')) AS eta, TRIM('/' FROM concat(i.shiptype||' /')) AS shiptype,
+       TRIM('/' FROM concat(c.landing_tick - tick() ||' /')) AS curreta,
+       TRIM('/' FROM concat(p2.alliance ||' /')) AS alliance,
+       TRIM('/' FROM concat(coords(p2.x,p2.y,p2.z) ||' /')) AS attackers
 FROM calls c 
        JOIN incomings i ON i.call = c.id
        JOIN users u ON c.member = u.uid
@@ -183,15 +185,17 @@ FROM calls c
 WHERE $where
 GROUP BY c.id, p.x,p.y,p.z, u.username, c.landing_tick, c.info,u.defense_points
 ORDER BY c.landing_tick DESC
-               })or print $DBH->errstr;
-       $query->execute or print $DBH->errstr;
+               })or $error .= $DBH->errstr;
+       $query->execute or $error .= $DBH->errstr;
        my @calls;
        my $i = 0;
        while (my $call = $query->fetchrow_hashref){
                $call->{ODD} = $i % 2;
+               $call->{shiptype} = escapeHTML($call->{shiptype});
                push @calls, $call;
                $i++;
        }
        $BODY->param(Calls => \@calls);
 }
+$BODY->param(Error => $error);
 1;