From 4064452816e7e94b7a6dbc7b02cfc56d725408b2 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 08 Dec 2010 09:24:53 -0500
Subject: [PATCH] - Fix handling of untagged responses for AUTHENTICATE command (#1487450)
---
index.php | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/index.php b/index.php
index f1e5ac1..47b08ef 100644
--- a/index.php
+++ b/index.php
@@ -77,16 +77,14 @@
if ($RCMAIL->task == 'login' && $RCMAIL->action == 'login') {
// purge the session in case of new login when a session already exists
$RCMAIL->kill_session();
-
+
$auth = $RCMAIL->plugins->exec_hook('authenticate', array(
'host' => $RCMAIL->autoselect_host(),
'user' => trim(get_input_value('_user', RCUBE_INPUT_POST)),
+ 'pass' => get_input_value('_pass', RCUBE_INPUT_POST, true,
+ $RCMAIL->config->get('password_charset', 'ISO-8859-1')),
'cookiecheck' => true,
));
-
- 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)) {
@@ -220,16 +218,15 @@
'group-addmembers' => 'groups.inc',
'group-delmembers' => 'groups.inc',
),
-
+
'settings' => array(
- 'folders' => 'manage_folders.inc',
- 'create-folder' => 'manage_folders.inc',
- 'rename-folder' => 'manage_folders.inc',
- 'delete-folder' => 'manage_folders.inc',
- 'subscribe' => 'manage_folders.inc',
- 'unsubscribe' => 'manage_folders.inc',
- 'enable-threading' => 'manage_folders.inc',
- 'disable-threading' => 'manage_folders.inc',
+ 'folders' => 'folders.inc',
+ 'rename-folder' => 'folders.inc',
+ 'delete-folder' => 'folders.inc',
+ 'subscribe' => 'folders.inc',
+ 'unsubscribe' => 'folders.inc',
+ 'purge' => 'folders.inc',
+ 'folder-size' => 'folders.inc',
'add-identity' => 'edit_identity.inc',
)
);
--
Gitblit v1.9.1