phpBB

Code Changes

File: includes/functions_messenger.php

  Unmodified   Added   Modified   Removed
Line 181Line 181
	/**
* Adds X-AntiAbuse headers
*

	/**
* Adds X-AntiAbuse headers
*

	* @param array $config		Configuration array
* @param user $user A user object
*
* @return null

	* @param \phpbb\config\config	$config		Config object
* @param \phpbb\user $user User object
* @return void


	*/
function anti_abuse_headers($config, $user)
{

	*/
function anti_abuse_headers($config, $user)
{

Line 1582Line 1581
	*/
protected function starttls()
{

	*/
protected function starttls()
{

 
		global $config;

// allow SMTPS (what was used by phpBB 3.0) if hostname is prefixed with tls:// or ssl://
if (strpos($config['smtp_host'], 'tls://') === 0 || strpos($config['smtp_host'], 'ssl://') === 0)
{
return true;
}


		if (!function_exists('stream_socket_enable_crypto'))
{
return false;

		if (!function_exists('stream_socket_enable_crypto'))
{
return false;

Line 1604Line 1611

if (socket_set_blocking($this->socket, 1))
{


if (socket_set_blocking($this->socket, 1))
{

			$result = stream_socket_enable_crypto($this->socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT);



			// https://secure.php.net/manual/en/function.stream-socket-enable-crypto.php#119122
$crypto = (phpbb_version_compare(PHP_VERSION, '5.6.7', '<')) ? STREAM_CRYPTO_METHOD_TLS_CLIENT : STREAM_CRYPTO_METHOD_SSLv23_CLIENT;
$result = stream_socket_enable_crypto($this->socket, true, $crypto);

			socket_set_blocking($this->socket, (int) $stream_meta['blocked']);
}


			socket_set_blocking($this->socket, (int) $stream_meta['blocked']);
}