Don't require status 200 for some user data

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

diff --git a/lib/NDWeb/Controller/Root.pm b/lib/NDWeb/Controller/Root.pm
index 3eaaf0d009b254d61892ddc9c8b84eb7de0839d5..8a6ab6abce00df8223909fbd281a55399fcad48f 100644 (file)
--- a/lib/NDWeb/Controller/Root.pm
+++ b/lib/NDWeb/Controller/Root.pm
@@ -60,7 +60,9 @@ sub login : Local {
                $log->execute($c->user->id,$c->req->address
                        ,$country,$c->sessionid,$remember);
 
-               $c->res->redirect($c->req->referer);
+               my $ref = $c->req->referer;
+               $ref =~ s/^http:/https:/ unless $c->debug;
+               $c->res->redirect($ref);
                return;
        }
 }
@@ -117,12 +119,18 @@ sub listAlliances : Private {
        $c->stash(alliances => \@alliances);
 }
 
+sub sslurl {
+       return $_[0];
+}
+
 sub auto : Private {
        my ($self, $c) = @_;
        my $dbh = $c ->model;
 
        $c->stash(dbh => $dbh);
 
+       $c->stash(sslurl => \&sslurl);
+
        $dbh->do(q{SET timezone = 'GMT'});
 
        $c->stash(TICK =>$dbh->selectrow_array('SELECT tick()',undef));
@@ -165,7 +173,7 @@ sub end : ActionClass('RenderView') {
                }
        }
 
-       if ($c->user_exists && $c->res->status == 200){
+       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 = ?
@@ -190,6 +198,13 @@ sub end : ActionClass('RenderView') {
                                        || $c->check_user_roles(qw/no_fleet_update/)))),
                $c->forward('listTargets');
        }
+       my $birthdays = $dbh->prepare(q{SELECT username
+                       ,date_part('year',age(birthday)) AS age
+                       FROM users WHERE birthday IS NOT NULL
+                               AND mmdd(birthday) = mmdd(CURRENT_DATE)
+               });
+       $birthdays->execute;
+       $c->stash(birthdays => $birthdays->fetchall_arrayref({}));
 }
 
 =head1 AUTHOR