X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FRoot.pm;h=df700f937cc56e603822e66bff77dd33fd7ca2cc;hb=9fae09d27e069fafcc411d1bb2f3df60055056a7;hp=fcff93f24b0de56073d1d1ef37a7dfe34366e17a;hpb=230e61ee1d992255138b56c50caf9cca52532c2b;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Root.pm b/lib/NDWeb/Controller/Root.pm
index fcff93f..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 {
@@ -146,7 +147,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 {
@@ -166,7 +167,7 @@ Attempt to render a view, if needed.
 sub end : ActionClass('RenderView') {
 	my ($self, $c) = @_;
 
-	if ($c->res->status == 302){
+	if ($c->res->status >= 300 && $c->res->status <= 400 ){
 		return;
 	}
 
@@ -187,8 +188,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 planet = ? AND tick > tick() - 24
+AND mission = 'Full fleet' AND name IN ('Main','Advanced Unit');
 				},undef,$c->user->planet);
 			$fleetupdate = 0 unless defined $fleetupdate;
 		}
@@ -218,7 +220,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;
 	}
 }