gal rankings and fixed a bug with gal graph caching

[ndwebbie.git] / ND / Web / Pages / Main.pm

diff --git a/ND/Web/Pages/Main.pm b/ND/Web/Pages/Main.pm
index 29f7c51addbf29a9cd9234ebb007cf1fd2f4331d..655ed4014ccd70c7b10abab74093cbf6a4a2fbfd 100644 (file)
--- a/ND/Web/Pages/Main.pm
+++ b/ND/Web/Pages/Main.pm
@@ -24,18 +24,15 @@ use CGI qw/:standard/;
 use ND::Include;
 use ND::Web::Include;
 
-$ND::PAGES{main} = {parse => \&parse, process => \&process, render=> \&render};
+use base qw/ND::Web::XMLPage/;
 
-sub parse {
-}
-
-sub process {
-
-}
+$ND::Web::Page::PAGES{main} = 'ND::Web::Pages::Main';
 
-sub render {
-       my ($DBH,$BODY) = @_;
-       $ND::TEMPLATE->param(TITLE => 'Main Page');
+sub render_body {
+       my $self = shift;
+       my ($BODY) = @_;
+       $self->{TITLE} = 'Main Page';
+       my $DBH = $self->{DBH};
 
        my $error;
 
@@ -46,7 +43,7 @@ sub render {
                        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);
+                               $insert->execute($ND::UID,$self->{PLANET});
                                ($id) = $DBH->selectrow_array($fleet,undef,$ND::UID);
                        }
                        my $delete = $DBH->prepare("DELETE FROM fleet_ships WHERE fleet = ?");
@@ -92,25 +89,21 @@ sub render {
        if (param('sms')){ my $query = $DBH->prepare('UPDATE users SET sms = ? WHERE uid = ?');
                $query->execute(escapeHTML(param('sms')),$ND::UID);
        }
-       if (isMember() && !$ND::PLANET && defined param('planet') && (param('planet') =~ m/(\d+)(?: |:)(\d+)(?: |:)(\d+)/)){
+       if ($self->isMember() && !$self->{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 = ?)
                        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'");
 
        $BODY->param(MOTD => parseMarkup($motd));
-       $BODY->param(Username => $ND::USER);
-       $BODY->param(isMember => isMember());
-       $BODY->param(isHC => isHC());
-       my @groups = map {name => $_}, sort keys %ND::GROUPS;
+       $BODY->param(Username => $self->{USER});
+       $BODY->param(isMember => $self->isMember());
+       $BODY->param(isHC => $self->isHC());
+       my @groups = map {name => $_}, sort keys %{$self->{GROUPS}};
        $BODY->param(Groups => \@groups);
 
 
@@ -118,7 +111,7 @@ sub render {
 
        my ($planet,$defense_points,$attack_points,$scan_points,$humor_points,$total_points,$sms,$rank) = $DBH->selectrow_array($query,undef,$ND::UID);
 
-       $ND::PLANET = $planet unless $ND::PLANET;
+       $self->{PLANET} = $planet unless $self->{PLANET};
 
        $BODY->param(NDRank => $rank);
        $BODY->param(DefensePoints => $defense_points);
@@ -127,17 +120,36 @@ sub render {
        $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}");
        }
 
 
@@ -150,7 +162,7 @@ GROUP BY f.fleet,f.id, x,y,z, mission, landing_tick,back
 ORDER BY f.fleet
                });
 
-       $query->execute($ND::UID,$ND::TICK) or $error .= '<p>'.$DBH->errstr.'</p>';
+       $query->execute($ND::UID,$self->{TICK}) or $error .= '<p>'.$DBH->errstr.'</p>';
        my @fleets;
        my $i = 0;
        while (my $fleet = $query->fetchrow_hashref){