From 64608bf2ef7fc5b6cedfb666c5f78a5771c58556 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 25 Feb 2010 05:56:01 -0500
Subject: [PATCH] - Password: Make passwords encoding consistent with core, add 'password_charset' global option (#1486473)
---
index.php | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/index.php b/index.php
index 87eb576..8d3e10a 100644
--- a/index.php
+++ b/index.php
@@ -82,15 +82,19 @@
'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'));
+ ));
+
+ if (!isset($auth['pass']))
+ $auth['pass'] = get_input_value('_pass', RCUBE_INPUT_POST, true,
+ $RCMAIL->config->get('password_charset', 'ISO-8859-1'));
// check if client supports cookies
if ($auth['cookiecheck'] && empty($_COOKIE)) {
$OUTPUT->show_message("cookiesdisabled", 'warning');
}
- else if ($_SESSION['temp'] && !$auth['abort'] && !empty($auth['host']) &&
- !empty($auth['user']) && isset($auth['pass']) &&
- $RCMAIL->login($auth['user'], $auth['pass'], $auth['host'])) {
+ else if ($_SESSION['temp'] && !$auth['abort'] &&
+ !empty($auth['host']) && !empty($auth['user']) &&
+ $RCMAIL->login($auth['user'], $auth['pass'], $auth['host'])) {
// create new session ID
rcube_sess_unset('temp');
rcube_sess_regenerate_id();
--
Gitblit v1.9.1