From: Michael Andreen Date: Sun, 2 Nov 2008 12:08:32 +0000 (+0100) Subject: Use sessions for redirect to previous page instead of referer header X-Git-Url: https://ruin.nu/git/?p=ndwebbie.git;a=commitdiff_plain;h=b00d7995de3f6eb15560b5ae9dac75f12e248b13 Use sessions for redirect to previous page instead of referer header --- diff --git a/lib/NDWeb/Controller/CovOp.pm b/lib/NDWeb/Controller/CovOp.pm index ea67978..71ea308 100644 --- a/lib/NDWeb/Controller/CovOp.pm +++ b/lib/NDWeb/Controller/CovOp.pm @@ -42,7 +42,7 @@ sub marktarget : Local { my $update = $dbh->prepare(q{INSERT INTO covop_attacks (uid,id,tick) VALUES(?,?,tick())}); $update->execute($c->user->id,$target); - $c->res->redirect($c->req->referer); + $c->forward('/redirect'); } sub list : Private { diff --git a/lib/NDWeb/Controller/Forum.pm b/lib/NDWeb/Controller/Forum.pm index d08bb61..f4fa3c0 100644 --- a/lib/NDWeb/Controller/Forum.pm +++ b/lib/NDWeb/Controller/Forum.pm @@ -277,7 +277,7 @@ sub markBoardAsRead : Local { $c->forward('markThreadAsRead',[$thread->{ftid}]); } $dbh->commit; - $c->res->redirect($c->req->referer); + $c->forward('/redirect'); } sub markThreadAsRead : Private { diff --git a/lib/NDWeb/Controller/Raids.pm b/lib/NDWeb/Controller/Raids.pm index 410d42d..f2bfa0a 100644 --- a/lib/NDWeb/Controller/Raids.pm +++ b/lib/NDWeb/Controller/Raids.pm @@ -433,7 +433,7 @@ sub open : Local { $c->forward('log',[$raid, "BC opened raid"]); $c->model->commit; - $c->res->redirect($c->req->referer); + $c->forward('/redirect'); } sub close : Local { @@ -445,7 +445,7 @@ sub close : Local { $c->forward('log',[$raid, "BC closed raid"]); $c->model->commit; - $c->res->redirect($c->req->referer); + $c->forward('/redirect'); } sub remove : Local { @@ -457,7 +457,7 @@ sub remove : Local { $c->forward('log',[$raid, "BC removed raid"]); $c->model->commit; - $c->res->redirect($c->req->referer); + $c->forward('/redirect'); } sub showcoords : Local { @@ -469,7 +469,7 @@ sub showcoords : Local { $c->forward('log',[$raid, "BC released coords"]); $c->model->commit; - $c->res->redirect($c->req->referer); + $c->forward('/redirect'); } sub hidecoords : Local { @@ -481,7 +481,7 @@ sub hidecoords : Local { $c->forward('log',[$raid, "BC hid coords"]); $c->model->commit; - $c->res->redirect($c->req->referer); + $c->forward('/redirect'); } sub create : Local { diff --git a/lib/NDWeb/Controller/Root.pm b/lib/NDWeb/Controller/Root.pm index 8a6ab6a..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 } ){ @@ -205,6 +213,10 @@ sub end : ActionClass('RenderView') { }); $birthdays->execute; $c->stash(birthdays => $birthdays->fetchall_arrayref({})); + + if ($c->res->status == 200){ + $c->flash(referrer => $c->req->path); + } } =head1 AUTHOR