Keep session alive while showing login page (request token is stored in session data)

2 files changed, 4 insertions, 2 deletions

diff --git a/index.php b/index.php
index 440a245c5..21d5d859a 100644
--- a/index.php
+++ b/index.php
@@ -154,7 +154,9 @@ else if ($RCMAIL->task != 'login' && $_SESSION['user_id'] && $RCMAIL->action !=
 
 // 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 f81f8d5ee..73058e967 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -5431,7 +5431,7 @@ function rcube_webmail()
 
     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);
   };