X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=main.pl;h=81d7c8f12e8b56687477834b003181cfd8413ffc;hb=75a59d56e110b1170efdb18ec629ca885026176c;hp=7614d8a777f297bbc6b480779ad81bcea4e4462e;hpb=073463a38ef44b632155ffd6f4e61f4e1370a821;p=ndwebbie.git

diff --git a/main.pl b/main.pl
index 7614d8a..81d7c8f 100644
--- a/main.pl
+++ b/main.pl
@@ -23,13 +23,14 @@ $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) VALUES (?,?,'Base',0,0,0)});
 		$insert->execute($ND::UID,$ND::PLANET);
 		($id) = $DBH->selectrow_array($fleet,undef,$ND::UID);
 	}
@@ -37,10 +38,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);
@@ -65,7 +65,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;
@@ -116,6 +116,7 @@ while (my($fleet,$coords,$mission,$amount,$landing_tick) = $query->fetchrow){
 $BODY->param(Fleets => \@fleets);
 
 $BODY->param(SMS => $sms);
+$BODY->param(Error => $error);
 
 1;