diff --git a/README.md b/README.md
index d27ec746f..0aaa27f32 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ and go from there. The documentation will be translated into english in the near
* Apache / nginx
* MySQL 5.5.3 or above / MariaDB 10.0 or above / Percona
-* PHP: 7.1 / 7.2 / 7.3 / 7.4
+* PHP: 7.4 / 8.0 / 8.1 / 8.2
* PHP Extensions: bcmath, intl, tidy (optional), xml, xmlwriter
## Installation
diff --git a/admin/admin_mass_email.php b/admin/admin_mass_email.php
index 2338e57eb..311d5dfd5 100644
--- a/admin/admin_mass_email.php
+++ b/admin/admin_mass_email.php
@@ -20,9 +20,10 @@ if (!$bb_cfg['emailer']['enabled']) {
set_time_limit(1200);
-$subject = (string)trim(request_var('subject', ''));
+$subject = trim(request_var('subject', ''));
$message = (string)request_var('message', '');
$group_id = (int)request_var(POST_GROUPS_URL, 0);
+$reply_to = (string)request_var('reply_to', $bb_cfg['board_email']);
$message_type = (string)request_var('message_type', '');
$errors = $user_id_sql = [];
@@ -66,12 +67,12 @@ if (isset($_POST['submit'])) {
}
foreach ($user_list as $i => $row) {
- /** @var TorrentPier\Legacy\Emailer() $emailer */
- $emailer = new TorrentPier\Legacy\Emailer();
+ // Sending email
+ $emailer = new TorrentPier\Emailer();
- $emailer->set_from([$bb_cfg['board_email'] => $bb_cfg['sitename']]);
- $emailer->set_to([$row['user_email'] => $row['username']]);
+ $emailer->set_to($row['user_email'], $row['username']);
$emailer->set_subject($subject);
+ $emailer->set_reply($reply_to);
$emailer->set_template('admin_send_email');
$emailer->assign_vars(array(
@@ -101,6 +102,7 @@ foreach (DB()->fetch_rowset($sql) as $row) {
$template->assign_vars(array(
'MESSAGE' => $message,
'SUBJECT' => $subject,
+ 'REPLY_TO' => $reply_to,
'ERROR_MESSAGE' => $errors ? implode('ReCaptcha not being fully configured If you haven\'t already generated the keys, you can do it on https://www.google.com/recaptcha/admin .
';
// Sending email
+$lang['REPLY_TO'] = 'Reply to';
$lang['EMAILER_SUBJECT'] = [
'EMPTY' => 'No subject',
'GROUP_ADDED' => 'You have been added to the user group',
diff --git a/privmsg.php b/privmsg.php
index 234326a98..2c9889011 100644
--- a/privmsg.php
+++ b/privmsg.php
@@ -898,11 +898,10 @@ if ($mode == 'read') {
\TorrentPier\Legacy\Sessions::cache_rm_user_sessions($to_userdata['user_id']);
if (bf($to_userdata['user_opt'], 'user_opt', 'user_notify_pm') && $to_userdata['user_active'] && $bb_cfg['pm_notify_enabled']) {
- /** @var TorrentPier\Legacy\Emailer() $emailer */
- $emailer = new TorrentPier\Legacy\Emailer();
+ // Sending email
+ $emailer = new TorrentPier\Emailer();
- $emailer->set_from([$bb_cfg['board_email'] => $bb_cfg['sitename']]);
- $emailer->set_to([$to_userdata['user_email'] => $to_userdata['username']]);
+ $emailer->set_to($to_userdata['user_email'], $to_userdata['username']);
$emailer->set_subject($lang['EMAILER_SUBJECT']['PRIVMSG_NOTIFY']);
$emailer->set_template('privmsg_notify', $to_userdata['user_lang']);
diff --git a/src/Emailer.php b/src/Emailer.php
new file mode 100644
index 000000000..7fab43bf7
--- /dev/null
+++ b/src/Emailer.php
@@ -0,0 +1,215 @@
+subject = $subject;
+ }
+
+ /**
+ * Set recipient address
+ *
+ * @param string $email recipient address
+ * @param string $name recipient name
+ *
+ * @return void
+ */
+ public function set_to(string $email, string $name)
+ {
+ $this->to = new Address($email, $name);
+ }
+
+ /**
+ * Setting an address for the response
+ *
+ * @param string $email recipient address
+ *
+ * @return void
+ */
+ public function set_reply(string $email)
+ {
+ $this->reply = new Address($email);
+ }
+
+ /**
+ * Setting the message template
+ *
+ * @param string $template_file
+ * @param string $template_lang
+ *
+ * @return void
+ */
+ public function set_template(string $template_file, string $template_lang = '')
+ {
+ global $bb_cfg;
+
+ if (!$template_lang) {
+ $template_lang = $bb_cfg['default_lang'];
+ }
+
+ if (empty($this->tpl_msg[$template_lang . $template_file])) {
+ $tpl_file = LANG_ROOT_DIR . '/' . $template_lang . '/email/' . $template_file . '.html';
+
+ if (!file_exists($tpl_file)) {
+ $tpl_file = LANG_ROOT_DIR . '/' . $bb_cfg['default_lang'] . '/email/' . $template_file . '.html';
+
+ if (!file_exists($tpl_file)) {
+ bb_die('Could not find email template file: ' . $template_file);
+ }
+ }
+
+ if (!$fd = fopen($tpl_file, 'rb')) {
+ bb_die('Failed opening email template file: ' . $tpl_file);
+ }
+
+ $this->tpl_msg[$template_lang . $template_file] = fread($fd, filesize($tpl_file));
+ fclose($fd);
+ }
+
+ $this->message = $this->tpl_msg[$template_lang . $template_file];
+ }
+
+ /**
+ * Sending a message to recipients via Symfony Mailer
+ *
+ * @param string $email_format
+ *
+ * @return bool
+ */
+ public function send(string $email_format = 'text/plain'): bool
+ {
+ global $bb_cfg, $lang;
+
+ if (!$bb_cfg['emailer']['enabled']) {
+ return false;
+ }
+
+ /** Replace vars and prepare message */
+ $this->message = preg_replace('#\{([a-z0-9\-_]*?)}#is', "$\\1", $this->message);
+ foreach ($this->vars as $key => $val) {
+ $this->message = preg_replace(sprintf('/\$\{?%s\}?/', $key), $val, $this->message);
+ }
+ $this->message = trim($this->message);
+
+ /** Set some variables */
+ $this->subject = !empty($this->subject) ? $this->subject : $lang['EMAILER_SUBJECT']['EMPTY'];
+
+ /** Prepare message */
+ if ($bb_cfg['emailer']['smtp']['enabled']) {
+ if (!empty($bb_cfg['emailer']['smtp']['host'])) {
+ if (empty($bb_cfg['emailer']['ssl_type'])) {
+ /** @var EsmtpTransport $transport external SMTP without SSL */
+ $transport = (new EsmtpTransport(
+ $bb_cfg['emailer']['smtp']['host'],
+ $bb_cfg['emailer']['smtp']['port']
+ ))
+ ->setUsername($bb_cfg['emailer']['smtp']['username'])
+ ->setPassword($bb_cfg['emailer']['smtp']['password']);
+ } else {
+ /** @var EsmtpTransport $transport external SMTP with SSL */
+ $transport = (new EsmtpTransport(
+ $bb_cfg['emailer']['smtp']['host'],
+ $bb_cfg['emailer']['smtp']['port'],
+ $bb_cfg['emailer']['ssl_type']
+ ))
+ ->setUsername($bb_cfg['emailer']['smtp']['username'])
+ ->setPassword($bb_cfg['emailer']['smtp']['password']);
+ }
+ } else {
+ $transport = new EsmtpTransport('localhost', 25);
+ }
+ } else {
+ $transport = new SendmailTransport('/usr/sbin/sendmail -bs');
+ }
+
+ $mailer = new Mailer($transport);
+
+ /** @var Email $message */
+ $message = (new Email())
+ ->subject($this->subject)
+ ->to($this->to)
+ ->from(new Address($bb_cfg['board_email'], $bb_cfg['board_email_sitename']))
+ ->returnPath(new Address($bb_cfg['bounce_email']))
+ ->replyTo($this->reply ?? new Address($bb_cfg['board_email']));
+
+ /**
+ * This non-standard header tells compliant autoresponders ("email holiday mode") to not
+ * reply to this message because it's an automated email
+ */
+ $message->getHeaders()
+ ->addTextHeader('X-Auto-Response-Suppress', 'OOF, DR, RN, NRN, AutoReply');
+
+ if ($email_format == 'text/html') {
+ $message->html($this->message);
+ } else {
+ $message->text($this->message);
+ }
+
+ /** Send message */
+ try {
+ $mailer->send($message);
+ } catch (TransportExceptionInterface $e) {
+ bb_die('Failed sending email: ' . $e);
+ }
+
+ return true;
+ }
+
+ /**
+ * Set message template variables
+ *
+ * @param $vars
+ *
+ * @return void
+ */
+ public function assign_vars($vars)
+ {
+ global $bb_cfg;
+
+ $this->vars = array_merge([
+ 'BOARD_EMAIL' => $bb_cfg['board_email'],
+ 'SITENAME' => $bb_cfg['board_email_sitename'],
+ 'EMAIL_SIG' => !empty($bb_cfg['board_email_sig']) ? "-- \n{$bb_cfg['board_email_sig']}" : '',
+ ], $vars);
+ }
+}
diff --git a/src/Env.php b/src/Env.php
new file mode 100644
index 000000000..6d7d6d73e
--- /dev/null
+++ b/src/Env.php
@@ -0,0 +1,101 @@
+addAdapter(PutenvAdapter::class);
+ }
+
+ static::$repository = $builder->immutable()->make();
+ }
+
+ return static::$repository;
+ }
+
+ /**
+ * Gets the value of an environment variable.
+ *
+ * @param string $key
+ * @param mixed $default
+ * @return mixed
+ */
+ public static function get($key, $default = null)
+ {
+ return Option::fromValue(static::getRepository()->get($key))
+ ->map(function ($value) {
+ switch (strtolower($value)) {
+ case 'true':
+ case '(true)':
+ return true;
+ case 'false':
+ case '(false)':
+ return false;
+ case 'empty':
+ case '(empty)':
+ return '';
+ case 'null':
+ case '(null)':
+ return null;
+ }
+
+ if (preg_match('/\A([\'"])(.*)\1\z/', $value, $matches)) {
+ return $matches[2];
+ }
+
+ return $value;
+ })
+ ->getOrCall(fn () => value($default));
+ }
+}
diff --git a/src/Legacy/Ajax.php b/src/Legacy/Ajax.php
index 42a4d0aad..5d612d077 100644
--- a/src/Legacy/Ajax.php
+++ b/src/Legacy/Ajax.php
@@ -195,7 +195,7 @@ class Ajax
}
}
- $response_js = json_encode($this->response);
+ $response_js = json_encode($this->response, JSON_THROW_ON_ERROR);
if (GZIP_OUTPUT_ALLOWED && !\defined('NO_GZIP')) {
if (UA_GZIP_SUPPORTED && \strlen($response_js) > 2000) {
diff --git a/src/Legacy/Attach.php b/src/Legacy/Attach.php
index c4e93fbf4..b165a3173 100644
--- a/src/Legacy/Attach.php
+++ b/src/Legacy/Attach.php
@@ -247,7 +247,7 @@ class Attach
}
}
- $this->num_attachments = is_array($this->attachment_list) || $this->attachment_list instanceof \Countable ? \count($this->attachment_list) : 0;
+ $this->num_attachments = is_countable($this->attachment_list) ? \count($this->attachment_list) : 0;
if ($submit) {
if ($mode === 'newtopic' || $mode === 'reply' || $mode === 'editpost') {
@@ -315,7 +315,7 @@ class Attach
// restore values :)
if (isset($_POST['attachment_list'])) {
- for ($i = 0, $iMax = is_array($actual_list) || $actual_list instanceof \Countable ? \count($actual_list) : 0; $i < $iMax; $i++) {
+ for ($i = 0, $iMax = is_countable($actual_list) ? \count($actual_list) : 0; $i < $iMax; $i++) {
$restore = false;
$del_thumb = false;
@@ -383,7 +383,7 @@ class Attach
$this->attachment_comment_list = [];
- for ($i = 0, $iMax = is_array($this->attachment_list) || $this->attachment_list instanceof \Countable ? \count($this->attachment_list) : 0; $i < $iMax; $i++) {
+ for ($i = 0, $iMax = is_countable($this->attachment_list) ? \count($this->attachment_list) : 0; $i < $iMax; $i++) {
$this->attachment_comment_list[$i] = $actual_comment_list[$i];
}
}
@@ -405,7 +405,7 @@ class Attach
$attachment_id = 0;
$actual_element = 0;
- for ($i = 0, $iMax = is_array($actual_id_list) || $actual_id_list instanceof \Countable ? \count($actual_id_list) : 0; $i < $iMax; $i++) {
+ for ($i = 0, $iMax = is_countable($actual_id_list) ? \count($actual_id_list) : 0; $i < $iMax; $i++) {
if (isset($_POST['update_attachment'][$actual_id_list[$i]])) {
$attachment_id = (int)$actual_id_list[$i];
$actual_element = $i;
@@ -532,7 +532,7 @@ class Attach
}
if ($mode === 'attach_list') {
- for ($i = 0, $iMax = is_array($this->attachment_list) || $this->attachment_list instanceof \Countable ? \count($this->attachment_list) : 0; $i < $iMax; $i++) {
+ for ($i = 0, $iMax = is_countable($this->attachment_list) ? \count($this->attachment_list) : 0; $i < $iMax; $i++) {
if ($this->attachment_id_list[$i]) {
//bt
if ($this->attachment_extension_list[$i] === TORRENT_EXT && !\defined('TORRENT_ATTACH_ID')) {
@@ -659,7 +659,7 @@ class Attach
if ($this->attachment_list) {
$hidden = '';
- for ($i = 0, $iMax = is_array($this->attachment_list) || $this->attachment_list instanceof \Countable ? \count($this->attachment_list) : 0; $i < $iMax; $i++) {
+ for ($i = 0, $iMax = is_countable($this->attachment_list) ? \count($this->attachment_list) : 0; $i < $iMax; $i++) {
$hidden .= '{L_MASS_EMAIL}
{L_MASS_EMAIL_EXPLAIN}
-