2 files changed, 9 insertions, 25 deletions
diff --git a/modules/user/controllers/login.php b/modules/user/controllers/login.php
index 991fa73b..2debf6d3 100644
--- a/modules/user/controllers/login.php
+++ b/modules/user/controllers/login.php
@@ -19,7 +19,6 @@
  */
 class Login_Controller extends Controller {
   public function index() {
-    Kohana::log("debug", "Login_Controller/index");
     $form = new Forge();
     $form->input("username")->rules("required|length[4,32]");
     $form->password("password")->rules("required|length[5,40]");
@@ -28,9 +27,6 @@ class Login_Controller extends Controller {
   }
 
   public function process() {
-    Kohana::log("debug", "Login_Controller/process");
-
-    Kohana::log("debug", print_r($_POST, true));
     $form = new Forge("login.html", true);
     $form->input("username")->rules("required|length[4,32]");
     $form->password("password")->rules("required|length[5,40]");
@@ -56,4 +52,13 @@ class Login_Controller extends Controller {
 
     print json_encode($response);
   }
+
+  public function logout() {
+    try {
+      Session::instance()->destroy();
+    } catch (Exception $e) {
+      Kohana::log("error", $e);
+    }
+    print json_encode(array("logout" => true));
+  }
 }
 \ No newline at end of file
diff --git a/modules/user/controllers/logout.php b/modules/user/controllers/logout.php
deleted file mode 100644
index c26c6776..00000000
--- a/modules/user/controllers/logout.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2008 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class Logout_Controller extends Controller {
-}
-\ No newline at end of file