Fleet paste is not mandatory anymore

[ndwebbie.git] / lib / NDWeb / Controller / JSRPC.pm

diff --git a/lib/NDWeb/Controller/JSRPC.pm b/lib/NDWeb/Controller/JSRPC.pm
index b1aeba7bb76915a518158f2ca2928d64a22b1c8d..80912c10732e5b53045de5e071b1f53cb7de2a3f 100644 (file)
--- a/lib/NDWeb/Controller/JSRPC.pm
+++ b/lib/NDWeb/Controller/JSRPC.pm
@@ -4,6 +4,8 @@ use strict;
 use warnings;
 use parent 'Catalyst::Controller';
 
+use DateTime::TimeZone;
+
 =head1 NAME
 
 NDWeb::Controller::JSRPC - Catalyst Controller
@@ -36,14 +38,15 @@ sub update : Local {
 
        my $targets;;
        if ($from){
-               my ($timestamp) = $dbh->selectrow_array("SELECT MAX(modified)::timestamp AS modified FROM raid_targets");
+               my ($timestamp) = $dbh->selectrow_array(q{SELECT MAX(modified)::timestamp AS modified
+                       FROM raid_targets WHERE raid = $1},undef,$raid->{id});
                $c->stash(timestamp => $timestamp);
-               $targets = $dbh->prepare(q{SELECT r.id,r.planet FROM raid_targets r
+               $targets = $dbh->prepare(q{SELECT r.id,r.pid FROM raid_targets r
                        WHERE r.raid = ? AND modified > ?
                });
                $targets->execute($raid->{id},$from);
        }elsif($target){
-               $targets = $dbh->prepare(q{SELECT r.id,r.planet FROM raid_targets r
+               $targets = $dbh->prepare(q{SELECT r.id,r.pid FROM raid_targets r
                        WHERE r.raid = $1 AND r.id = $2
                });
                $targets->execute($raid->{id},$target);
@@ -172,7 +175,6 @@ sub joinable : Local {
                        WHERE target = ? AND wave = ?
                });
                $query->execute($joinable,$target,$wave);
-               $c->forward('/listTargets');
        }
 
        $c->stash(template => 'jsrpc/update.tt2');
@@ -187,10 +189,17 @@ sub listTargets : Local {
        $c->forward('/listTargets');
 }
 
-sub access_denied : Local {
-       my ($self, $c) = @_;
+sub tzcountries : Local {
+       my ($self, $c, $cat) = @_;
 
-       $c->stash(template => 'jsrcp/access_denied.tt2');
+       my @countries = DateTime::TimeZone->names_in_category($cat);
+       $c->stash(tzcountries => \@countries);
+}
+
+sub access_denied : Private {
+       my ($self, $c) = @_;
+       $c->stash(template => 'jsrpc/access_denied.tt2');
+       $c->res->status(403);
 }
 
 sub assertTarget : Private {
@@ -217,9 +226,11 @@ sub end : ActionClass('RenderView') {
        if (scalar @{ $c->error } ){
                if ($c->error->[0] =~ m/Can't call method "id" on an undefined value at/){
                        $c->stash->{template} = 'jsrpc/access_denied.tt2';
+                       $c->res->status(403);
                        $c->clear_errors;
                }elsif ($c->error->[0] =~ m/Missing roles: /){
                        $c->stash->{template} = 'jsrpc/access_denied.tt2';
+                       $c->res->status(403);
                        $c->clear_errors;
                }
        }