2 commits - share/templates

[Jeroen van Meeuwen]

 share/templates/roundcubemail/managesieve.inc.php.tpl |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit f5b29afd3f353d3d0e312cdb7584417dbddb088b
Merge: 0ba52ce d5c5678
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Dec 19 13:44:23 2014 +0100

    Merge branch 'master' of ssh://git.kolabsys.com/git/pykolab



commit 0ba52ce2a4fbd3112d61547a7933a74e4837d492
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Dec 19 13:43:48 2014 +0100

    Fix default configuration for Roundcube's managesieve plugin (#4103)

diff --git a/share/templates/roundcubemail/managesieve.inc.php.tpl b/share/templates/roundcubemail/managesieve.inc.php.tpl
index 0e44079..780125e 100644
--- a/share/templates/roundcubemail/managesieve.inc.php.tpl
+++ b/share/templates/roundcubemail/managesieve.inc.php.tpl
@@ -9,9 +9,12 @@
     \$config['managesieve_mbox_encoding'] = 'UTF-8';
     \$config['managesieve_replace_delimiter'] = '';
     \$config['managesieve_disabled_extensions'] = array();
-    \$config['managesieve_debug'] = true;
+    \$config['managesieve_debug'] = false;
     \$config['managesieve_vacation'] = 1;
 
+    \$config['managesieve_filename_extension'] = '';
+    \$config['managesieve_kolab_master'] = true;
+
     if (file_exists(RCUBE_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__))) {
         include_once(RCUBE_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__));
     }