Rewrite of session management
This commit is contained in:
@@ -62,18 +62,17 @@ class App extends \Kanboard\Core\Base
|
||||
*/
|
||||
public function flashMessage()
|
||||
{
|
||||
$html = '';
|
||||
$success_message = $this->flash->getMessage('success');
|
||||
$failure_message = $this->flash->getMessage('failure');
|
||||
|
||||
if (isset($this->session['flash_message'])) {
|
||||
$html = '<div class="alert alert-success alert-fade-out">'.$this->helper->e($this->session['flash_message']).'</div>';
|
||||
unset($this->session['flash_message']);
|
||||
unset($this->session['flash_error_message']);
|
||||
} elseif (isset($this->session['flash_error_message'])) {
|
||||
$html = '<div class="alert alert-error">'.$this->helper->e($this->session['flash_error_message']).'</div>';
|
||||
unset($this->session['flash_message']);
|
||||
unset($this->session['flash_error_message']);
|
||||
if (! empty($success_message)) {
|
||||
return '<div class="alert alert-success alert-fade-out">'.$this->helper->e($success_message).'</div>';
|
||||
}
|
||||
|
||||
return $html;
|
||||
if (! empty($failure_message)) {
|
||||
return '<div class="alert alert-error">'.$this->helper->e($failure_message).'</div>';
|
||||
}
|
||||
|
||||
return '';
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ class Subtask extends \Kanboard\Core\Base
|
||||
*/
|
||||
public function toggleStatus(array $subtask, $redirect)
|
||||
{
|
||||
if ($subtask['status'] == 0 && isset($this->session['has_subtask_inprogress']) && $this->session['has_subtask_inprogress'] === true) {
|
||||
if ($subtask['status'] == 0 && isset($this->sessionStorage->hasSubtaskInProgress) && $this->sessionStorage->hasSubtaskInProgress === true) {
|
||||
return $this->helper->url->link(
|
||||
trim($this->template->render('subtask/icons', array('subtask' => $subtask))) . $this->helper->e($subtask['title']),
|
||||
'subtask',
|
||||
|
||||
@@ -136,7 +136,7 @@ class User extends \Kanboard\Core\Base
|
||||
*/
|
||||
public function getFullname(array $user = array())
|
||||
{
|
||||
return $this->user->getFullname(empty($user) ? $_SESSION['user'] : $user);
|
||||
return $this->user->getFullname(empty($user) ? $this->sessionStorage->user : $user);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user