From 3f9b678d2b3486e7117aff9da8f8226ebb4d0abf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kinn=20Coelho=20Juli=C3=A3o?= <kinncj@gmail.com>
Date: Thu, 16 May 2013 18:06:01 -0400
Subject: [PATCH] Validate if github_token exists

Validate if the github_token session key exists before call it
---
 PHPCI/Controller/ProjectController.php | 4 +++-
 PHPCI/Controller/SessionController.php | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php
index 092b1276..da0ffe77 100644
--- a/PHPCI/Controller/ProjectController.php
+++ b/PHPCI/Controller/ProjectController.php
@@ -107,6 +107,8 @@ class ProjectController extends b8\Controller
     */
     public function add()
     {
+        $_SESSION['github_token'] = isset($_SESSION['github_token']) ? $_SESSION['github_token'] : null;
+
         if (!Registry::getInstance()->get('user')->getIsAdmin()) {
             throw new \Exception('You do not have permission to do that.');
         }
@@ -151,7 +153,7 @@ class ProjectController extends b8\Controller
             $view->project  = null;
             $view->form     = $form;
             $view->key      = $pub;
-            $view->token    = $_SESSION['github_token'] ? $_SESSION['github_token'] : null;
+            $view->token    = $_SESSION['github_token'];
 
             return $view->render();
         }
diff --git a/PHPCI/Controller/SessionController.php b/PHPCI/Controller/SessionController.php
index 7e806a21..de877e49 100644
--- a/PHPCI/Controller/SessionController.php
+++ b/PHPCI/Controller/SessionController.php
@@ -70,8 +70,8 @@ class SessionController extends b8\Controller
     */
     public function logout()
     {
-        unset($_SESSION['user_id']);
-        unset($_SESSION['github_token']);
+        $_SESSION = array();
+        session_destroy();
         header('Location: /');
         die;
     }