summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksander Machniak <machniak@kolabsys.com>2016-10-06 09:40:52 +0200
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2016-10-06 09:41:41 +0200
commit27d3a9b157d465ba8fd311d14c9902d25ab61968 (patch)
treec5ddf326d4052e690cb8739603c23113bdd13406
parent8cc560a3528cf52f593bf9ec18676e6d54b60606 (diff)
downloadpykolab-27d3a9b157d465ba8fd311d14c9902d25ab61968.tar.gz
T1464: Removed duplicated options
Summary: Fixes T1464 Reviewers: #pykolab_developers, vanmeeuwen Reviewed By: #pykolab_developers, vanmeeuwen Maniphest Tasks: T1464 Differential Revision: https://git.kolab.org/D220
-rw-r--r--share/templates/roundcubemail/config.inc.php.tpl3
1 files changed, 3 insertions, 0 deletions
diff --git a/share/templates/roundcubemail/config.inc.php.tpl b/share/templates/roundcubemail/config.inc.php.tpl
index 51a7ea6..a5984ca 100644
--- a/share/templates/roundcubemail/config.inc.php.tpl
+++ b/share/templates/roundcubemail/config.inc.php.tpl
@@ -19,6 +19,7 @@
\$config['imap_force_lsub'] = true;
// IMAP Connection TLS settings, adjust for Production
+ // Required for PHP >= 5.6
\$config['imap_conn_options'] = Array(
'ssl' => Array(
'verify_peer_name' => false,
@@ -42,6 +43,7 @@
\$config['smtp_helo_host'] = \$_SERVER["HTTP_HOST"];
// SMTP Connection TLS settings, adjust for Production
+ // Required for PHP >= 5.6
\$config['smtp_conn_options'] = Array(
'ssl' => Array(
'verify_peer_name' => false,
@@ -229,4 +231,5 @@
'ssl_verify_peer' => false,
);
+ \$config['fileapi_manticore'] = 'http://' . \$_SERVER['HTTP_HOST'] . ':8080';
?>