From 73fc69ddee626c44efd00ba5852637c963ae4040 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 27 Jun 2017 16:55:03 +0200
Subject: v1.3.0

---
 roundcubemail-pr313.patch | 56 +++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 52 insertions(+), 4 deletions(-)

(limited to 'roundcubemail-pr313.patch')

diff --git a/roundcubemail-pr313.patch b/roundcubemail-pr313.patch
index 24dbfae..f68a110 100644
--- a/roundcubemail-pr313.patch
+++ b/roundcubemail-pr313.patch
@@ -1,17 +1,17 @@
-From e8e951098db781422f7ed557d97b1b218d7529de Mon Sep 17 00:00:00 2001
+From 132a807dff7fc2d173e2e3bebb18ee181c7b27d9 Mon Sep 17 00:00:00 2001
 From: Remi Collet <fedora@famillecollet.com>
 Date: Mon, 28 Dec 2015 08:47:37 +0100
-Subject: [PATCH] add .log suffix to all log file names
+Subject: [PATCH 1/2] add .log suffix to all log file names
 
 ---
  program/lib/Roundcube/rcube.php | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php
-index 7388472..c2fc70f 100644
+index 3694c5c4b..ef5dcb94e 100644
 --- a/program/lib/Roundcube/rcube.php
 +++ b/program/lib/Roundcube/rcube.php
-@@ -1195,7 +1195,7 @@ class rcube
+@@ -1246,7 +1246,7 @@ public static function write_log($name, $line)
              $log_dir = RCUBE_INSTALL_PATH . 'logs';
          }
  
@@ -20,3 +20,51 @@ index 7388472..c2fc70f 100644
      }
  
      /**
+
+From 6ca4eab399adad22ed93b26c5870896425631dfa Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Tue, 27 Jun 2017 13:35:01 +0200
+Subject: [PATCH 2/2] add 'log_file_ext' configuration option
+
+---
+ config/defaults.inc.php         | 3 +++
+ program/lib/Roundcube/rcube.php | 8 +++++++-
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/config/defaults.inc.php b/config/defaults.inc.php
+index e2db2b726..050803231 100644
+--- a/config/defaults.inc.php
++++ b/config/defaults.inc.php
+@@ -77,6 +77,9 @@
+ // set to 0 to avoid session IDs being logged.
+ $config['log_session_id'] = 8;
+ 
++// Default extension used for log file name
++$config['log_file_ext'] = '.log';
++
+ // Syslog ident string to use, if using the 'syslog' log driver.
+ $config['syslog_id'] = 'roundcube';
+ 
+diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php
+index ef5dcb94e..401cd3f86 100644
+--- a/program/lib/Roundcube/rcube.php
++++ b/program/lib/Roundcube/rcube.php
+@@ -1242,11 +1242,17 @@ public static function write_log($name, $line)
+             }
+         }
+ 
++        if (self::$instance) {
++            $log_suf = self::$instance->config->get('log_file_ext', '.log');
++        } else {
++            $log_suf = '.log';
++        }
++
+         if (empty($log_dir)) {
+             $log_dir = RCUBE_INSTALL_PATH . 'logs';
+         }
+ 
+-        return file_put_contents("$log_dir/$name.log", $line, FILE_APPEND) !== false;
++        return file_put_contents("$log_dir/$name$log_suf", $line, FILE_APPEND) !== false;
+     }
+ 
+     /**
-- 
cgit