X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND%2FWeb%2FPages%2FMain.pm;h=655ed4014ccd70c7b10abab74093cbf6a4a2fbfd;hb=f6cfe40e6a8da61229131a2d38a2535ae66da359;hp=ef6415273eba9836e8fc30c92f8d4ba9a67b8ab7;hpb=571b019af4b9e3e051447f82135bb630a4fb4db8;p=ndwebbie.git

diff --git a/ND/Web/Pages/Main.pm b/ND/Web/Pages/Main.pm
index ef64152..655ed40 100644
--- a/ND/Web/Pages/Main.pm
+++ b/ND/Web/Pages/Main.pm
@@ -96,10 +96,6 @@ sub render_body {
 			WHERE uid = ? });
 		$query->execute($1,$2,$3,$ND::UID);
 	}
-	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);
-	}
 
 	my ($motd) = $DBH->selectrow_array("SELECT value FROM misc WHERE id='MOTD'");
 
@@ -124,17 +120,36 @@ sub render_body {
 	$BODY->param(HumorPoints => $humor_points);
 	$BODY->param(TotalPoints => $total_points);
 
-	$BODY->param(hasPlanet => $planet);
-
-	if ($planet){
-		my @row = $DBH->selectrow_array('SELECT ruler,planet,coords(x,y,z),size,sizerank
-			,score,scorerank,value,valuerank,xp,xprank FROM current_planet_stats
-			WHERE id = ?',undef,$planet);
-		$BODY->param(PlanetName => "$row[0] OF $row[1] ($row[2])");
-		$BODY->param(PlanetSize => "$row[3] ($row[4])");
-		$BODY->param(PlanetScore => "$row[5] ($row[6])");
-		$BODY->param(PlanetValue => "$row[7] ($row[8])");
-		$BODY->param(PlanetXP => "$row[9] ($row[10])");
+	$BODY->param(Planet => $planet);
+
+
+	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,
+		xp,xp_gain,xp_gain_day,
+		sizerank,sizerank_gain,sizerank_gain_day,
+		scorerank,scorerank_gain,scorerank_gain_day,
+		valuerank,valuerank_gain,valuerank_gain_day,
+		xprank,xprank_gain,xprank_gain_day
+		from current_planet_stats_full p
+			WHERE id = ?},undef,$planet) if $planet;
+	if ($planetstats){
+		my $planet = $planetstats;
+		for my $type (qw/size score value xp/){
+			$planet->{$type} =~ s/(^[-+]?\d+?(?=(?>(?:\d{3})+)(?!\d))|\G\d{3}(?=\d))/$1,/g; #Add comma for ever 3 digits, i.e. 1000 => 1,000
+			$planet->{"${type}img"} = 'stay';
+			$planet->{"${type}img"} = 'up' if $planet->{"${type}_gain_day"} > 0;
+			$planet->{"${type}img"} = 'down' if $planet->{"${type}_gain_day"} < 0;
+			$planet->{"${type}rankimg"} = 'stay';
+			$planet->{"${type}rankimg"} = 'up' if $planet->{"${type}rank_gain_day"} < 0;
+			$planet->{"${type}rankimg"} = 'down' if $planet->{"${type}rank_gain_day"} > 0;
+			for my $type ($type,"${type}_gain","${type}_gain_day"){
+				$planet->{$type} =~ s/(^[-+]?\d+?(?=(?>(?:\d{3})+)(?!\d))|\G\d{3}(?=\d))/$1,/g; #Add comma for ever 3 digits, i.e. 1000 => 1,000
+			}
+		}
+		$BODY->param(Planets => [$planet]);
+		$BODY->param(PlanetCoords => "$planet->{x}:$planet->{y}:$planet->{z}");
 	}