diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2012-01-03 09:56:19 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2012-01-03 09:56:19 +0000 |
| commit | e96d84bdc8443d9e5ba5bde028f20711678e0e0a (patch) | |
| tree | 1366e80dcedd3e9126c292a12796b2196e7cf092 | |
| parent | cbef63721dc384b091d6e9c3e8bd087bdaf062a5 (diff) | |
- Move some checks into login() method
git-svn-id: https://svn.roundcube.net/trunk@5690 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/index.php | 3 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcmail.php | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/roundcubemail/index.php b/roundcubemail/index.php index 6f761a4ee..a2d012cc3 100644 --- a/roundcubemail/index.php +++ b/roundcubemail/index.php @@ -97,8 +97,7 @@ if ($RCMAIL->task == 'login' && $RCMAIL->action == 'login') { $OUTPUT->show_message("cookiesdisabled", 'warning'); } else if ($auth['valid'] && !$auth['abort'] && - !empty($auth['host']) && !empty($auth['user']) && - $RCMAIL->login($auth['user'], $auth['pass'], $auth['host']) + $RCMAIL->login($auth['user'], $auth['pass'], $auth['host']) ) { // create new session ID, don't destroy the current session // it was destroyed already by $RCMAIL->kill_session() above diff --git a/roundcubemail/program/include/rcmail.php b/roundcubemail/program/include/rcmail.php index deaaabf54..fbf691a51 100644 --- a/roundcubemail/program/include/rcmail.php +++ b/roundcubemail/program/include/rcmail.php @@ -750,11 +750,15 @@ class rcmail * @param string IMAP user name * @param string IMAP password * @param string IMAP host + * * @return boolean True on success, False on failure */ function login($username, $pass, $host=NULL) { - $user = NULL; + if (empty($username)) { + return false; + } + $config = $this->config->all(); if (!$host) |