MrPetovan/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix errors in mailstream addon

Browse source
This commit is contained in:
Art4 2024-11-27 11:52:59 +00:00
parent 1346a92505
commit e488f597be
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mailstream/mailstream.php
View file

@ -378,7 +378,7 @@ function mailstream_send(string $message_id, array $item, array $user): bool
if (!$address) { if (!$address) {
$address = $user['email']; $address = $user['email'];
} }
$mail = new PHPmailer(); $mail = new PHPMailer();
try { try {
$mail->XMailer = 'Friendica Mailstream Addon'; $mail->XMailer = 'Friendica Mailstream Addon';
$mail->SetFrom($frommail, mailstream_sender($item)); $mail->SetFrom($frommail, mailstream_sender($item));

3
mailstream/phpmailer/class.phpmailer.php
View file

@ -1519,6 +1519,7 @@ class PHPMailer
public function getSMTPInstance() public function getSMTPInstance()
{ {
if (!is_object($this->smtp)) { if (!is_object($this->smtp)) {
/** @phpstan-ignore-next-line file class.smtp.php does not exist */
$this->smtp = new SMTP; $this->smtp = new SMTP;
} }
return $this->smtp; return $this->smtp;
@ -2705,7 +2706,7 @@ class PHPMailer
$file_buffer = $this->encodeString($file_buffer, $encoding); $file_buffer = $this->encodeString($file_buffer, $encoding);
if ($magic_quotes) { if ($magic_quotes) {
if (version_compare(PHP_VERSION, '5.3.0', '<')) { if (version_compare(PHP_VERSION, '5.3.0', '<')) {
set_magic_quotes_runtime($magic_quotes); //set_magic_quotes_runtime($magic_quotes);
} else { } else {
ini_set('magic_quotes_runtime', $magic_quotes); ini_set('magic_quotes_runtime', $magic_quotes);
} }