diff options
| -rw-r--r-- | index.php | 2 | ||||
| -rw-r--r-- | program/js/app.js | 8 |
2 files changed, 7 insertions, 3 deletions
@@ -141,7 +141,7 @@ else if ($_action=='logout' && isset($_SESSION['user_id'])) } // check session cookie and auth string -else if ($_action!='login' && $sess_auth) +else if ($_action!='login' && $sess_auth && $_SESSION['user_id']) { if ($_auth !== $sess_auth || $_auth != rcmail_auth_hash($_SESSION['client_id'], $_SESSION['auth_time']) || ($CONFIG['session_lifetime'] && $SESS_CHANGED + $CONFIG['session_lifetime']*60 < mktime())) diff --git a/program/js/app.js b/program/js/app.js index f56a7d866..8cc385895 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -782,11 +782,15 @@ function rcube_webmail() this.switch_task = function(task) { - if (this.task===task) + if (this.task===task && task!='mail') return; + var url = this.get_task_url(task); + if (task=='mail') + url += '&_mbox=INBOX'; + this.set_busy(true); - location.href = this.get_task_url(task); + location.href = url; }; |