adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-09 04:52:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rebalance where URL normalization happens in AuthComponent.

Browse source 
Make URL's not include the base path when storing them in the session.
This makes future redirection simpler. When URL's are an array use
Router::url() on them.

Fixes #3916
This commit is contained in:
mark_story 2013-07-12 21:40:38 -04:00
parent e016f1156f
commit d40c7376ce
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/Cake/Controller/Component/AuthComponent.php
View file

@ -307,7 +307,6 @@ class AuthComponent extends Component {
if ($loginAction != $url && in_array($action, array_map('strtolower', $this->allowedActions))) {
return true;
}
if ($loginAction == $url) {
if (empty($request->data)) {
if (!$this->Session->check('Auth.redirect') && env('HTTP_REFERER')) {
@ -321,7 +320,7 @@ class AuthComponent extends Component {
if (!$this->_getUser()) {
if (!$request->is('ajax')) {
$this->flash($this->authError);
$this->Session->write('Auth.redirect', $request->here());
$this->Session->write('Auth.redirect', $request->here(false));
$controller->redirect($loginAction);
return false;
}
@ -677,7 +676,10 @@ class AuthComponent extends Component {
} else {
$redir = '/';
}
return Router::normalize($redir, false);
if (is_array($redir)) {
return Router::url($redir);
}
return $redir;
}
/**