diff options
| author | robin <robin@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-05-12 14:10:30 +0000 |
|---|---|---|
| committer | robin <robin@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-05-12 14:10:30 +0000 |
| commit | 29b7dbcd46b53a21b403ad24dd23e5104693e821 (patch) | |
| tree | 88c4cbeef7dfc8abb8db11db32b36b98d07ccbb2 | |
| parent | 82c54c30aa2542811e2ae7682ee93c1e0e219526 (diff) | |
Really, really logout (fixes r2467).
git-svn-id: https://svn.roundcube.net/trunk@2468 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/index.php | 2 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcmail.php | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/roundcubemail/index.php b/roundcubemail/index.php index 7c2d23032..721aefc7c 100644 --- a/roundcubemail/index.php +++ b/roundcubemail/index.php @@ -97,7 +97,7 @@ if ($RCMAIL->action=='login' && $RCMAIL->task=='mail') { else if ($_SESSION['temp'] && !empty($auth['user']) && !empty($auth['host']) && isset($auth['pass']) && $RCMAIL->login($auth['user'], $auth['pass'], $auth['host'])) { // create new session ID - unset($_SESSION['temp']); + rcube_sess_unset('temp'); rcube_sess_regenerate_id(); // send auth cookie if necessary diff --git a/roundcubemail/program/include/rcmail.php b/roundcubemail/program/include/rcmail.php index 45b59ae49..1443617c4 100644 --- a/roundcubemail/program/include/rcmail.php +++ b/roundcubemail/program/include/rcmail.php @@ -793,6 +793,8 @@ class rcmail */ public function kill_session() { + foreach (array_keys($_SESSION) as $var) + rcube_sess_unset($var); $_SESSION = array('language' => $this->user->language, 'auth_time' => time(), 'temp' => true); rcmail::setcookie('sessauth', '-del-', time() - 60); $this->user->reset(); |