From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli <thomas@roundcube.net> Date: Tue, 19 Aug 2014 12:08:35 -0400 Subject: [PATCH] Fix merge error that disabled contact drag'n'drop --- plugins/http_authentication/http_authentication.php | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/plugins/http_authentication/http_authentication.php b/plugins/http_authentication/http_authentication.php index c278b3c..a94b612 100644 --- a/plugins/http_authentication/http_authentication.php +++ b/plugins/http_authentication/http_authentication.php @@ -11,6 +11,8 @@ * * See logout.html (in this directory) for an example how HTTP auth can be cleared. * + * For other configuration options, see config.inc.php.dist! + * * @version @package_version@ * @license GNU GPLv3+ * @author Thomas Bruederli @@ -46,6 +48,13 @@ function authenticate($args) { + // Load plugin's config file + $this->load_config(); + + $host = rcmail::get_instance()->config->get('http_authentication_host'); + if (is_string($host) && trim($host) !== '') + $args['host'] = rcube_idn_to_ascii(rcube_parse_host($host)); + // Allow entering other user data in login form, // e.g. after log out (#1487953) if (!empty($args['user'])) { -- Gitblit v1.9.1