From 57932e183745bada9c6183056597cb5276f68d10 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 22 Nov 2018 14:45:14 +0300 Subject: remove PHPMailer and related directives from config.php-dist; add pluggable Mailer class --- classes/pref/users.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'classes/pref/users.php') diff --git a/classes/pref/users.php b/classes/pref/users.php index ab8ac775b..ad48e7a72 100644 --- a/classes/pref/users.php +++ b/classes/pref/users.php @@ -287,8 +287,6 @@ class Pref_Users extends Handler_Protected { print_notice(T_sprintf("Sending new password of user %s to %s", $login, $email)); } - require_once 'classes/ttrssmailer.php'; - if ($email) { require_once "lib/MiniTemplator.class.php"; @@ -305,13 +303,13 @@ class Pref_Users extends Handler_Protected { $tpl->generateOutputToString($message); - $mail = new ttrssMailer(); + $mailer = new Mailer(); - $rc = $mail->quickMail($email, $login, - __("[tt-rss] Password change notification"), - $message, false); + $rc = $mailer->mail(["to" => "$login <$email>", + "subject" => __("[tt-rss] Password change notification"), + "message" => $message]); - if (!$rc) print_error($mail->ErrorInfo); + if (!$rc) print_error($mailer->error()); } } @@ -458,4 +456,4 @@ class Pref_Users extends Handler_Protected { print ""; #container } - } \ No newline at end of file + } -- cgit v1.2.3-54-g00ecf