Changeset 782

Timestamp:

02/02/10 02:34:38 (14 years ago)

Author:

nanardon

Message:

• properly handle redirect url at login

Location:

LATMOS-Accounts-Web

Files:

• lib/LATMOS/Accounts/Web/Controller/Root.pm (modified) (2 diffs)
• root/html/login.tt (modified) (1 diff)

LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Root.pm

@@ -40 +40 @@
                 username => $c->req->param('username'),
                 password => $c->req->param('password')})) {
-            my $redirurl = $c->uri_for($c->req->param('loguri') || '/');
-            $redirurl = $c->uri_for('/') if ($redirurl =~ m:^/login:);
+            my $redirurl = $c->uri_for($c->req->param('loguri') ||  '/');
             $c->res->redirect($redirurl || $c->uri_for('/'));
         } else {
@@ -47 +46 @@
         }
     }
+    my ($redirurl) = grep { $_ } (
+        $c->req->param('loguri'),
+        ($c->req->path ? '/' . $c->req->path : undef),
+        $c->uri_for('/'),
+    );
+    $c->stash->{redirurl} = $redirurl;
 }
 

LATMOS-Accounts-Web/root/html/login.tt

@@ -2 +2 @@
 <form action="[% c.uri_for('/login') %]" method="POST">
 <p>Vous devez vous connecter:</p>
-<input type="hidden" name="loguri" value="[% '/' _ c.req.path | html %]">
+<input type="hidden" name="loguri" value="[% redirurl | html %]">
 <table border="0" align="center">
 <tr>