X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FRoot.pm;h=df700f937cc56e603822e66bff77dd33fd7ca2cc;hb=fcd1ee7b280d01a082b3a868a56145f970251f5d;hp=a1eac62c9f76b8cf7bd932a97dd14a4ba56d4c83;hpb=48c13dfb589d4f8f83d8fdc2df772c32d4145659;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Root.pm b/lib/NDWeb/Controller/Root.pm
index a1eac62..df700f9 100644
--- a/lib/NDWeb/Controller/Root.pm
+++ b/lib/NDWeb/Controller/Root.pm
@@ -33,12 +33,13 @@ 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/index');
 }
 
 sub default : Path {
 	my ( $self, $c ) = @_;
-	$c->response->status(404);
+	$c->stash(template => 'default.tt2');
+	$c->response->status(410);
 }
 
 sub login : Local {
@@ -60,10 +61,10 @@ sub login : Local {
 		$log->execute($c->user->id,$c->req->address
 			,$country,$c->sessionid,$remember);
 
-		my $ref = $c->req->referer;
-		$ref =~ s/^http:/https:/ unless $c->debug;
-		$c->res->redirect($ref);
+		$c->forward('redirect');
 		return;
+	} elsif ($c->req->method eq 'POST'){
+		$c->res->status(400);
 	}
 }
 
@@ -142,13 +143,18 @@ sub auto : Private {
 	}else{
 		$c->stash(UID => -4);
 	}
+}
 
+sub redirect : Private {
+	my ($self, $c) = @_;
+	$c->res->redirect($c->uri_for('/'.$c->session->{referrer}));
 }
 
 sub access_denied : Private {
 	my ($self, $c, $action) = @_;
 
 	$c->stash->{template} = 'access_denied.tt2';
+	$c->res->status(403);
 
 }
 
@@ -161,23 +167,30 @@ Attempt to render a view, if needed.
 sub end : ActionClass('RenderView') {
 	my ($self, $c) = @_;
 
+	if ($c->res->status >= 300 && $c->res->status <= 400 ){
+		return;
+	}
+
 	my $dbh = $c ->model;
 
 	if (scalar @{ $c->error } ){
 		if ($c->error->[0] =~ m/Can't call method "id" on an undefined value at/){
 			$c->stash->{template} = 'access_denied.tt2';
+			$c->res->status(403);
 			$c->clear_errors;
 		}elsif ($c->error->[0] =~ m/Missing roles: /){
 			$c->stash->{template} = 'access_denied.tt2';
+			$c->res->status(403);
 			$c->clear_errors;
 		}
 	}
 
-	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 = ?
-				AND mission = 'Full fleet' AND tick > tick() - 24
+			$fleetupdate = $dbh->selectrow_array(q{
+SELECT tick FROM fleets WHERE planet = ? AND tick > tick() - 24
+AND mission = 'Full fleet' AND name IN ('Main','Advanced Unit');
 				},undef,$c->user->planet);
 			$fleetupdate = 0 unless defined $fleetupdate;
 		}
@@ -198,14 +211,16 @@ sub end : ActionClass('RenderView') {
 					|| $c->check_user_roles(qw/no_fleet_update/)))),
 		$c->forward('listTargets');
 	}
-	if ($c->res->status == 200){
-		my $birthdays = $dbh->prepare(q{SELECT username
+	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({}));
+	$birthdays->execute;
+	$c->stash(birthdays => $birthdays->fetchall_arrayref({}));
+
+	if ($c->res->status == 200 || $c->req->method eq 'GET'){
+		$c->session->{referrer} = $c->req->path;
 	}
 }