From 6e5027ba24c6541649575b17890e4bb1db7d0a88 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Tue, 21 May 2019 12:58:43 +0200 Subject: [PATCH] Fix so userlogins and sendmail logs are never put into the per_user_logging folder --- program/lib/Roundcube/rcube.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php index e797971f0..322fd6947 100644 --- a/program/lib/Roundcube/rcube.php +++ b/program/lib/Roundcube/rcube.php @@ -1263,9 +1263,12 @@ class rcube $line = sprintf("[%s]: %s\n", $date, $line); // per-user logging is activated - if (self::$instance && self::$instance->config->get('per_user_logging') && self::$instance->get_user_id()) { + if (self::$instance && self::$instance->config->get('per_user_logging') + && self::$instance->get_user_id() + && !in_array($name, array('userlogins', 'sendmail')) + ) { $log_dir = self::$instance->get_user_log_dir(); - if (empty($log_dir) && !in_array($name, array('errors', 'userlogins', 'sendmail'))) { + if (empty($log_dir) && $name !== 'errors') { return false; } }