diff options
| author | rxu <rxu@mail.ru> | 2017-03-19 14:32:53 +0700 |
|---|---|---|
| committer | rxu <rxu@mail.ru> | 2017-03-19 14:32:53 +0700 |
| commit | 22b86324260dffe4907aac8e6cc9bb848568bcb9 (patch) | |
| tree | e226a95d8595092e42f58f5d18fc5252d6dded01 /phpBB/includes | |
| parent | 2cc9b6a857869a2ece283fc31d35729e13bd0f7f (diff) | |
| download | forums-22b86324260dffe4907aac8e6cc9bb848568bcb9.tar forums-22b86324260dffe4907aac8e6cc9bb848568bcb9.tar.gz forums-22b86324260dffe4907aac8e6cc9bb848568bcb9.tar.bz2 forums-22b86324260dffe4907aac8e6cc9bb848568bcb9.tar.xz forums-22b86324260dffe4907aac8e6cc9bb848568bcb9.zip | |
[ticket/13558] Change options prefix and add settings precautions.
PHPBB3-13558
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index b31799ef07..d9e30320af 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -454,9 +454,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), - 'ssl_verify_peer' => array('lang' => 'SSL_VERIFY_PEER', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'ssl_verify_peer_name' => array('lang' => 'SSL_VERIFY_PEER_NAME', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'ssl_allow_self_signed' => array('lang' => 'SSL_ALLOW_SELF_SIGNED', 'validate' => 'bool', 'type' => 'radio:yes_no', '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', ) diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 23a81ae3e8..a6e4cb0679 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -1048,9 +1048,9 @@ function smtpmail($addresses, $subject, $message, &$err_msg, $headers = false) $collector->install(); $options = array(); - $verify_peer = (bool) $config['ssl_verify_peer']; - $verify_peer_name = (bool) $config['ssl_verify_peer_name']; - $allow_self_signed = (bool) $config['ssl_allow_self_signed']; + $verify_peer = (bool) $config['smtp_verify_peer']; + $verify_peer_name = (bool) $config['smtp_verify_peer_name']; + $allow_self_signed = (bool) $config['smtp_allow_self_signed']; $remote_socket = $config['smtp_host'] . ':' . $config['smtp_port']; // Set ssl context options, see http://php.net/manual/en/context.ssl.php |