X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FAlliances.pm;h=bd25d9bd2a051ca245610db8079140699b69c996;hb=c5850fd2283ea0188583075f0e3afdb248307c8c;hp=aa1c33d27408f78c525bffb41db3a24edcff708a;hpb=e4aab4e872225a7b325949f5632650430595cef6;p=ndwebbie.git diff --git a/lib/NDWeb/Controller/Alliances.pm b/lib/NDWeb/Controller/Alliances.pm index aa1c33d..bd25d9b 100644 --- a/lib/NDWeb/Controller/Alliances.pm +++ b/lib/NDWeb/Controller/Alliances.pm @@ -84,7 +84,7 @@ sub edit : Local { $order .= ' DESC' if $order eq 'hit_us'; my $members = $dbh->prepare(q{ - SELECT coords(x,y,z), nick, ruler, planet, race, size, score, value, xp + SELECT id, coords(x,y,z), nick, ruler, planet, race, size, score, value, xp ,planet_status,hit_us, sizerank, scorerank, valuerank, xprank FROM current_planet_stats p WHERE p.alliance_id = ? @@ -96,7 +96,7 @@ sub edit : Local { my $ticks = $c->req->param('ticks') || 48; $c->stash(showticks => $ticks); - my $query = $dbh->prepare(intelquery q{ + $query = $dbh->prepare(intelquery q{ o.alliance AS oalliance ,coords(o.x,o.y,o.z) AS ocoords, i.sender ,t.alliance AS talliance,coords(t.x,t.y,t.z) AS tcoords, i.target },q{NOT ingal AND (o.alliance_id = $1 OR t.alliance_id = $1) @@ -242,12 +242,11 @@ sub resources : Local { =head1 AUTHOR -A clever guy +Michael Andreen (harv@ruin.nu) =head1 LICENSE -This library is free software, you can redistribute it and/or modify -it under the same terms as Perl itself. +GPL 2.0, or later. =cut