aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2017-03-19 18:07:14 +0100
committerTristan Darricau <github@nicofuma.fr>2017-03-19 18:07:14 +0100
commit552da2e80575c7db28449fd292d6bfa9b8f4b036 (patch)
tree6f5336c037f6985bf84ab0eebbce85e925f6ef77 /phpBB/phpbb
parent67509edd4070b6a8158e1572241a96bc28c8d3c9 (diff)
parent0b2369901a4a6f5eb4cbc45981a13a91a1532994 (diff)
downloadforums-552da2e80575c7db28449fd292d6bfa9b8f4b036.tar
forums-552da2e80575c7db28449fd292d6bfa9b8f4b036.tar.gz
forums-552da2e80575c7db28449fd292d6bfa9b8f4b036.tar.bz2
forums-552da2e80575c7db28449fd292d6bfa9b8f4b036.tar.xz
forums-552da2e80575c7db28449fd292d6bfa9b8f4b036.zip
Merge branch '3.1.x' into 3.2.x
* 3.1.x: [ticket/13558] Change options prefix and add settings precautions. [ticket/13558] Make SSL context specific options more SMTP general [ticket/13558] Add smtp SSL context configuration options
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/db/migration/data/v31x/add_smtp_ssl_context_config_options.php32
1 files changed, 32 insertions, 0 deletions
diff --git a/phpBB/phpbb/db/migration/data/v31x/add_smtp_ssl_context_config_options.php b/phpBB/phpbb/db/migration/data/v31x/add_smtp_ssl_context_config_options.php
new file mode 100644
index 0000000000..92051dc3ca
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v31x/add_smtp_ssl_context_config_options.php
@@ -0,0 +1,32 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\db\migration\data\v31x;
+
+class add_smtp_ssl_context_config_options extends \phpbb\db\migration\migration
+{
+ static public function depends_on()
+ {
+ return array('\phpbb\db\migration\data\v31x\v3110');
+ }
+
+ public function update_data()
+ {
+ return array(
+ // See http://php.net/manual/en/context.ssl.php
+ array('config.add', array('smtp_verify_peer', 1)),
+ array('config.add', array('smtp_verify_peer_name', 1)),
+ array('config.add', array('smtp_allow_self_signed', 0)),
+ );
+ }
+}