X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=main.pl;h=4c8dfabca13ab16164f4911d8bf4a3b8a52c0924;hb=354c2fb813a139fb08476b6d0e7f30308091038a;hp=7614d8a777f297bbc6b480779ad81bcea4e4462e;hpb=073463a38ef44b632155ffd6f4e61f4e1370a821;p=ndwebbie.git

diff --git a/main.pl b/main.pl
index 7614d8a..4c8dfab 100644
--- a/main.pl
+++ b/main.pl
@@ -18,18 +18,21 @@
 #**************************************************************************/
 
 use strict;
+use warnings FATAL => 'all';
+no warnings qw(uninitialized);
 
 $ND::TEMPLATE->param(TITLE => 'Main Page');
 
 our $BODY;
 our $DBH;
+my $error;
 
 if (param('cmd') eq 'fleet'){
 	$DBH->begin_work;
 	my $fleet = $DBH->prepare("SELECT id FROM fleets WHERE uid = ? AND fleet = 0");
 	my ($id) = $DBH->selectrow_array($fleet,undef,$ND::UID);
 	unless ($id){
-		my $insert = $DBH->prepare(q{INSERT INTO fleets (uid,target,mission,landing_tick,fleet,eta) VALUES (?,$?,'Base',0,0,0)});
+		my $insert = $DBH->prepare(q{INSERT INTO fleets (uid,target,mission,landing_tick,fleet,eta,back) VALUES (?,?,'Full fleet',0,0,0,0)});
 		$insert->execute($ND::UID,$ND::PLANET);
 		($id) = $DBH->selectrow_array($fleet,undef,$ND::UID);
 	}
@@ -37,10 +40,9 @@ if (param('cmd') eq 'fleet'){
 	$delete->execute($id);
 	my $insert = $DBH->prepare('INSERT INTO fleet_ships (fleet,ship,amount) VALUES (?,?,?)');
 	$fleet = param('fleet');
-	while ($fleet =~ m/((?:[A-Z][a-z]+ )*[A-Z][a-z]+)\s+((?:\d+|,)+)/g){
-		my $amount = $2;
-		$amount =~ s/,//;
-		$insert->execute($id,$1,$amount);
+	$fleet =~ s/,//g;
+	while ($fleet =~ m/((?:[A-Z][a-z]+ )*[A-Z][a-z]+)\s+(\d+)/g){
+		$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);
@@ -57,6 +59,35 @@ UPDATE users SET planet =
 WHERE uid = ? });
 	$query->execute($1,$2,$3,$ND::UID);
 }
+if (param('cmd') eq 'Recall Fleets'){
+	$DBH->begin_work;
+	my $updatefleets = $DBH->prepare('UPDATE fleets SET back = tick() + (tick() - (landing_tick - eta))  WHERE uid = ? AND id = ?');
+	
+	for my $param (param()){
+		if ($param =~ /^change:(\d+)$/){
+			if($updatefleets->execute($ND::UID,$1)){
+				$ND::LOG->execute($ND::UID,"Member recalled fleet $1");
+			}else{
+				$error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
+			}
+		}
+	}
+	$DBH->commit or $error .= '<p>'.$DBH->errstr.'</p>';
+}
+if (param('cmd') eq 'Change Fleets'){
+	$DBH->begin_work;
+	my $updatefleets = $DBH->prepare('UPDATE fleets SET back = ? WHERE uid = ? AND id = ?');
+	for my $param (param()){
+		if ($param =~ /^change:(\d+)$/){
+			if($updatefleets->execute(param("back:$1"),$ND::UID,$1)){
+				$ND::LOG->execute($ND::UID,"Member set fleet $1 to be back tick: ".param("back:$1"));
+			}else{
+				$error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
+			}
+		}
+	}
+	$DBH->commit or $error .= '<p>'.$DBH->errstr.'</p>';
+}
 if(param('oldpass') && param('pass')){
 	my $query = $DBH->prepare('UPDATE users SET password = MD5(?) WHERE password = MD5(?) AND uid = ?');
 	$query->execute(param('pass'),param('oldpass'),$ND::UID);
@@ -65,7 +96,7 @@ if(param('oldpass') && param('pass')){
 my ($motd) = $DBH->selectrow_array("SELECT value FROM misc WHERE id='MOTD'");
 
 $BODY->param(MOTD => parseMarkup($motd));
-$BODY->param(Username => 'harv');
+$BODY->param(Username => $ND::USER);
 $BODY->param(isMember => isMember());
 $BODY->param(isHC => isHC());
 my @groups = map {name => $_}, sort keys %ND::GROUPS;
@@ -99,23 +130,27 @@ if ($planet){
 }
 
 
-my $query = $DBH->prepare(q{SELECT f.fleet, coords(x,y,z), mission, sum(fs.amount) AS amount, landing_tick 
+$query = $DBH->prepare(q{SELECT f.fleet,f.id, coords(x,y,z) AS target, mission, sum(fs.amount) AS amount, landing_tick, back
 FROM fleets f 
 	JOIN fleet_ships fs ON f.id = fs.fleet 
 	JOIN current_planet_stats p ON f.target = p.id
-WHERE f.uid = ? AND (f.fleet = 0 OR landing_tick > ?)
-GROUP BY f.fleet, x,y,z, mission, landing_tick
+WHERE f.uid = ? AND (f.fleet = 0 OR back >= ?)
+GROUP BY f.fleet,f.id, x,y,z, mission, landing_tick,back
 ORDER BY f.fleet
 });
 
-$query->execute($ND::UID,$ND::TICK);
+$query->execute($ND::UID,$ND::TICK) or $error .= '<p>'.$DBH->errstr.'</p>';
 my @fleets;
-while (my($fleet,$coords,$mission,$amount,$landing_tick) = $query->fetchrow){
-	push @fleets,{Target => $coords, Mission => $mission, Amount => $amount, LandingTick => $landing_tick};
+my $i = 0;
+while (my $fleet = $query->fetchrow_hashref){
+	$i++;
+	$fleet->{ODD} = $i % 2;
+	push @fleets,$fleet;
 }
 $BODY->param(Fleets => \@fleets);
 
 $BODY->param(SMS => $sms);
+$BODY->param(Error => $error);
 
 1;