diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-11-28 08:53:48 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-11-28 08:53:48 +0000 |
| commit | c3945f20bac67206d4480716b6086c391147a467 (patch) | |
| tree | b0f2f24d912cf1c1c8fd0890c15a3ba683d82c07 | |
| parent | ca463f7c5d25fc4b95ef6286323a081f71bccd08 (diff) | |
- re-fix r2095
git-svn-id: https://svn.roundcube.net/trunk@2096 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/index.php | 2 | ||||
| -rw-r--r-- | roundcubemail/program/lib/imap.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roundcubemail/index.php b/roundcubemail/index.php index 8b31f9987..d4fc54304 100644 --- a/roundcubemail/index.php +++ b/roundcubemail/index.php @@ -100,7 +100,7 @@ if ($RCMAIL->action=='login' && $RCMAIL->task=='mail') { $OUTPUT->redirect(); } else { - $OUTPUT->show_message($IMAP->error_code == 0 ? 'loginfailed' : 'imaperror', 'warning'); + $OUTPUT->show_message($IMAP->error_code < -1 ? 'imaperror' : 'loginfailed', 'warning'); $RCMAIL->kill_session(); } } diff --git a/roundcubemail/program/lib/imap.inc b/roundcubemail/program/lib/imap.inc index f269c2127..6fb60e90a 100644 --- a/roundcubemail/program/lib/imap.inc +++ b/roundcubemail/program/lib/imap.inc @@ -586,7 +586,7 @@ function iil_Connect($host, $user, $password) { $conn->fp = fsockopen($host, $ICL_PORT, $errno, $errstr, 10); if (!$conn->fp) { $iil_error = "Could not connect to $host at port $ICL_PORT: $errstr"; - $iil_errornum = -1; + $iil_errornum = -2; return false; } |
