Changeset 4609 in subversion

Timestamp:

Mar 15, 2011 6:27:01 PM (2 years ago)

Author:

thomasb

Message:

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

Location:

trunk/roundcubemail

Files:

• index.php (modified) (1 diff)
• program/js/app.js (modified) (1 diff)

trunk/roundcubemail/index.php

@@ -155 +155 @@
 // 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);
 

trunk/roundcubemail/program/js/app.js

@@ -5432 +5432 @@
     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);
   };