diff options
author | derekmurawsky <[email protected]> | 2013-03-22 16:25:12 -0400 |
---|---|---|
committer | derekmurawsky <[email protected]> | 2013-03-22 16:25:12 -0400 |
commit | 1b2afd2bd3dc19cdd36da47cc52040a83cdb3b68 (patch) | |
tree | 286d5b99c3a895d2f756fae5c17a55122ee7a7f0 /include/digest.php | |
parent | 9d9432dab87e3887e4f482ac5afff1586530c692 (diff) |
Additions:
classes/trssmailer.php - Created class TTRSS mailer which extends phpmailer and sets the default mail settings upon instantiation. Class includes quickmail function that allows for a quick email send with no extra configurion necessary.
Changes:
config.php-dist - Added the smtp port option
include/digest.php - Converted it to use the new ttrrssmailer class
include/sanity_config.php - Added the smtp port option to the sanity check
plugins/mail/init.php - Modified to use ttrssmailer class. This particular configuration shows a hybrid use case.
register.php = Modified to use ttrssmailer class.
All code was tested and functioned on my local machine.
Diffstat (limited to 'include/digest.php')
-rw-r--r-- | include/digest.php | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/include/digest.php b/include/digest.php index 93ce373a2..ab29d9432 100644 --- a/include/digest.php +++ b/include/digest.php @@ -8,7 +8,7 @@ */ function send_headlines_digests($link, $debug = false) { - require_once 'lib/phpmailer/class.phpmailer.php'; + 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 @@ -50,31 +50,9 @@ if ($headlines_count > 0) { - $mail = new PHPMailer(); + $mail = new ttrssMailer(); - $mail->PluginDir = "lib/phpmailer/"; - $mail->SetLanguage("en", "lib/phpmailer/language/"); - - $mail->CharSet = "UTF-8"; - - $mail->From = SMTP_FROM_ADDRESS; - $mail->FromName = SMTP_FROM_NAME; - $mail->AddAddress($line["email"], $line["login"]); - - if (SMTP_HOST) { - $mail->Host = SMTP_HOST; - $mail->Mailer = "smtp"; - $mail->SMTPAuth = SMTP_LOGIN != ''; - $mail->Username = SMTP_LOGIN; - $mail->Password = SMTP_PASSWORD; - } - - $mail->IsHTML(true); - $mail->Subject = DIGEST_SUBJECT; - $mail->Body = $digest; - $mail->AltBody = $digest_text; - - $rc = $mail->Send(); + $rc = $mail->quickMail($line["email"], $line["login"] , DIGEST_SUBJECT, $digest, $digest_text); if (!$rc && $debug) print "ERROR: " . $mail->ErrorInfo; |