From b97e3b5cd786987ccde0a5f4ecc8761e7262b350 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 10 Jul 2017 16:39:21 +0200 Subject: [PATCH] Don't ignore (global) userlogins/sendmail logs in per_user_logging mode --- program/lib/Roundcube/rcube.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php index d9d2439d8..9330083ac 100644 --- a/program/lib/Roundcube/rcube.php +++ b/program/lib/Roundcube/rcube.php @@ -1234,9 +1234,9 @@ class rcube $line = sprintf("[%s]: %s\n", $date, $line); // per-user logging is activated - if (self::$instance && self::$instance->config->get('per_user_logging', false) && self::$instance->get_user_id()) { + if (self::$instance && self::$instance->config->get('per_user_logging') && self::$instance->get_user_id()) { $log_dir = self::$instance->get_user_log_dir(); - if (empty($log_dir) && $name != 'errors') { + if (empty($log_dir) && !in_array($name, array('errors', 'userlogins', 'sendmail'))) { return false; } }