diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2017-03-19 18:07:14 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2017-03-19 18:07:14 +0100 |
| commit | 552da2e80575c7db28449fd292d6bfa9b8f4b036 (patch) | |
| tree | 6f5336c037f6985bf84ab0eebbce85e925f6ef77 /phpBB/includes/acp/acp_board.php | |
| parent | 67509edd4070b6a8158e1572241a96bc28c8d3c9 (diff) | |
| parent | 0b2369901a4a6f5eb4cbc45981a13a91a1532994 (diff) | |
| download | forums-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/includes/acp/acp_board.php')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 05a8b79137..a2644c0e37 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -459,6 +459,9 @@ class acp_board 'smtp_auth_method' => array('lang' => 'SMTP_AUTH_METHOD', 'validate' => 'string', 'type' => 'select', 'method' => 'mail_auth_select', 'explain' => true), 'smtp_username' => array('lang' => 'SMTP_USERNAME', 'validate' => 'string', 'type' => 'text:25:255', 'explain' => true), 'smtp_password' => array('lang' => 'SMTP_PASSWORD', 'validate' => 'string', 'type' => 'password:25:255', 'explain' => true), + 'smtp_verify_peer' => array('lang' => 'SMTP_VERIFY_PEER', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), + 'smtp_verify_peer_name' => array('lang' => 'SMTP_VERIFY_PEER_NAME', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), + 'smtp_allow_self_signed'=> array('lang' => 'SMTP_ALLOW_SELF_SIGNED','validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'legend3' => 'ACP_SUBMIT_CHANGES', ) |