summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorAleksander Machniak <machniak@kolabsys.com>2016-10-06 09:40:31 +0200
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2016-10-06 09:40:31 +0200
commita773c1edcf21b996f3530c09150ab4a2548da13a (patch)
treea1ea3c301388036c91bbc175fcf0a9d866e25753 /share
parentd3ef5e8b1168ec39145c6a160542bc15197434f0 (diff)
downloadpykolab-a773c1edcf21b996f3530c09150ab4a2548da13a.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
Diffstat (limited to 'share')
-rw-r--r--share/templates/roundcubemail/config.inc.php.tpl19
1 files changed, 2 insertions, 17 deletions
diff --git a/share/templates/roundcubemail/config.inc.php.tpl b/share/templates/roundcubemail/config.inc.php.tpl
index 87afb2d..928992b 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,23 +231,6 @@
'ssl_verify_peer' => false,
);
- # Required for PHP 5.6
- \$config['imap_conn_options'] = Array(
- 'ssl' => Array(
- 'verify_peer_name' => false,
- 'verify_peer' => false,
- 'allow_self_signed' => true
- )
- );
-
- \$config['smtp_conn_options'] = Array(
- 'ssl' => Array(
- 'verify_peer_name' => false,
- 'verify_peer' => false,
- 'allow_self_signed' => true
- )
- );
-
\$config['fileapi_manticore'] = 'http://' . \$_SERVER['HTTP_HOST'] . ':8080';
?>