Update to be compatible with newer Catalyst.

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

diff --git a/lib/NDWeb/Controller/Root.pm b/lib/NDWeb/Controller/Root.pm
index 9ce7f8c28c3640dbc5bcdbba70ae4578fc85f383..4aa6d9557dd2100ce52003bc8718424c0d23b661 100644 (file)
--- a/lib/NDWeb/Controller/Root.pm
+++ b/lib/NDWeb/Controller/Root.pm
@@ -33,7 +33,7 @@ NDWeb::Controller::Root - Root Controller for NDWeb
 sub index : Local Path Args(0) {
        my ( $self, $c ) = @_;
 
-       $c->res->redirect($c->uri_for('/wiki'));
+       $c->visit('/wiki/main');
 }
 
 sub default : Path {
@@ -75,6 +75,41 @@ sub logout : Local {
        $c->res->redirect($c->uri_for('index'));
 }
 
+my %clickatellstatus = (
+       "001", "Message unknown. The delivering network did not recognise the message type or content.",
+       "002", "Message queued. The message could not be delivered and has been queued for attempted redelivery.",
+       "003", "Delivered. Delivered to the network or gateway (delivered to the recipient).",
+       "004", "Received by recipient. Confirmation of receipt on the handset of the recipient.",
+       "005", "Error with message. There was an error with the message, probably caused by the content of the message itself.",
+       "006", "User cancelled message delivery. Client cancelled the message by setting the validity period, or the message was terminated by an internal mechanism.",
+       "007", "Error delivering message An error occurred delivering the message to the handset.",
+       "008", " OK. Message received by gateway.",
+       "009", "Routing error. The routing gateway or network has had an error routing the message.",
+       "010", "Message expired. Message has expired at the network due to the handset being off, or out of reach.",
+       "011", "Message queued for later delivery. Message has been queued at the Clickatell gateway for delivery at a later time (delayed delivery).",
+       "012", "Out of credit. The message cannot be delivered due to a lack of funds in your account. Please re-purchase credits."
+);
+
+
+sub smsconfirm : Local {
+       my ($self, $c) = @_;
+       my $dbh = $c->model;
+
+       my $sms = $dbh->prepare(q{
+UPDATE sms SET status = $2, cost = $3
+       ,time = TIMESTAMP WITH TIME ZONE 'epoch' + $4 * INTERVAL '1 second'
+WHERE msgid = $1
+               });
+
+       $sms->execute($c->req->param('apiMsgId')
+               ,$clickatellstatus{$c->req->param('status')}
+               ,$c->req->param('charge')
+               ,$c->req->param('timestamp'));
+
+       $c->stash(template => 'default.tt2');
+}
+
+
 sub begin : Private {
        my ($self, $c) = @_;
 
@@ -96,7 +131,7 @@ sub listTargets : Private {
 FROM raid_claims c
        JOIN raid_targets t ON c.target = t.id
        JOIN raids r ON t.raid = r.id
-       JOIN current_planet_stats p ON t.planet = p.id
+       JOIN current_planet_stats p USING (pid)
 WHERE c.uid = $1 AND r.tick+c.wave > tick() AND r.open AND not r.removed
 ORDER BY r.tick+c.wave,x,y,z});
        $query->execute($c->user->id) or die $dbh->errstr;
@@ -111,8 +146,8 @@ ORDER BY r.tick+c.wave,x,y,z});
 sub listAlliances : Private {
        my ($self, $c) = @_;
        my @alliances;
-       push @alliances,{id => -1, name => ''};
-       my $query = $c->model->prepare(q{SELECT id,name FROM alliances ORDER BY LOWER(name)});
+       push @alliances,{aid => '', alliance => ''};
+       my $query = $c->model->prepare(q{SELECT aid,alliance FROM alliances ORDER BY LOWER(alliance)});
        $query->execute;
        while (my $ally = $query->fetchrow_hashref){
                push @alliances,$ally;
@@ -147,7 +182,7 @@ sub auto : Private {
 
 sub redirect : Private {
        my ($self, $c) = @_;
-       $c->res->redirect($c->uri_for('/'.$c->flash->{referrer}));
+       $c->res->redirect($c->uri_for('/'.$c->session->{referrer}));
 }
 
 sub access_denied : Private {
@@ -188,8 +223,9 @@ sub end : ActionClass('RenderView') {
        if ($c->user_exists){
                my $fleetupdate = 0;
                if ($c->check_user_roles(qw/member_menu/)){
-                       $fleetupdate = $dbh->selectrow_array(q{SELECT tick FROM fleets WHERE sender = ?
-                               AND mission = 'Full fleet' AND tick > tick() - 24
+                       $fleetupdate = $dbh->selectrow_array(q{
+SELECT tick FROM fleets WHERE pid = ? AND tick > tick() - 24
+AND mission = 'Full fleet' AND name IN ('Main','Advanced Unit');
                                },undef,$c->user->planet);
                        $fleetupdate = 0 unless defined $fleetupdate;
                }
@@ -219,7 +255,7 @@ sub end : ActionClass('RenderView') {
        $c->stash(birthdays => $birthdays->fetchall_arrayref({}));
 
        if ($c->res->status == 200 || $c->req->method eq 'GET'){
-               $c->flash(referrer => $c->req->path);
+               $c->session->{referrer} = $c->req->path;
        }
 }