Permalink
Browse files

#1485584: display proper warning on login with empty user and pass

  • Loading branch information...
1 parent 9abd0f0 commit b2265aea867124e201e7883ac16df05dd446fae5 @alecpl alecpl committed Nov 28, 2008
Showing with 2 additions and 2 deletions.
  1. +2 −2 index.php
View
@@ -78,7 +78,7 @@
if (empty($_COOKIE)) {
$OUTPUT->show_message("cookiesdisabled", 'warning');
}
- else if ($_SESSION['temp'] && !empty($_POST['_user']) && isset($_POST['_pass']) &&
+ else if ($_SESSION['temp'] && !empty($_POST['_user']) && !empty($_POST['_pass']) &&
$RCMAIL->login(trim(get_input_value('_user', RCUBE_INPUT_POST), ' '),
get_input_value('_pass', RCUBE_INPUT_POST, true, 'ISO-8859-1'), $host)) {
// create new session ID
@@ -100,7 +100,7 @@
$OUTPUT->redirect();
}
else {
- $OUTPUT->show_message($IMAP->error_code == -1 ? 'loginfailed' : 'imaperror', 'warning');
+ $OUTPUT->show_message($IMAP->error_code == 0 ? 'loginfailed' : 'imaperror', 'warning');
$RCMAIL->kill_session();
}
}

0 comments on commit b2265ae

Please sign in to comment.