public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 15:25:59 +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

15
classes/digest.php
View File

@@ -11,8 +11,6 @@ class Digest
*/
static function send_headlines_digests($debug = false) {
require_once 'classes/ttrssmailer.php';
$user_limit = 15; // amount of users to process (e.g. emails to send out)
$limit = 1000; // maximum amount of headlines to include
@@ -56,11 +54,16 @@ class Digest
if ($headlines_count > 0) {
$mail = new ttrssMailer();
$mailer = new Mailer();
$rc = $mail->quickMail($line["email"], $line["login"], DIGEST_SUBJECT, $digest, $digest_text);
//$rc = $mail->quickMail($line["email"], $line["login"], DIGEST_SUBJECT, $digest, $digest_text);
if (!$rc && $debug) _debug("ERROR: " . $mail->ErrorInfo);
$rc = $mailer->mail(["to" => $line["login"] . " <" . $line["email"] . ">",
"subject" => DIGEST_SUBJECT,
"message" => $digest_text,
"message_html" => $digest]);
//if (!$rc && $debug) _debug("ERROR: " . $mailer->lastError());
if ($debug) _debug("RC=$rc");
@@ -198,4 +201,4 @@ class Digest
return array($tmp, $headlines_count, $affected_ids, $tmp_t);
}
}
}