From 32b11d325e38fa7d4a287e1e4bc95367fc4896bd Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 15 Mar 2011 18:27:01 -0400
Subject: [PATCH] Keep session alive while showing login page (request token is stored in session data)
---
index.php | 4 +++-
program/js/app.js | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/index.php b/index.php
index 440a245..21d5d85 100644
--- a/index.php
+++ b/index.php
@@ -154,7 +154,9 @@
// not logged in -> show login page
if (empty($RCMAIL->user->ID)) {
- if ($OUTPUT->ajax_call)
+ if ($RCMAIL->action == 'keep-alive')
+ $OUTPUT->send();
+ else if ($OUTPUT->ajax_call)
$OUTPUT->redirect(array(), 2000);
if (!empty($_REQUEST['_framed']))
diff --git a/program/js/app.js b/program/js/app.js
index f81f8d5..73058e9 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -5431,7 +5431,7 @@
if (this.env.keep_alive && !this.env.framed && this.task == 'mail' && this.gui_objects.mailboxlist)
this._int = setInterval(function(){ ref.check_for_recent(false); }, this.env.keep_alive * 1000);
- else if (this.env.keep_alive && !this.env.framed && this.task != 'login' && this.env.action != 'print')
+ else if (this.env.keep_alive && !this.env.framed && this.env.action != 'print')
this._int = setInterval(function(){ ref.send_keep_alive(); }, this.env.keep_alive * 1000);
};
--
Gitblit v1.9.1