diff --git a/composer.json b/composer.json index 46fcadef5..6fdb1ba65 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "forum": "https://torrentpier.com" }, "require": { - "php": "^7.4|^8.0", + "php": "^7.4 || ^8.0", "bugsnag/bugsnag": "v3.29.0", "egulias/email-validator": "^3.2", "filp/whoops": "^2.15", diff --git a/composer.lock b/composer.lock index 1154cfc01..1eac7658d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8661b3ef2a2e691d686c71bf3d2ea69b", + "content-hash": "f76b0749814071fa08e34466d6606682", "packages": [ { "name": "bugsnag/bugsnag", @@ -2375,7 +2375,7 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": "^7.4|^8.0" + "php": "^7.4 || ^8.0" }, "platform-dev": [], "plugin-api-version": "2.2.0" diff --git a/library/config.php b/library/config.php index 995ba3ca0..407a88a8e 100644 --- a/library/config.php +++ b/library/config.php @@ -381,8 +381,8 @@ $bb_cfg['emailer'] = [ 'port' => 25, // SMTP server port 'username' => '', // SMTP username (if server requires it) 'password' => '', // SMTP password (if server requires it) + 'ssl_type' => '', // SMTP ssl type (ssl or tls) ], - 'ssl_type' => '', // SMTP ssl type (ssl or tls) ]; $bb_cfg['extended_email_validation'] = true; // DNS & RFC checks for entered email addresses @@ -572,7 +572,7 @@ $bb_cfg['group_avatars'] = [ // Captcha // Get a Google reCAPTCHA API Key: https://www.google.com/recaptcha/admin $bb_cfg['captcha'] = [ - 'disabled' => false, + 'disabled' => true, 'public_key' => '', // your public key 'secret_key' => '', // your secret key 'theme' => 'light', // light or dark diff --git a/src/Emailer.php b/src/Emailer.php index 84c600034..1c92f1fdf 100644 --- a/src/Emailer.php +++ b/src/Emailer.php @@ -141,7 +141,7 @@ class Emailer /** Prepare message */ if ($bb_cfg['emailer']['smtp']['enabled']) { if (!empty($bb_cfg['emailer']['smtp']['host'])) { - if (empty($bb_cfg['emailer']['ssl_type'])) { + if (empty($bb_cfg['emailer']['smtp']['ssl_type'])) { /** @var EsmtpTransport $transport external SMTP without SSL */ $transport = (new EsmtpTransport( $bb_cfg['emailer']['smtp']['host'], @@ -154,7 +154,7 @@ class Emailer $transport = (new EsmtpTransport( $bb_cfg['emailer']['smtp']['host'], $bb_cfg['emailer']['smtp']['port'], - $bb_cfg['emailer']['ssl_type'] + $bb_cfg['emailer']['smtp']['ssl_type'] )) ->setUsername($bb_cfg['emailer']['smtp']['username']) ->setPassword($bb_cfg['emailer']['smtp']['password']);