public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2026-02-10 16:01:33 +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
register.php
+10 -13
View File
@@ -7,7 +7,6 @@
set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
get_include_path());
require_once 'classes/ttrssmailer.php';
require_once "autoload.php";
require_once "functions.php";
require_once "sessions.php";
@@ -308,15 +307,13 @@
"\n".
"If that wasn't you, just ignore this message. Thanks.";
$mail = new ttrssMailer();
$mail->IsHTML(false);
$rc = $mail->quickMail($email, "", "Registration information for Tiny Tiny RSS", $reg_text, false);
$mailer = new Mailer();
$rc = $mailer->mail(["to" => $email,
"subject" => "Registration information for Tiny Tiny RSS",
"message" => $reg_text]);
if (!$rc) print_error($mail->ErrorInfo);
if (!$rc) print_error($mailer->error());
unset($reg_text);
unset($mail);
unset($rc);
$reg_text = "Hi!\n".
"\n".
"New user had registered at your Tiny Tiny RSS installation.\n".
@@ -324,11 +321,12 @@
"Login: $login\n".
"Email: $email\n";
$mailer = new Mailer();
$rc = $mailer->mail(["to" => REG_NOTIFY_ADDRESS,
"subject" => "Registration notice for Tiny Tiny RSS",
"message" => $reg_text]);
$mail = new ttrssMailer();
$mail->IsHTML(false);
$rc = $mail->quickMail(REG_NOTIFY_ADDRESS, "", "Registration notice for Tiny Tiny RSS", $reg_text, false);
if (!$rc) print_error($mail->ErrorInfo);
if (!$rc) print_error($mailer->error());
print_notice(__("Account created successfully."));
@@ -364,4 +362,3 @@
</body>
</html>