From b2265aea867124e201e7883ac16df05dd446fae5 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 28 Nov 2008 02:55:20 -0500
Subject: [PATCH] #1485584: display proper warning on login with empty user and pass
---
index.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/index.php b/index.php
index 92223d2..8b31f99 100644
--- a/index.php
+++ b/index.php
@@ -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();
}
}
--
Gitblit v1.9.1