From f0695f20306cd7588741ead5f6d8d8831794b4ab Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 14 Nov 2008 05:21:47 +0000
Subject: Move logout to its own controller

---
 modules/user/controllers/logout.php  | 29 +++++++++++++++++++++++++++++
 themes/default/views/header.html.php |  6 +++---
 2 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 modules/user/controllers/logout.php

diff --git a/modules/user/controllers/logout.php b/modules/user/controllers/logout.php
new file mode 100644
index 00000000..34f27fff
--- /dev/null
+++ b/modules/user/controllers/logout.php
@@ -0,0 +1,29 @@
+<?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 {
+  public function index() {
+    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/themes/default/views/header.html.php b/themes/default/views/header.html.php
index f212bdb6..07b446e8 100644
--- a/themes/default/views/header.html.php
+++ b/themes/default/views/header.html.php
@@ -4,11 +4,11 @@
 
 <div id="gLoginMenu">
   <? if ($user): ?>
-    <a href="<?= url::site("user/update")?>"><?= _("Modify Profile") ?></a> | 
-    <a href="<?= url::site("login/logout")?>" id="gLogoutLink"><?= _("Logout") ?></a>
+    <a href="<?= url::site("user/update")?>"><?= _("Modify Profile") ?></a> |
+    <a href="<?= url::site("logout")?>" id="gLogoutLink"><?= _("Logout") ?></a>
   <? else: ?>
     <a href="#"><?=_("Recover password") ?></a> |
-    <a href="<?= url::site("user/register")?>"><?= _("Register") ?></a> | 
+    <a href="<?= url::site("user/register")?>"><?= _("Register") ?></a> |
     <span id="gLoginLink">
       <a href="javascript:show_login()"><?= _("Login") ?></a>
     </span>
-- 
cgit v1.2.3