AS1024
/
Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

redirect to original target page after logging in

This commit is contained in:
Lim Yuen Hoe 2014-09-19 01:38:38 +08:00
parent 7fac9783c6
commit ed13a04c4c
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/Base.php
View File

@ -124,7 +124,7 @@ abstract class Base
// Authentication
if (! $this->authentication->isAuthenticated($controller, $action)) {
$this->response->redirect('?controller=user&action=login');
$this->response->redirect('?controller=user&action=login&redirect_query='.urlencode($this->request->getQueryString()));
}
// Check if the user is allowed to see this page

10
app/Controller/User.php
View File

@ -34,10 +34,12 @@ class User extends Base
$this->response->redirect('?controller=app');
}
$redirect_query = $this->request->getStringParam('redirect_query');
$this->response->html($this->template->layout('user_login', array(
'errors' => array(),
'values' => array(),
'no_layout' => true,
'redirect_query' => $redirect_query,
'title' => t('Login')
)));
}
@ -49,17 +51,23 @@ class User extends Base
*/
public function check()
{
$redirect_query = $this->request->getStringParam('redirect_query');
$values = $this->request->getValues();
list($valid, $errors) = $this->authentication->validateForm($values);
if ($valid) {
$this->response->redirect('?controller=board');
if ($redirect_query != "") {
$this->response->redirect('?'.$redirect_query);
} else {
$this->response->redirect('?controller=board');
}
}
$this->response->html($this->template->layout('user_login', array(
'errors' => $errors,
'values' => $values,
'no_layout' => true,
'redirect_query' => $redirect_query,
'title' => t('Login')
)));
}

12
app/Core/Request.php
View File

@ -136,4 +136,16 @@ class Request
$name = 'HTTP_'.str_replace('-', '_', strtoupper($name));
return isset($_SERVER[$name]) ? $_SERVER[$name] : '';
}
/**
* Returns current request's query string, useful for redirecting
*
* @access public
* @return string
*/
public function getQueryString()
{
return $_SERVER['QUERY_STRING'];
}
}

2
app/Templates/user_login.php
View File

@ -8,7 +8,7 @@
<p class="alert alert-error"><?= Helper\escape($errors['login']) ?></p>
<?php endif ?>
<form method="post" action="?controller=user&amp;action=check">
<form method="post" action="?controller=user&amp;action=check&amp;redirect_query=<?= urlencode($redirect_query) ?>">
<?= Helper\form_csrf() ?>