From 9f61af351807499a8a70ff7ca42ef983c5a1d992 Mon Sep 17 00:00:00 2001 From: alecpl Date: Tue, 23 Aug 2011 18:15:04 +0000 Subject: - Backported r5093 --- plugins/http_authentication/http_authentication.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/plugins/http_authentication/http_authentication.php b/plugins/http_authentication/http_authentication.php index 6da6488a0..8002160c5 100644 --- a/plugins/http_authentication/http_authentication.php +++ b/plugins/http_authentication/http_authentication.php @@ -5,7 +5,7 @@ * * Make use of an existing HTTP authentication and perform login with the existing user credentials * - * @version 1.2 + * @version 1.3 * @author Thomas Bruederli */ class http_authentication extends rcube_plugin @@ -30,14 +30,20 @@ class http_authentication extends rcube_plugin function authenticate($args) { + // Allow entering other user data in login form, + // e.g. after log out (#1487953) + if (!empty($args['user'])) { + return $args; + } + if (!empty($_SERVER['PHP_AUTH_USER']) && !empty($_SERVER['PHP_AUTH_PW'])) { $args['user'] = $_SERVER['PHP_AUTH_USER']; $args['pass'] = $_SERVER['PHP_AUTH_PW']; } - + $args['cookiecheck'] = false; $args['valid'] = true; - + return $args; } -- cgit v1.2.3