From aab3832e02ebe59a11865392a6d3c923a25fba15 Mon Sep 17 00:00:00 2001 From: Daniel Date: Sun, 30 Sep 2012 14:10:41 -0400 Subject: [PATCH] Added a logout button Logout button will now appear in the header if authentication is enabled and the user is logged in. --- htdocs/application/controllers/auth.php | 2 +- htdocs/application/libraries/auth_ldap.php | 4 ++-- htdocs/application/views/auth/logout_view.php | 15 --------------- htdocs/application/views/defaults/header.php | 7 +++++++ 4 files changed, 10 insertions(+), 18 deletions(-) delete mode 100644 htdocs/application/views/auth/logout_view.php diff --git a/htdocs/application/controllers/auth.php b/htdocs/application/controllers/auth.php index ba256ba..002b916 100644 --- a/htdocs/application/controllers/auth.php +++ b/htdocs/application/controllers/auth.php @@ -78,7 +78,7 @@ class Auth extends CI_Controller { } else { $data['logged_in'] = FALSE; } - $this->load->view('auth/logout_view', $data); + redirect('/'); } } diff --git a/htdocs/application/libraries/auth_ldap.php b/htdocs/application/libraries/auth_ldap.php index fb162b5..c27d73b 100644 --- a/htdocs/application/libraries/auth_ldap.php +++ b/htdocs/application/libraries/auth_ldap.php @@ -124,8 +124,8 @@ class Auth_Ldap { */ function logout() { // Just set logged_in to FALSE and then destroy everything for good measure - $this->ci->session->set_userdata(array('logged_in' => FALSE)); - $this->ci->session->sess_destroy(); + $this->ci->db_session->set_userdata(array('logged_in' => FALSE)); + $this->ci->db_session->sess_destroy(); } /** diff --git a/htdocs/application/views/auth/logout_view.php b/htdocs/application/views/auth/logout_view.php deleted file mode 100644 index 7aeffca..0000000 --- a/htdocs/application/views/auth/logout_view.php +++ /dev/null @@ -1,15 +0,0 @@ - - - - Logout - - - -

has been logged out.

-

Thanks for visiting

- -

You need to before you log out...

- - - diff --git a/htdocs/application/views/defaults/header.php b/htdocs/application/views/defaults/header.php index 25085de..d89ad83 100755 --- a/htdocs/application/views/defaults/header.php +++ b/htdocs/application/views/defaults/header.php @@ -53,6 +53,13 @@ $this->carabiner->display('css');
  • href="" title="API">API
  • href="" title="About">About
    • + config->item('require_auth') ){ + if ($this->auth_ldap->is_authenticated()){ + echo "
  • Logout
    • '; + } + } + ?>