- Fix logging in as other user after logout (#1487953)

git-svn-id: https://svn.roundcube.net/trunk@5093 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 8 insertions, 2 deletions

diff --git a/plugins/http_authentication/http_authentication.php b/plugins/http_authentication/http_authentication.php
index 6da6488a0..b806679d9 100644
--- a/plugins/http_authentication/http_authentication.php
+++ b/plugins/http_authentication/http_authentication.php
@@ -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;
   }