use ND::Include;
use ND::Web::Include;
-our @ISA = qw/ND::Web::XMLPage/;
+use base qw/ND::Web::XMLPage/;
$ND::Web::Page::PAGES{main} = 'ND::Web::Pages::Main';
($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;
$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 =
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(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};
$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}");
}
$BODY->param(Fleets => \@fleets);
$BODY->param(SMS => $sms);
+ $BODY->param(Hostname => $hostname);
$BODY->param(Error => $error);
return $BODY;
}