lix-project/hydra
4
0
Fork 6
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

* Slight cleanup.

Browse source
This commit is contained in:
Eelco Dolstra 2011-08-16 14:51:19 +00:00
parent b75ddbc11c
commit 3d6a8fa632
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/lib/Hydra/Controller/Root.pm
View file

@ -43,19 +43,16 @@ sub login :Local {
my $username = $c->request->params->{username} || ""; my $username = $c->request->params->{username} || "";
my $password = $c->request->params->{password} || ""; my $password = $c->request->params->{password} || "";
if($username eq "" && $password eq "" && ! defined $c->flash->{afterLogin}) { if ($username eq "" && $password eq "" && ! defined $c->flash->{referer}) {
my $baseurl = $c->uri_for('/'); my $baseurl = $c->uri_for('/');
my $refurl = $c->request->referer; my $refurl = $c->request->referer;
$c->flash->{afterLogin} = $refurl if $refurl =~ m/^($baseurl)/ ; $c->flash->{referer} = $refurl if $refurl =~ m/^($baseurl)/;
} }
if ($username && $password) { if ($username && $password) {
if ($c->authenticate({username => $username, password => $password})) { if ($c->authenticate({username => $username, password => $password})) {
$c->response->redirect( $c->response->redirect($c->flash->{referer} || $c->uri_for('/'));
defined $c->flash->{afterLogin} $c->flash->{referer} = undef;
? $c->flash->{afterLogin}
: $c->uri_for('/'));
$c->flash->{afterLogin} = undef;
return; return;
} }
$c->stash->{errorMsg} = "Bad username or password."; $c->stash->{errorMsg} = "Bad username or password.";
@ -68,7 +65,7 @@ sub login :Local {
sub logout :Local { sub logout :Local {
my ($self, $c) = @_; my ($self, $c) = @_;
$c->logout; $c->logout;
$c->response->redirect($c->uri_for('/')); $c->response->redirect($c->request->referer || $c->uri_for('/'));
} }