From eaa39477bd53130e68bfb26d63308cc9b6af9369 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 11 Apr 2008 09:34:19 -0400
Subject: [PATCH] #1483863: empty trash and expunge inbox on logout

---
 index.php |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/index.php b/index.php
index 642c07a..e9c1cee 100644
--- a/index.php
+++ b/index.php
@@ -2,7 +2,7 @@
 /*
  +-----------------------------------------------------------------------+
  | RoundCube Webmail IMAP Client                                         |
- | Version 0.1-20080314                                                  |
+ | Version 0.1-20080328                                                  |
  |                                                                       |
  | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
@@ -160,7 +160,7 @@
     $OUTPUT->show_message("cookiesdisabled", 'warning');
   }
   else if ($_SESSION['temp'] && !empty($_POST['_user']) && isset($_POST['_pass']) &&
-           rcmail_login(get_input_value('_user', RCUBE_INPUT_POST),
+           rcmail_login(trim(get_input_value('_user', RCUBE_INPUT_POST), ' '),
               get_input_value('_pass', RCUBE_INPUT_POST, true, 'ISO-8859-1'), $host))
   {
     // create new session ID
@@ -185,6 +185,7 @@
 else if (($_task=='logout' || $_action=='logout') && isset($_SESSION['user_id']))
 {
   $OUTPUT->show_message('loggedout');
+  rcmail_logout_actions();
   rcmail_kill_session();
 }
 
@@ -245,7 +246,7 @@
 if (empty($USER->ID))
 {
   // check if installer is still active
-  if (!$CONFIG['installer_disable_warning'] && is_readable('./installer/index.php'))
+  if ($CONFIG['enable_installer'] && is_readable('./installer/index.php'))
     $OUTPUT->add_footer('
   <div style="background:#ef9398; border:2px solid #dc5757; padding:0.5em; margin:2em auto; width:50em">
   <h2 style="margin-top:0.2em">Installer script is still accessible</h2>

--
Gitblit v1.9.1