X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FCalls.pm;h=48eac7eeb1e1406cadc01214e5f65154b32a31c8;hb=25cfbba80f992bd251751782e30cb8c3d57b53d3;hp=0ba04a513c40f2ceabe72a14b0bab6b504afb216;hpb=56ac564207e3abcfcc7929ec155c883a564862c6;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Calls.pm b/lib/NDWeb/Controller/Calls.pm
index 0ba04a5..48eac7e 100644
--- a/lib/NDWeb/Controller/Calls.pm
+++ b/lib/NDWeb/Controller/Calls.pm
@@ -161,7 +161,7 @@ WITH lc AS (
 	SELECT fid,(sum(amount*(metal+crystal+eonium)) / value)::int  AS value_ratio
 	FROM lcp
 		JOIN fleet_ships fs USING (fid)
-		JOIN ship_stats s ON s.name = fs.ship
+		JOIN ship_stats s USING (ship)
 	GROUP BY fid, value
 )
 SELECT DISTINCT ON (x,y,z,pid,name,amount,back) fid,mission, name, eta
@@ -268,13 +268,15 @@ sub postcallupdate : Local {
 	if ($c->req->param('cmd') eq 'Submit'){
 		my $logmess = '';
 		if ($c->req->param('ctick')){
+			my $tick = $c->req->param('tick');
 			$dbh->do(q{UPDATE calls SET landing_tick = ? WHERE call = ?}
-				,undef,$c->req->param('tick'),$call->{call});
+				,undef,$tick,$call->{call});
 			$logmess .= "Updated landing tick from [B] $call->{landing_tick} [/B]\n";
 		}
 		if ($c->req->param('cinfo')){
+			my $info = $c->req->param('info');
 			$dbh->do(q{UPDATE calls SET info = ? WHERE call = ?}
-				,undef,$c->req->param('info'),$call->{call});
+				,undef,$info,$call->{call});
 			$logmess .= "Updated info\n";
 		}
 		if ($c->req->param('ccalc')){
@@ -284,8 +286,9 @@ sub postcallupdate : Local {
 			$logmess .= html_escape('Updated calc to: [URL]'.$calc."[/URL]\n");
 		}
 		if ($c->req->param('cstatus')){
+			my $status = $c->req->param('status');
 			$dbh->do(q{UPDATE calls SET status = $1, dc = $2 WHERE call = $3}
-				,undef,$c->req->param('status'),$c->user->id,$call->{call});
+				,undef,$status,$c->user->id,$call->{call});
 			$logmess .= "Changed status to: ".$c->req->param('status')."\n";
 		}
 		$log->execute($c->user->id,$call->{ftid},$logmess) if $log;