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

diff --git a/lib/NDWeb/Controller/Root.pm b/lib/NDWeb/Controller/Root.pm
index a1eac62..05f2ef8 100644
--- a/lib/NDWeb/Controller/Root.pm
+++ b/lib/NDWeb/Controller/Root.pm
@@ -60,10 +60,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,7 +142,11 @@ sub auto : Private {
 	}else{
 		$c->stash(UID => -4);
 	}
+}
 
+sub redirect : Private {
+	my ($self, $c) = @_;
+	$c->res->redirect($c->uri_for('/'.$c->flash->{referrer}));
 }
 
 sub access_denied : Private {
@@ -161,6 +165,10 @@ Attempt to render a view, if needed.
 sub end : ActionClass('RenderView') {
 	my ($self, $c) = @_;
 
+	if ($c->res->status == 302){
+		return;
+	}
+
 	my $dbh = $c ->model;
 
 	if (scalar @{ $c->error } ){
@@ -173,7 +181,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 = ?
@@ -198,14 +206,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->flash(referrer => $c->req->path);
 	}
 }