Remove all non Identity API methods from Identity.php. Created an MY_Session class to provide the user state changes in the session and a login.php helper that has the login form.

1 files changed, 9 insertions, 4 deletions

diff --git a/modules/gallery/controllers/logout.php b/modules/gallery/controllers/logout.php
index 6841b870..058860fa 100644
--- a/modules/gallery/controllers/logout.php
+++ b/modules/gallery/controllers/logout.php
@@ -19,10 +19,15 @@
  */
 class Logout_Controller extends Controller {
   public function index() {
-    //access::verify_csrf();
-
-    $user = Identity::active();
-    Identity::logout();
+    $user = Session::active_user();
+    if (!$user->guest) {
+      try {
+        Session::instance()->destroy();
+      } catch (Exception $e) {
+        Kohana::log("error", $e);
+      }
+      module::event("user_logout", $user);
+    }
     log::info("user", t("User %name logged out", array("name" => $user->name)),
               html::anchor("user/$user->id", html::clean($user->name)));
     if ($continue_url = $this->input->get("continue")) {