- Add username and IP address to log message on unsuccessful login (#1487626)

1 files changed, 6 insertions, 2 deletions

diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index d1947c4a3..83c34bc3c 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -172,10 +172,14 @@ class rcube_imap
         }
         // write error log
         else if ($this->conn->error) {
-            if ($pass && $user)
+            if ($pass && $user) {
+                $message = sprintf("Login failed for %s from %s. %s",
+                    $user, rcmail_remote_ip(), $this->conn->error);
+
                 raise_error(array('code' => 403, 'type' => 'imap',
                     'file' => __FILE__, 'line' => __LINE__,
-                    'message' => $this->conn->error), true, false);
+                    'message' => $message), true, false);
+            }
         }
 
         return false;