X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=NDWeb%2FPages%2FCalls.pm;h=6e51754b11ae6867a1e0a89ac32536d7f653d9f5;hb=80ad5ca3ad49aa9cc029fe3baaff513e422ef499;hp=a8a9843d378c9541056fe2bb8b792e4cba02d706;hpb=a074bd17f5e8ba341a22bbfca1da7093b8351774;p=ndwebbie.git

diff --git a/NDWeb/Pages/Calls.pm b/NDWeb/Pages/Calls.pm
index a8a9843..6e51754 100644
--- a/NDWeb/Pages/Calls.pm
+++ b/NDWeb/Pages/Calls.pm
@@ -18,7 +18,8 @@
 #**************************************************************************/
 package NDWeb::Pages::Calls;
 use strict;
-use warnings FATAL => 'all';
+use warnings;
+use NDWeb::Forum;
 use ND::Include;
 use CGI qw/:standard/;
 use NDWeb::Include;
@@ -35,18 +36,20 @@ sub render_body {
 
 	return $self->noAccess unless $self->isDC;
 
-	my $error;
-
 	my $call;
+	my $thread;
 	if (defined param('call') && param('call') =~ /^(\d+)$/){
 		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,u.planet
+			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,u.planet, u.username AS member, u.sms,c.ftid
 			FROM calls c 
 			JOIN users u ON c.member = u.uid
 			LEFT OUTER JOIN users dc ON c.dc = dc.uid
 			JOIN current_planet_stats p ON u.planet = p.id
 			WHERE c.id = ?});
 		$call = $DBH->selectrow_hashref($query,undef,$1);
+
+		$thread = $DBH->selectrow_hashref(q{SELECT ftid AS id, subject FROM forum_threads
+			where ftid = $1},undef,$call->{ftid}) or warn $DBH->errstr;
 	}
 	if ($call && defined param('cmd')){
 		if (param('cmd') eq 'Submit'){
@@ -55,23 +58,22 @@ sub render_body {
 				if ($DBH->do(q{UPDATE calls SET landing_tick = ? WHERE id = ?}
 						,undef,param('tick'),$call->{id})){
 					$call->{landing_tick} = param('tick');
-					log_message $ND::UID,"DC updated landing tick for call $call->{id}";
+					def_log $ND::UID,$call->{id},"Updated landing tick to [B] $call->{landing_tick} [/B]";
 				}else{
-					$error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
+					warn $DBH->errstr;
 				}
 			}
 			if (param('cinfo')){
 				if ($DBH->do(q{UPDATE calls SET info = ? WHERE id = ?}
 						,undef,param('info'),$call->{id})){
 					$call->{info} = param('info');
-					log_message $ND::UID,"DC updated info for call $call->{id}";
+					def_log $ND::UID,$call->{id},"Updated info";
 				}else{
-					$error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
+					warn $DBH->errstr;
 				}
 			}
-			$DBH->commit or $error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
+			$DBH->commit or warn $DBH->errstr;
 		}elsif(param('cmd') =~ /^(Cover|Uncover|Ignore|Open|Take) call$/){
-			$error .= "test";
 			my $extra_vars = '';
 			if (param('cmd') eq 'Cover call'){
 				$extra_vars = ", covered = TRUE, open = FALSE";
@@ -87,8 +89,9 @@ sub render_body {
 				$call->{covered} = (param('cmd') eq 'Cover call');
 				$call->{open} = (param('cmd') =~ /^(Uncover|Open) call$/);
 				$call->{DC} = $self->{USER};
+				def_log $ND::UID,$call->{id},'Changed status to: [B]'.param('cmd').'[/B]';
 			}else{
-				$error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
+				warn $DBH->errstr;
 			}
 		}elsif(param('cmd') eq 'Remove'){
 			$DBH->begin_work;
@@ -96,13 +99,13 @@ sub render_body {
 			for my $param (param()){
 				if ($param =~ /^change:(\d+)$/){
 					if($query->execute($1,$call->{id})){
-						log_message $ND::UID,"DC deleted fleet: $1, call $call->{id}";
+						def_log $ND::UID,$call->{id},"Deleted fleet: [B] $1 [/B]";
 					}else{
-						$error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
+						warn $DBH->errstr;
 					}
 				}
 			}
-			$DBH->commit or $error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
+			$DBH->commit or warn $DBH->errstr;
 		}elsif(param('cmd') eq 'Change'){
 			$DBH->begin_work;
 			my $query = $DBH->prepare(q{UPDATE incomings SET shiptype = ? WHERE id = ? AND call = ?});
@@ -110,13 +113,16 @@ sub render_body {
 				if ($param =~ /^change:(\d+)$/){
 					my $shiptype = escapeHTML(param("shiptype:$1"));
 					if($query->execute($shiptype,$1,$call->{id})){
-						log_message $ND::UID,"DC set fleet: $1, call $call->{id} to: $shiptype";
+						def_log $ND::UID,$call->{id},"set fleet: [B] $1 [/B] to: [B] $shiptype [/B]";
 					}else{
-						$error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
+						warn $DBH->errstr;
 					}
 				}
 			}
-			$DBH->commit or $error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
+			$DBH->commit or warn $DBH->errstr;
+		}
+		if (defined $thread and param('cmd') eq 'forumpost'){
+			addForumPost($DBH,$thread,$ND::UID,param('message'));
 		}
 	}
 
@@ -126,8 +132,11 @@ sub render_body {
 		$BODY->param(DefensePoints => $call->{defense_points});
 		$BODY->param(LandingTick => $call->{landing_tick});
 		$BODY->param(ETA => $call->{landing_tick}-$self->{TICK});
-		$BODY->param(Info => escapeHTML $call->{info});
+		$BODY->param(Info => $call->{info});
 		$BODY->param(DC => $call->{dc});
+		$BODY->param(Member => $call->{member});
+		$BODY->param(SMS => $call->{sms});
+		$BODY->param(Thread => viewForumThread $thread);
 		if ($call->{covered}){
 			$BODY->param(Cover => 'Uncover');
 		}else{
@@ -138,22 +147,29 @@ sub render_body {
 		}else{
 			$BODY->param(Ignore => 'Open');
 		}
-		my $fleets = $DBH->prepare(q{
-			SELECT id,mission,landing_tick,eta, back FROM fleets WHERE uid = ? AND (fleet = 0 OR (back >= ? AND landing_tick - eta - 11 < ? ))
-			ORDER BY fleet ASC});
-		my $ships = $DBH->prepare('SELECT ship,amount FROM fleet_ships WHERE fleet = ?');
-		$fleets->execute($call->{member},$call->{landing_tick},$call->{landing_tick});
+
+		my $outgoings = $DBH->prepare(q{ 
+			SELECT i.id,i.mission, i.name, i.tick,eta
+				, i.amount, coords(x,y,z) AS target
+			FROM fleets i
+			LEFT OUTER JOIN (planets
+				NATURAL JOIN planet_stats) t ON i.target = t.id
+					AND t.tick = ( SELECT MAX(tick) FROM planet_stats)
+			WHERE  i.sender = $1 
+				AND (i.tick > $2 - 14 OR i.mission = 'Full fleet')
+			ORDER BY i.tick,x,y,z
+		});
+		my $ships = $DBH->prepare('SELECT ship,amount FROM fleet_ships WHERE id = ? ORDER BY num');
+		$outgoings->execute($call->{planet},$call->{landing_tick});
 		my @fleets;
-		while (my $fleet = $fleets->fetchrow_hashref){
-			if ($fleet->{back} == $call->{landing_tick}){
+		while (my $fleet = $outgoings->fetchrow_hashref){
+			if (defined $fleet->{back} &&
+					$fleet->{back} == $call->{landing_tick}){
 				$fleet->{Fleetcatch} = 1;
 			}
 			$ships->execute($fleet->{id});
 			my @ships;
-			my $i = 0;
 			while (my $ship = $ships->fetchrow_hashref){
-				$i++;
-				$ship->{ODD} = $i % 2;
 				push @ships,$ship;
 			}
 			$fleet->{Ships} = \@ships;
@@ -161,39 +177,59 @@ sub render_body {
 		}
 		$BODY->param(Fleets => \@fleets);
 
+		my $defenders = $DBH->prepare(q{ 
+			SELECT i.id,i.mission, i.name, i.tick,eta
+				, i.amount, coords(x,y,z) AS sender
+			FROM fleets i
+			LEFT OUTER JOIN (planets
+				NATURAL JOIN planet_stats) s ON i.sender = s.id
+					AND s.tick = ( SELECT MAX(tick) FROM planet_stats)
+			WHERE i.target = ?
+				AND i.tick = ? AND i.mission = 'Defend'
+			ORDER BY i.tick,x,y,z
+		});
 
-		$fleets = $DBH->prepare(q{
-			SELECT username, id,back - (landing_tick + eta - 1) AS recalled FROM fleets f JOIN users u USING (uid) WHERE target = $1 and landing_tick = $2
-			});
-		$fleets->execute($call->{planet},$call->{landing_tick}) or $ND::ERROR .= p $DBH->errstr;
+		$defenders->execute($call->{planet},$call->{landing_tick}) or warn $DBH->errstr;
 		my @defenders;
-		while (my $fleet = $fleets->fetchrow_hashref){
+		while (my $fleet = $defenders->fetchrow_hashref){
+			$fleet->{CLASS} = $fleet->{mission};
 			$ships->execute($fleet->{id});
 			my @ships;
-			my $i = 0;
 			while (my $ship = $ships->fetchrow_hashref){
-				$i++;
-				$ship->{ODD} = $i % 2;
 				push @ships,$ship;
 			}
 			$fleet->{Ships} = \@ships;
-			delete $fleet->{id};
 			push @defenders, $fleet;
 		}
 		$BODY->param(Defenders => \@defenders);
 
 		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
+			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,p.id AS planet
 			FROM incomings i
 			JOIN current_planet_stats p ON i.sender = p.id
 			WHERE i.call = ?
-			ORDER BY p.x,p.y,p.z});
+			ORDER BY p.x,p.y,p.z
+		});
 		$attackers->execute($call->{id});
 		my @attackers;
-		my $i = 0;
 		while(my $attacker = $attackers->fetchrow_hashref){
-			$i++;
-			$attacker->{ODD} = $i % 2;
+			$outgoings->execute($attacker->{planet},$call->{landing_tick});
+			my @missions;
+			while (my $mission = $outgoings->fetchrow_hashref){
+				$mission->{eta} = '?' if not defined $mission->{eta};
+				$mission->{amount} = '?' if not defined $mission->{amount};
+				$mission->{CLASS} = $mission->{mission};
+				my @ships;
+				$ships->execute($mission->{id});
+				while (my $ship = $ships->fetchrow_hashref){
+					push @ships,$ship;
+				}
+				push @ships, {ship => 'No', amount => 'ships'} if @ships == 0;
+				$mission->{ships} = \@ships;
+				push @missions,$mission;
+			}
+			delete $attacker->{planet};
+			$attacker->{missions} = \@missions;
 			push @attackers,$attacker;
 		}
 		$BODY->param(Attackers => \@attackers);
@@ -227,15 +263,14 @@ sub render_body {
 			JOIN current_planet_stats p ON u.planet = p.id
 			JOIN current_planet_stats p2 ON i.sender = p2.id
 			LEFT OUTER JOIN users dc ON c.dc = dc.uid
-			LEFT OUTER JOIN fleets f ON f.target = u.planet AND f.landing_tick = c.landing_tick AND f.back = f.landing_tick + f.eta - 1
+			LEFT OUTER JOIN fleets f ON f.target = u.planet AND f.tick = c.landing_tick AND f.back = f.tick + f.eta - 1
 			WHERE $where
 			GROUP BY c.id, p.x,p.y,p.z, c.landing_tick, u.defense_points,dc.username,p2.race,i.amount,i.eta,i.shiptype,p2.alliance,p2.x,p2.y,p2.z) a
 			GROUP BY id, x,y,z,landing_tick, defense_points,dc,curreta,fleets
 			ORDER BY landing_tick DESC
-			})or $error .= $DBH->errstr;
-		$query->execute or $error .= $DBH->errstr;
+			})or warn $DBH->errstr;
+		$query->execute or warn $DBH->errstr;
 		my @calls;
-		my $i = 0;
 		my $tick = $self->{TICK};
 		while (my $call = $query->fetchrow_hashref){
 			if ($call->{defense_points} < $minpoints){
@@ -248,18 +283,14 @@ sub render_body {
 			while ($tick - 24 > $call->{landing_tick}){
 				$tick -= 24;
 				push @calls,{};
-				$i = 0;
 			}
 			$call->{attackers} =~ s{(\d+:\d+:\d+)}{<a href="/check?coords=$1">$1</a>}g;
 			$call->{dcstyle} = 'Hostile' unless defined $call->{dc};
-			$i++;
-			$call->{ODD} = $i % 2;
-			$call->{shiptype} = escapeHTML($call->{shiptype});
+			$call->{shiptype} = $call->{shiptype};
 			push @calls, $call;
 		}
 		$BODY->param(Calls => \@calls);
 	}
-	$BODY->param(Error => $error);
 	return $BODY;
 }
 1;