X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FCalls.pm;h=7203bc11bfe82285750ee66f2266ac828a8ea840;hb=935116e73806d105bf3097b62e3e231fe834d672;hp=5c3298a675dddc5581c770c3751c0b11b4dee33d;hpb=b6d8351387cf06b88e362a458aad1e0982e575dd;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Calls.pm b/lib/NDWeb/Controller/Calls.pm
index 5c3298a..7203bc1 100644
--- a/lib/NDWeb/Controller/Calls.pm
+++ b/lib/NDWeb/Controller/Calls.pm
@@ -34,17 +34,17 @@ sub list : Local {
 	my ( $self, $c, $type ) = @_;
 	my $dbh = $c->model;
 
-	my $where = q{open AND landing_tick-6 > tick()};
+	my $where = q{status = 'Open' AND landing_tick-6 > tick()};
 	my $order = q{landing_tick DESC, defprio DESC};
 	if (defined $type){
 		if ($type eq 'covered'){
-			$where = 'covered';
+			$where = q{status = 'Covered'};
 		}elsif ($type eq 'all'){
 			$where = 'true';
 		}elsif ($type eq 'uncovered'){
-			$where = 'not covered';
+			$where = q{status <> 'Covered'};
 		}elsif ($type eq 'recent'){
-			$where = q{landing_tick > tick()};
+			$where = q{landing_tick >= tick()};
 			$order = q{x,y,z};
 		}
 	}
@@ -90,6 +90,7 @@ sub edit : Local {
 			mission = 'Full fleet'
 			OR tick >= $2 - 12
 		)
+	ORDER BY mission,name,tick DESC
 ) UNION (
 	SELECT 2 AS type, MAX(fid) AS fid,mission,name,landing_tick AS tick, eta, amount
 		, coords(x,y,z), pid AS planet, back
@@ -114,7 +115,7 @@ sub edit : Local {
 	my $ships = $dbh->prepare(q{SELECT ship,amount FROM fleet_ships
 		WHERE fid = ? ORDER BY num
 		});
-	$outgoings->execute($call->{planet},$call->{landing_tick});
+	$outgoings->execute($call->{pid},$call->{landing_tick});
 	my @fleets;
 	while (my $fleet = $outgoings->fetchrow_hashref){
 		if (defined $fleet->{back} &&
@@ -134,9 +135,9 @@ sub edit : Local {
 	}
 
 	my $available = $dbh->prepare(q{
-SELECT ship,amount from ships_home WHERE planet = $1 AND tick = $2
+SELECT ship,amount from ships_home WHERE pid = $1 AND tick = $2
 		});
-	$available->execute($call->{planet}, $call->{landing_tick});
+	$available->execute($call->{pid}, $call->{landing_tick});
 	my $fleet = {fid => $call->{member}, mission => 'Available'
 		, name => 'At home', ships => $available->fetchall_arrayref({})
 	};
@@ -155,11 +156,11 @@ FROM fleets f
 		FROM launch_confirmations
 		WHERE pid = $1 AND landing_tick = $2
 	) lc USING (fid)
-WHERE mission = 'Defend'
+WHERE mission IN ('Defend', 'Fake Defend')
 ORDER BY x,y,z
 	});
 
-	$defenders->execute($call->{planet},$call->{landing_tick});
+	$defenders->execute($call->{pid},$call->{landing_tick});
 	my @defenders;
 	while (my $fleet = $defenders->fetchrow_hashref){
 		$ships->execute($fleet->{fid});
@@ -176,16 +177,16 @@ ORDER BY x,y,z
 
 	my $attackers = $dbh->prepare(q{
 		SELECT coords(p.x,p.y,p.z), p.planet_status, p.race,i.eta,i.amount
-			,i.fleet,i.shiptype,p.relationship,p.alliance,i.id,pid AS planet
+			,i.fleet,i.shiptype,p.relationship,p.alliance,inc,pid
 		FROM incomings i
 			JOIN current_planet_stats p USING (pid)
 		WHERE i.call = ?
 		ORDER BY p.x,p.y,p.z
 	});
-	$attackers->execute($call->{id});
+	$attackers->execute($call->{call});
 	my @attackers;
 	while(my $attacker = $attackers->fetchrow_hashref){
-		$outgoings->execute($attacker->{planet},$call->{landing_tick});
+		$outgoings->execute($attacker->{pid},$call->{landing_tick});
 		my @missions;
 		while (my $mission = $outgoings->fetchrow_hashref){
 			if ($mission->{fid}){
@@ -205,24 +206,30 @@ ORDER BY x,y,z
 	$c->stash(attackers => \@attackers);
 
 	$c->forward('/forum/findPosts',[$call->{ftid}]);
+
+	my $statuses = $dbh->prepare(q{
+SELECT status FROM call_statuses
+		});
+	$statuses->execute;
+	$c->stash(statuses => $statuses->fetchall_arrayref({}));
 }
 
 sub defleeches : Local {
 	my ( $self, $c, $type ) = @_;
 	my $dbh = $c->model;
 
-	my $query = $dbh->prepare(q{SELECT username,defense_points,count(id) AS calls
+	my $query = $dbh->prepare(q{SELECT username,defense_points,count(call) AS calls
 		, SUM(fleets) AS fleets, SUM(recalled) AS recalled
 		,count(NULLIF(fleets,0)) AS defended_calls
-		FROM (SELECT username,defense_points,c.id,count(f.back) AS fleets
+		FROM (SELECT username,defense_points,call,count(f.back) AS fleets
 			, count(NULLIF(f.landing_tick + f.eta -1 = f.back,TRUE)) AS recalled
-			FROM users u JOIN calls c ON c.member = u.uid
+			FROM users u JOIN calls c USING (uid)
 				LEFT OUTER JOIN (
 					SELECT lc.pid,landing_tick,eta,back
 					FROM launch_confirmations lc JOIN fleets f USING (fid)
 					WHERE mission = 'Defend'
 				) f USING (pid,landing_tick)
-			GROUP BY username,defense_points,c.id
+			GROUP BY username,defense_points,call
 		) d
 		GROUP BY username,defense_points ORDER BY fleets DESC, defense_points
 		});
@@ -238,7 +245,7 @@ sub postcallcomment : Local {
 	$call = $c->stash->{call};
 
 	$c->forward('/forum/insertPost',[$call->{ftid}]);
-	$c->res->redirect($c->uri_for('edit',$call->{id}));
+	$c->res->redirect($c->uri_for('edit',$call->{call}));
 }
 
 sub postcallupdate : Local {
@@ -254,42 +261,39 @@ sub postcallupdate : Local {
 
 	$dbh->begin_work;
 	if ($c->req->param('cmd') eq 'Submit'){
+		my $logmess = '';
 		if ($c->req->param('ctick')){
-			$dbh->do(q{UPDATE calls SET landing_tick = ? WHERE id = ?}
-				,undef,$c->req->param('tick'),$call->{id});
-			$log->execute($c->user->id,$call->{ftid}
-				,"Updated landing tick from [B] $call->{landing_tick} [/B]");
+			$dbh->do(q{UPDATE calls SET landing_tick = ? WHERE call = ?}
+				,undef,$c->req->param('tick'),$call->{call});
+			$logmess .= "Updated landing tick from [B] $call->{landing_tick} [/B]\n";
 		}
 		if ($c->req->param('cinfo')){
-			$dbh->do(q{UPDATE calls SET info = ? WHERE id = ?}
-				,undef,$c->req->param('info'),$call->{id});
-			$log->execute($c->user->id,$call->{ftid},"Updated info");
+			$dbh->do(q{UPDATE calls SET info = ? WHERE call = ?}
+				,undef,$c->req->param('info'),$call->{call});
+			$logmess .= "Updated info\n";
 		}
 		if ($c->req->param('ccalc')){
 			my $calc = $c->req->param('calc');
-			$dbh->do(q{UPDATE calls SET calc = ? WHERE id = ?}
-				,undef,$calc,$call->{id});
-			$log->execute($c->user->id,$call->{ftid},html_escape('Updated calc to: [URL]'.$calc.'[/URL]'));
+			$dbh->do(q{UPDATE calls SET calc = ? WHERE call = ?}
+				,undef,$calc,$call->{call});
+			$logmess .= html_escape('Updated calc to: [URL]'.$calc."[/URL]\n");
 		}
-	}elsif($c->req->param('cmd') =~ /^(Cover|Uncover|Ignore|Open|Take) call$/){
-		my $extra_vars = '';
-		if ($1 eq 'Cover'){
-			$extra_vars = ", covered = TRUE, open = FALSE";
-		}elsif ($1 eq 'Uncover'){
-			$extra_vars = ", covered = FALSE, open = TRUE";
-		}elsif ($1 eq 'Ignore'){
-			$extra_vars = ", covered = FALSE, open = FALSE";
-		}elsif ($1 eq 'Open'){
-			$extra_vars = ", covered = FALSE, open = TRUE";
+		if ($c->req->param('cstatus')){
+			$dbh->do(q{UPDATE calls SET status = $1, dc = $2 WHERE call = $3}
+				,undef,$c->req->param('status'),$c->user->id,$call->{call});
+			$logmess .= "Changed status to: ".$c->req->param('status')."\n";
 		}
-		$dbh->do(qq{UPDATE calls SET dc = ? $extra_vars WHERE id = ?},
-			,undef,$c->user->id,$call->{id});
+		$log->execute($c->user->id,$call->{ftid},$logmess) if $log;
+	}elsif($c->req->param('cmd') =~ /^Take call$/){
+		my $extra_vars = '';
+		$dbh->do(q{UPDATE calls SET dc = ? WHERE call = ?},
+			,undef,$c->user->id,$call->{call});
 		$log->execute($c->user->id,$call->{ftid}
 			,'Changed status to: [B]'.$c->req->param('cmd').'[/B]');
 	}
 	$dbh->commit;
 
-	$c->res->redirect($c->uri_for('edit',$call->{id}));
+	$c->res->redirect($c->uri_for('edit',$call->{call}));
 }
 
 
@@ -306,24 +310,24 @@ sub postattackerupdate : Local {
 
 	$dbh->begin_work;
 	if($c->req->param('cmd') eq 'Remove'){
-		my $query = $dbh->prepare(q{DELETE FROM incomings WHERE id = ? AND call = ?});
-		my $inc = $dbh->prepare(q{SELECT sender,eta,amount FROM incomings WHERE id = $1});
+		my $query = $dbh->prepare(q{DELETE FROM incomings WHERE inc = ? AND call = ?});
+		my $inc = $dbh->prepare(q{SELECT pid,eta,amount FROM incomings WHERE inc = $1});
 		for my $param ($c->req->param()){
 			if ($param =~ /^change:(\d+)$/){
 				my ($planet,$eta,$amount) = $dbh->selectrow_array($inc,undef,$1);
-				$query->execute($1,$call->{id});
+				$query->execute($1,$call->{call});
 				$log->execute($c->user->id,$call->{ftid}
 					,"Deleted fleet: [B] $1 [/B] ($planet:$eta:$amount)");
 			}
 		}
 	}elsif($c->req->param('cmd') eq 'Change'){
 		my $query = $dbh->prepare(q{UPDATE incomings SET shiptype = ?
-			WHERE id = ? AND call = ?
+			WHERE inc = ? AND call = ?
 		});
 		for my $param ($c->req->param()){
 			if ($param =~ /^change:(\d+)$/){
 				my $shiptype = html_escape($c->req->param("shiptype:$1"));
-				$query->execute($shiptype,$1,$call->{id});
+				$query->execute($shiptype,$1,$call->{call});
 				$log->execute($c->user->id,$call->{ftid}
 					,"set fleet: [B] $1 [/B] to: [B] $shiptype [/B]");
 			}
@@ -331,7 +335,7 @@ sub postattackerupdate : Local {
 	}
 	$dbh->commit;
 
-	$c->res->redirect($c->uri_for('edit',$call->{id}));
+	$c->res->redirect($c->uri_for('edit',$call->{call}));
 }
 
 sub findCall : Private {
@@ -339,14 +343,14 @@ sub findCall : Private {
 	my $dbh = $c->model;
 
 	my $query = $dbh->prepare(q{
-		SELECT c.id, coords(p.x,p.y,p.z), c.landing_tick, c.info, covered
-			,open, dc.username AS dc, u.defense_points,c.member AS uid
-			,p.pid AS planet, u.username AS member, u.sms,c.ftid,calc
-		FROM calls c 
-		JOIN users u ON c.member = u.uid
+		SELECT call, coords(p.x,p.y,p.z), c.landing_tick, c.info, status
+			,dc.username AS dc, u.defense_points,c.uid
+			,p.pid, u.username AS member, u.sms,c.ftid,calc
+		FROM calls c
+		JOIN users u USING (uid)
 		JOIN current_planet_stats p USING (pid)
 		LEFT OUTER JOIN users dc ON c.dc = dc.uid
-		WHERE c.id = ?
+		WHERE call = ?
 		});
 	$call = $dbh->selectrow_hashref($query,undef,$call);