X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND%2FWeb%2FPages%2FMain.pm;h=0a795d0db6eab04086113e769af41109427162ad;hb=99ea1738beb3fd8eba6a016cbb4d5c95fa6834e2;hp=ca482eeda0ed89765f29c3f4690e89e28f30c399;hpb=14e02a0c339a87b623b11fb9e3d050e7c365b2db;p=ndwebbie.git

diff --git a/ND/Web/Pages/Main.pm b/ND/Web/Pages/Main.pm
index ca482ee..0a795d0 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;
@@ -86,9 +90,14 @@ sub render_body {
 			$DBH->commit or $error .= '<p>'.$DBH->errstr.'</p>';
 		}
 	}
-	if (param('sms')){ my $query = $DBH->prepare('UPDATE users SET sms = ? WHERE uid = ?');
+	if (param('sms')){
+		my $query = $DBH->prepare('UPDATE users SET sms = ? WHERE uid = ?');
 		$query->execute(escapeHTML(param('sms')),$ND::UID);
 	}
+	if (param('hostname')){
+		my $query = $DBH->prepare('UPDATE users SET hostmask = ? WHERE uid = ?');
+		$query->execute(escapeHTML(param('hostname')),$ND::UID);
+	}
 	if ($self->isMember() && !$self->{PLANET} && defined param('planet') && (param('planet') =~ m/(\d+)(?: |:)(\d+)(?: |:)(\d+)/)){
 		my $query = $DBH->prepare(q{
 			UPDATE users SET planet = 
@@ -107,9 +116,9 @@ sub render_body {
 	$BODY->param(Groups => \@groups);
 
 
-	my $query = $DBH->prepare(q{SELECT planet,defense_points,attack_points,scan_points,humor_points, (attack_points+defense_points+scan_points/20) as total_points, sms,rank FROM users WHERE uid = ?});
+	my $query = $DBH->prepare(q{SELECT planet,defense_points,attack_points,scan_points,humor_points, (attack_points+defense_points+scan_points/20) as total_points, sms,rank,hostmask FROM users WHERE uid = ?});
 
-	my ($planet,$defense_points,$attack_points,$scan_points,$humor_points,$total_points,$sms,$rank) = $DBH->selectrow_array($query,undef,$ND::UID);
+	my ($planet,$defense_points,$attack_points,$scan_points,$humor_points,$total_points,$sms,$rank,$hostname) = $DBH->selectrow_array($query,undef,$ND::UID);
 
 	$self->{PLANET} = $planet unless $self->{PLANET};
 
@@ -123,7 +132,7 @@ sub render_body {
 	$BODY->param(Planet => $planet);
 
 
-	my $planetstats= $DBH->selectrow_hashref(q{Select coords(x,y,z), ((ruler || ' OF ') || p.planet) as planet,race,
+	my $planetstats= $DBH->selectrow_hashref(q{SELECT x,y,z, ((ruler || ' OF ') || p.planet) as planet,race,
 		size, size_gain, size_gain_day,
 		score,score_gain,score_gain_day,
 		value,value_gain,value_gain_day,
@@ -149,7 +158,7 @@ sub render_body {
 			}
 		}
 		$BODY->param(Planets => [$planet]);
-		$BODY->param(PlanetCoords => $planet->{coords});
+		$BODY->param(PlanetCoords => "$planet->{x}:$planet->{y}:$planet->{z}");
 	}
 
 
@@ -173,6 +182,7 @@ ORDER BY f.fleet
 	$BODY->param(Fleets => \@fleets);
 
 	$BODY->param(SMS => $sms);
+	$BODY->param(Hostname => $hostname);
 	$BODY->param(Error => $error);
 	return $BODY;
 }