From a675271ad71b7713d1b33bdba3c51b2b04813229 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sun, 15 Nov 2015 12:50:33 -0500
Subject: Rewrite of session management

---
 app/Controller/Base.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'app/Controller/Base.php')

diff --git a/app/Controller/Base.php b/app/Controller/Base.php
index 829e0ad2..8630f00c 100644
--- a/app/Controller/Base.php
+++ b/app/Controller/Base.php
@@ -76,8 +76,7 @@ abstract class Base extends \Kanboard\Core\Base
      */
     public function beforeAction($controller, $action)
     {
-        // Start the session
-        $this->session->open($this->helper->url->dir());
+        $this->sessionManager->open();
         $this->sendHeaders($action);
         $this->container['dispatcher']->dispatch('session.bootstrap', new Event);
 
@@ -86,7 +85,7 @@ abstract class Base extends \Kanboard\Core\Base
             $this->handle2FA($controller, $action);
             $this->handleAuthorization($controller, $action);
 
-            $this->session['has_subtask_inprogress'] = $this->subtask->hasSubtaskInProgress($this->userSession->getId());
+            $this->sessionStorage->hasSubtaskInProgress = $this->subtask->hasSubtaskInProgress($this->userSession->getId());
         }
     }
 
@@ -102,7 +101,7 @@ abstract class Base extends \Kanboard\Core\Base
                 $this->response->text('Not Authorized', 401);
             }
 
-            $this->session['login_redirect'] = $this->request->getUri();
+            $this->sessionStorage->redirectAfterLogin = $this->request->getUri();
             $this->response->redirect($this->helper->url->to('auth', 'login'));
         }
     }
@@ -269,7 +268,7 @@ abstract class Base extends \Kanboard\Core\Base
         $project = $this->project->getById($project_id);
 
         if (empty($project)) {
-            $this->session->flashError(t('Project not found.'));
+            $this->flash->failure(t('Project not found.'));
             $this->response->redirect($this->helper->url->to('project', 'index'));
         }
 
-- 
cgit v1.2.3