X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND%2FWeb%2FPages%2FMain.pm;h=f6a6696407e5ff41ecb07a5b434f122f37ae92f5;hb=ac65e241f748773959b94d66691ee93019fcae84;hp=4fa2a316acfe8d758806b9ed534b1661b7e5915e;hpb=787cf3bba39678ead6b902b28e497f2f9a10ec6f;p=ndwebbie.git

diff --git a/ND/Web/Pages/Main.pm b/ND/Web/Pages/Main.pm
index 4fa2a31..f6a6696 100644
--- a/ND/Web/Pages/Main.pm
+++ b/ND/Web/Pages/Main.pm
@@ -47,15 +47,19 @@ sub render_body {
 				($id) = $DBH->selectrow_array($fleet,undef,$ND::UID);
 			}
 			my $delete = $DBH->prepare("DELETE FROM fleet_ships WHERE fleet = ?");
-			$delete->execute($id);
 			my $insert = $DBH->prepare('INSERT INTO fleet_ships (fleet,ship,amount) VALUES (?,?,?)');
 			$fleet = param('fleet');
 			$fleet =~ s/,//g;
+			my $match = 0;
 			while ($fleet =~ m/((?:[A-Z][a-z]+ )*[A-Z][a-z]+)\s+(\d+)/g){
+				unless($match){
+					$match = 1;
+					$delete->execute($id);
+				}
 				$insert->execute($id,$1,$2) or $error .= '<p>'.$DBH->errstr.'</p>';
 			}
 			$fleet = $DBH->prepare('UPDATE fleets SET landing_tick = tick() WHERE id = ?');
-			$fleet->execute($id);
+			$fleet->execute($id) if $match;
 			$DBH->commit;
 		}elsif (param('cmd') eq 'Recall Fleets'){
 			$DBH->begin_work;
@@ -127,6 +131,41 @@ sub render_body {
 
 	$BODY->param(Planet => $planet);
 
+	$query = $DBH->prepare(qq{
+		SELECT c.id, c.landing_tick, dc.username,c.covered,
+		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,
+		(c.landing_tick - tick()) AS curreta,
+		TRIM('/' FROM concat(coords(p2.x,p2.y,p2.z) ||' /')) AS attackers
+		FROM calls c 
+		JOIN incomings i ON i.call = c.id
+		JOIN current_planet_stats p2 ON i.sender = p2.id
+		LEFT OUTER JOIN users dc ON c.dc = dc.uid
+		WHERE c.member = ? AND (c.landing_tick - tick())  > 0
+		GROUP BY c.id, c.landing_tick,dc.username,c.covered
+		ORDER BY c.landing_tick DESC
+		})or $error .= $DBH->errstr;
+	$query->execute($ND::UIN) or $error .= $DBH->errstr;
+
+	my $i = 0;
+	my @calls;
+	while (my $call = $query->fetchrow_hashref){
+		$call->{attackers} =~ s{(\d+:\d+:\d+)}{<a href="/check?coords=$1">$1</a>}g;
+		unless(defined $call->{username}){
+			$call->{dc} = 'Hostile';
+			$call->{username} = 'none';
+		}
+		if($call->{covered}){
+			$call->{covered} = 'Friendly';
+		}else{
+			$call->{covered} = 'Hostile';
+		}
+		$i++;
+		$call->{ODD} = $i % 2;
+		$call->{shiptype} = escapeHTML($call->{shiptype});
+		push @calls, $call;
+	}
+	$BODY->param(Calls => \@calls);
 
 	my $planetstats= $DBH->selectrow_hashref(q{SELECT x,y,z, ((ruler || ' OF ') || p.planet) as planet,race,
 		size, size_gain, size_gain_day,
@@ -169,7 +208,7 @@ ORDER BY f.fleet
 
 	$query->execute($ND::UID,$self->{TICK}) or $error .= '<p>'.$DBH->errstr.'</p>';
 	my @fleets;
-	my $i = 0;
+	$i = 0;
 	while (my $fleet = $query->fetchrow_hashref){
 		$i++;
 		$fleet->{ODD} = $i % 2;