diff options
| author | roundcube <roundcube@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2005-10-26 22:30:57 +0000 |
|---|---|---|
| committer | roundcube <roundcube@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2005-10-26 22:30:57 +0000 |
| commit | ad32715fe346b4baf680238fd723cce6dad47b88 (patch) | |
| tree | 688d2101207520d1c8e18497c7d88307f069f8cb | |
| parent | 725d43add7753f470867991a47c1abb6f9c332e5 (diff) | |
Finished message sorting and fixed some skin issues
git-svn-id: https://svn.roundcube.net/trunk@63 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/index.php | 2 | ||||
| -rw-r--r-- | roundcubemail/program/js/app.js | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/roundcubemail/index.php b/roundcubemail/index.php index f10886f36..fe930feb3 100644 --- a/roundcubemail/index.php +++ b/roundcubemail/index.php @@ -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/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js index f56a7d866..8cc385895 100644 --- a/roundcubemail/program/js/app.js +++ b/roundcubemail/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; }; |