friendica/friendica-addons
9
4
Fork 16
Code Issues 3 Pull requests 4 Releases 16 Wiki Activity

[phpmailer] Add SMTP-Integration of PHPMailer addon #834

Merged
M-arcus merged 4 commits from addon/phpmailer into develop 2019-04-02 15:56:58 +02:00
Conversation 6 Commits 4 Files changed 59 +4 -7
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 9a39bcf15b - Show all commits

11
phpmailer/phpmailer.php
View file

@ -1,9 +1,4 @@
<?php
ini_set('display_errors', 1);
ini_set('display_startup_errors', 1);
error_reporting(E_ALL);
/**
* Name: PHP Mailer SMTP
* Description: Connects to a SMTP server based on the config
@ -62,12 +57,10 @@ function phpmailer_emailer_send_prepare(App $a, array &$b)
$mail->Host = $a->config['system']['smtp_server'];
$mail->Port = $a->config['system']['smtp_port'];
/*
if (!empty($a->config['system']['smtp_secure']) && (bool)$a->config['system']['smtp_secure'] !== '') {
$mail->SMTPSecure = $a->config['system']['smtp_secure'];
$mail->Port = $a->config['system']['smtp_port_s'];
}
*/
if (!empty($a->config['system']['smtp_username']) && !empty($a->config['system']['smtp_password'])) {
$mail->SMTPAuth = true;
@ -86,6 +79,10 @@ function phpmailer_emailer_send_prepare(App $a, array &$b)
// add text
$mail->AltBody = $b['textVersion'];
if (!empty($b['toEmail'])) {
$mail->addAddress($b['toEmail']);
}
// html version
if (!empty($b['htmlVersion'])) {
$mail->isHTML(true);