github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-21 22:03:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Minor fixes (#669)

Browse source 
* Minor fixes

* Moved ssl_type to smtp section
This commit is contained in:
Roman Kelesidis 2023-04-02 15:19:19 +07:00 • committed by GitHub
commit 170363be82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
composer.json
View file

@ -30,7 +30,7 @@
"forum": "https://torrentpier.com" "forum": "https://torrentpier.com"
}, },
"require": { "require": {
"php": "^7.4|^8.0", "php": "^7.4 || ^8.0",
"bugsnag/bugsnag": "v3.29.0", "bugsnag/bugsnag": "v3.29.0",
"egulias/email-validator": "^3.2", "egulias/email-validator": "^3.2",
"filp/whoops": "^2.15", "filp/whoops": "^2.15",

4
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "8661b3ef2a2e691d686c71bf3d2ea69b", "content-hash": "f76b0749814071fa08e34466d6606682",
"packages": [ "packages": [
{ {
"name": "bugsnag/bugsnag", "name": "bugsnag/bugsnag",
@ -2375,7 +2375,7 @@
"prefer-stable": true, "prefer-stable": true,
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {
"php": "^7.4|^8.0" "php": "^7.4 || ^8.0"
}, },
"platform-dev": [], "platform-dev": [],
"plugin-api-version": "2.2.0" "plugin-api-version": "2.2.0"

4
library/config.php
View file

@ -381,8 +381,8 @@ $bb_cfg['emailer'] = [
'port' => 25, // SMTP server port 'port' => 25, // SMTP server port
'username' => '', // SMTP username (if server requires it) 'username' => '', // SMTP username (if server requires it)
'password' => '', // SMTP password (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 $bb_cfg['extended_email_validation'] = true; // DNS & RFC checks for entered email addresses
@ -572,7 +572,7 @@ $bb_cfg['group_avatars'] = [
// Captcha // Captcha
// Get a Google reCAPTCHA API Key: https://www.google.com/recaptcha/admin // Get a Google reCAPTCHA API Key: https://www.google.com/recaptcha/admin
$bb_cfg['captcha'] = [ $bb_cfg['captcha'] = [
'disabled' => false, 'disabled' => true,
'public_key' => '', // your public key 'public_key' => '', // your public key
'secret_key' => '', // your secret key 'secret_key' => '', // your secret key
'theme' => 'light', // light or dark 'theme' => 'light', // light or dark

4
src/Emailer.php
View file

@ -141,7 +141,7 @@ class Emailer
/** Prepare message */ /** Prepare message */
if ($bb_cfg['emailer']['smtp']['enabled']) { if ($bb_cfg['emailer']['smtp']['enabled']) {
if (!empty($bb_cfg['emailer']['smtp']['host'])) { 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 */ /** @var EsmtpTransport $transport external SMTP without SSL */
$transport = (new EsmtpTransport( $transport = (new EsmtpTransport(
$bb_cfg['emailer']['smtp']['host'], $bb_cfg['emailer']['smtp']['host'],
@ -154,7 +154,7 @@ class Emailer
$transport = (new EsmtpTransport( $transport = (new EsmtpTransport(
$bb_cfg['emailer']['smtp']['host'], $bb_cfg['emailer']['smtp']['host'],
$bb_cfg['emailer']['smtp']['port'], $bb_cfg['emailer']['smtp']['port'],
$bb_cfg['emailer']['ssl_type'] $bb_cfg['emailer']['smtp']['ssl_type']
)) ))
->setUsername($bb_cfg['emailer']['smtp']['username']) ->setUsername($bb_cfg['emailer']['smtp']['username'])
->setPassword($bb_cfg['emailer']['smtp']['password']); ->setPassword($bb_cfg['emailer']['smtp']['password']);