public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 10:15:55 +00:00
Code Issues Releases Wiki Activity

remove PHPMailer and related directives from config.php-dist; add pluggable Mailer class

Browse Source
This commit is contained in:
Andrew Dolgov
2018-11-22 14:45:14 +03:00
parent 643d1919cc
commit 57932e1837
62 changed files with 108 additions and 6758 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/mail/init.php
View File

@@ -183,13 +183,9 @@ class Mail extends Plugin {
}
function sendEmail() {
require_once 'classes/ttrssmailer.php';
$reply = array();
$mail = new ttrssMailer();
$mail->AddReplyTo(strip_tags($_REQUEST['from_email']),
/*$mail->AddReplyTo(strip_tags($_REQUEST['from_email']),
strip_tags($_REQUEST['from_name']));
//$mail->AddAddress($_REQUEST['destination']);
$addresses = explode(';', $_REQUEST['destination']);
@@ -200,10 +196,22 @@ class Mail extends Plugin {
$mail->Subject = $_REQUEST['subject'];
$mail->Body = $_REQUEST['content'];
$rc = $mail->Send();
$rc = $mail->Send(); */
$to = $_REQUEST["destination"];
$subject = strip_tags($_REQUEST["subject"]);
$message = strip_tags($_REQUEST["content"]);
$from = strip_tags($_REQUEST["from_email"]);
$mailer = new Mailer();
$mailer->mail(["to" => $to,
"headers" => ["Reply-To: $from"],
"subject" => $subject,
"message" => $message]);
if (!$rc) {
$reply['error'] = $mail->ErrorInfo;
$reply['error'] = $mailer->error();
} else {
//save_email_address($destination);
$reply['message'] = "UPDATE_COUNTERS";
@@ -230,4 +238,4 @@ class Mail extends Plugin {
return 2;
}
}
}