X-Git-Url: https://git.wh0rd.org/?p=tt-rss.git;a=blobdiff_plain;f=classes%2Fdigest.php;h=641fbe97f4b9b2a12c7257ebf301711363399a24;hp=75dda4984855884501c201ad8751555d15bdd970;hb=57932e183745bada9c6183056597cb5276f68d10;hpb=643d1919cc27a80aff424970b337e83be72720d1 diff --git a/classes/digest.php b/classes/digest.php index 75dda498..641fbe97 100644 --- a/classes/digest.php +++ b/classes/digest.php @@ -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); + $rc = $mailer->mail(["to" => $line["login"] . " <" . $line["email"] . ">", + "subject" => DIGEST_SUBJECT, + "message" => $digest_text, + "message_html" => $digest]); - if (!$rc && $debug) _debug("ERROR: " . $mail->ErrorInfo); + //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); } -} \ No newline at end of file +}