diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-08-05 13:13:57 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-08-05 13:13:57 +0000 |
| commit | 0987b77309c24f450498262eb6162811b63c4ed8 (patch) | |
| tree | d7ded0e0b0fbb4ac0b6f8af2fe0460fe312ada75 | |
| parent | 5fe6f71f0f36715ba6aa0da03e65d8a6d5d1c5a6 (diff) | |
Allow a plugin to disable the cookie check
git-svn-id: https://svn.roundcube.net/trunk@2840 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/index.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/roundcubemail/index.php b/roundcubemail/index.php index 3bb1227bb..e6fd10a6f 100644 --- a/roundcubemail/index.php +++ b/roundcubemail/index.php @@ -2,7 +2,7 @@ /* +-------------------------------------------------------------------------+ | RoundCube Webmail IMAP Client | - | Version 0.3-20090724 | + | Version 0.3-20090805 | | | | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland | | | @@ -83,13 +83,15 @@ if ($RCMAIL->action=='login' && $RCMAIL->task=='mail') { $auth = $RCMAIL->plugins->exec_hook('authenticate', array( 'host' => $RCMAIL->autoselect_host(), 'user' => trim(get_input_value('_user', RCUBE_INPUT_POST)), + 'cookiecheck' => true, )) + array('pass' => get_input_value('_pass', RCUBE_INPUT_POST, true, 'ISO-8859-1')); // check if client supports cookies - if (empty($_COOKIE)) { + if ($auth['cookiecheck'] && empty($_COOKIE)) { $OUTPUT->show_message("cookiesdisabled", 'warning'); } - else if ($_SESSION['temp'] && !empty($auth['user']) && !empty($auth['host']) && isset($auth['pass']) && + else if ($_SESSION['temp'] && !$auth['abort'] && !empty($auth['host']) && + !empty($auth['user']) && isset($auth['pass']) && $RCMAIL->login($auth['user'], $auth['pass'], $auth['host'])) { // create new session ID rcube_sess_unset('temp'); |