use strict;
use warnings;
+use feature ":5.10";
use parent 'Catalyst::Controller';
use NDWeb::Include;
$c->stash(error => $c->flash->{error});
- $c->stash(comma => \&comma_value);
$c->stash(u => $dbh->selectrow_hashref(q{SELECT planet,defense_points
,attack_points,scan_points,humor_points
, (attack_points+defense_points+scan_points/20)::NUMERIC(5,1) as total_points
- , sms,rank,hostmask,call_if_needed,sms_note
- FROM users WHERE uid = ?
+ , sms,rank,hostmask,call_if_needed,sms_note,defprio
+ FROM users_defprio WHERE uid = ?
},undef,$c->user->id)
);
if ($c->req->param('cmd') eq 'Recall Fleets'){
my $updatefleets = $dbh->prepare(q{UPDATE launch_confirmations
SET back = tick() + (tick() - (landing_tick - eta))
- WHERE uid = ? AND fid = ? AND back > tick()+eta
+ WHERE uid = ? AND fid = ? AND back >= tick()+eta
});
for my $param ($c->req->param()){
my $dbh = $c->model;
$c->stash(reply => $c->flash->{reply});
- $c->stash(channels => ['def','scan','members']);
+ $c->stash(channels => ['scan','members','def']);
}
sub postircrequest : Local {
my ( $self, $c ) = @_;
my $dbh = $c->model;
- my $query = $dbh->prepare(q{INSERT INTO irc_requests
- (uid,channel,message) VALUES($1,$2,$3)
+ if ($c->req->param('channel')){
+ my $query = $dbh->prepare(q{
+INSERT INTO irc_requests (uid,channel,message) VALUES($1,$2,$3)
});
- $query->execute($c->user->id,$c->req->param('channel'),$c->req->param('message'));
- system 'killall','-USR1', 'irssi';
+ $query->execute($c->user->id,$c->req->param('channel'),$c->req->param('message'));
+ system 'killall','-USR1', 'irssi';
- $c->flash(reply => "Msg sent to: ".$c->req->param('channel'));
- $c->res->redirect($c->uri_for('ircrequest'));
+ $c->flash(reply => "Msg sent to: ".$c->req->param('channel'));
+ $c->res->redirect($c->uri_for('ircrequest'));
+ }else{
+ $c->stash(ircmessage => $c->req->param('message'));
+ $c->go('ircrequest');
+ }
}
sub points : Local {
my ( $self, $c, $order ) = @_;
my $dbh = $c->model;
- if ($order && $order =~ /^((?:defense|attack|total|humor|scan|raid)_points)$/){
+ if ($order ~~ /^((?:defense|attack|total|humor|scan|raid)_points)$/
+ || $order ~~ /^(defprio)$/){
$order = "$1 DESC";
}else{
$order = 'total_points DESC';
my $limit = 'LIMIT 10';
$limit = '' if $c->check_user_roles(qw/members_points_nolimit/);
- my $query = $dbh->prepare(qq{SELECT username,defense_points,attack_points
- ,scan_points,humor_points
- ,(attack_points+defense_points+scan_points/20)::NUMERIC(4,0) as total_points
- , count(NULLIF(rc.launched,FALSE)) AS raid_points
- FROM users u LEFT OUTER JOIN raid_claims rc USING (uid)
- WHERE uid IN (SELECT uid FROM groupmembers WHERE gid = 2)
- GROUP BY username,defense_points,attack_points,scan_points,humor_points,rank
- ORDER BY $order $limit});
+ my $query = $dbh->prepare(q{
+SELECT username,defense_points,attack_points
+ ,scan_points,humor_points,defprio
+ ,(attack_points+defense_points+scan_points/20)::NUMERIC(4,0) as total_points
+ , count(NULLIF(rc.launched,FALSE)) AS raid_points
+FROM users_defprio u LEFT OUTER JOIN raid_claims rc USING (uid)
+WHERE uid IN (SELECT uid FROM groupmembers WHERE gid = 2)
+GROUP BY username,defense_points,attack_points,scan_points,humor_points,defprio
+ORDER BY } . "$order $limit"
+ );
$query->execute;
- my @members;
- while (my $member = $query->fetchrow_hashref){
- push @members,$member;
- }
- $c->stash(members => \@members);
+ $c->stash(members => $query->fetchall_arrayref({}));
}
sub addintel : Local {
});
$defenders->execute;
+ my $available = $dbh->prepare(q{
+SELECT ship,amount FROM available_ships WHERE planet = $1
+ });
+
my @members;
while (my $member = $defenders->fetchrow_hashref){
$member->{fleets} = member_fleets($dbh, $member->{uid}, $member->{planet});
+ $available->execute($member->{planet});
+ my $fleet = {fid => $member->{username}, mission => 'Available', name => 'At home'
+ , ships => $available->fetchall_arrayref({})
+ };
+ push @{$member->{fleets}}, $fleet;
push @members,$member;
}
$c->stash(members => \@members);