diff options
| author | Frederic Guillot <fred@kanboard.net> | 2015-11-15 12:50:33 -0500 |
|---|---|---|
| committer | Frederic Guillot <fred@kanboard.net> | 2015-11-15 12:50:33 -0500 |
| commit | a675271ad71b7713d1b33bdba3c51b2b04813229 (patch) | |
| tree | e54d8a95e16ca521193b9fd5a5eb071aa2910823 /app/Helper | |
| parent | 2fc402f6733573627ad25394d109b9f848ef04f6 (diff) | |
Rewrite of session management
Diffstat (limited to 'app/Helper')
| -rw-r--r-- | app/Helper/App.php | 19 | ||||
| -rw-r--r-- | app/Helper/Subtask.php | 2 | ||||
| -rw-r--r-- | app/Helper/User.php | 2 |
3 files changed, 11 insertions, 12 deletions
diff --git a/app/Helper/App.php b/app/Helper/App.php index 19801fa8..33729f2b 100644 --- a/app/Helper/App.php +++ b/app/Helper/App.php @@ -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 ''; } } diff --git a/app/Helper/Subtask.php b/app/Helper/Subtask.php index 1f367b27..4bb26e77 100644 --- a/app/Helper/Subtask.php +++ b/app/Helper/Subtask.php @@ -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', diff --git a/app/Helper/User.php b/app/Helper/User.php index 9cd39bd9..9ef20b38 100644 --- a/app/Helper/User.php +++ b/app/Helper/User.php @@ -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); } /** |