X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=main.pl;h=345b1bea4dd112d8791ca13a3d55dcf889d56b4b;hb=30ff54d1d68e41a17bd8a7ff57e4104021e52ff5;hp=61cd47100b88caca012d1db849780f75c4bab82a;hpb=508dd947d7de74b6e0d021b885a77407e524b6b2;p=ndwebbie.git

diff --git a/main.pl b/main.pl
index 61cd471..345b1be 100644
--- a/main.pl
+++ b/main.pl
@@ -18,39 +18,69 @@
 #**************************************************************************/
 
 use strict;
+use warnings FATAL => 'all';
 
 $ND::TEMPLATE->param(TITLE => 'Main Page');
 
 our $BODY;
 our $DBH;
-
-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)});
-		$insert->execute($ND::UID,$ND::PLANET);
-		($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');
-	while ($fleet =~ m/((?:[A-Z][a-z]+ )*[A-Z][a-z]+)\s+((?:\d+|,)+)/g){
-		my $amount = $2;
-		$amount =~ s/,//;
-		$insert->execute($id,$1,$amount);
+my $error;
+
+if (defined param('cmd')){
+	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,back) VALUES (?,?,'Full fleet',0,0,0,0)});
+			$insert->execute($ND::UID,$ND::PLANET);
+			($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;
+		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);
+		$DBH->commit;
+	}elsif (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>';
+	}elsif (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>';
 	}
-	$fleet = $DBH->prepare('UPDATE fleets SET landing_tick = tick() WHERE id = ?');
-	$fleet->execute($id);
-	$DBH->commit;
 }
 if (param('sms')){
 	my $query = $DBH->prepare('UPDATE users SET sms = ? WHERE uid = ?');
 	$query->execute(escapeHTML(param('sms')),$ND::UID);
 }
-if (isMember() && !$ND::PLANET && (param('planet') =~ m/(\d+)(?: |:)(\d+)(?: |:)(\d+)/)){
+if (isMember() && !$ND::PLANET && defined param('planet') && (param('planet') =~ m/(\d+)(?: |:)(\d+)(?: |:)(\d+)/)){
 	my $query = $DBH->prepare(q{
 UPDATE users SET planet = 
 	(SELECT id from current_planet_stats where x = ? AND y = ? AND z = ?)
@@ -65,7 +95,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 +129,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;