public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2026-01-04 01:29:14 +00:00
Code Issues Releases Wiki Activity

Merge pull request #73 from derekmurawsky/dmChanges

Browse Source 
Centralized mail handling per post on google + community.
This commit is contained in:
Andrew Dolgov
2013-03-22 22:09:34 -07:00
parent 0d6ecb1f1c 1b2afd2bd3
commit 6ef8ec84cb
7 changed files with 91 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
plugins/mail/init.php
View File

@@ -137,7 +137,7 @@ class Mail extends Plugin {
function sendEmail() {
$secretkey = $_REQUEST['secretkey'];
require_once 'lib/phpmailer/class.phpmailer.php';
require_once 'classes/ttrssmailer.php';
$reply = array();
@@ -146,35 +146,18 @@ class Mail extends Plugin {
$_SESSION['email_secretkey'] = '';
$destination = $_REQUEST['destination'];
$subject = $_REQUEST['subject'];
$content = $_REQUEST['content'];
$replyto = strip_tags($_SESSION['email_replyto']);
$fromname = strip_tags($_SESSION['email_fromname']);
$mail = new PHPMailer();
$mail->PluginDir = "lib/phpmailer/";
$mail->SetLanguage("en", "lib/phpmailer/language/");
$mail->CharSet = "UTF-8";
$mail = new ttrssMailer();
$mail->From = $replyto;
$mail->FromName = $fromname;
$mail->AddAddress($destination);
if (SMTP_HOST) {
$mail->Host = SMTP_HOST;
$mail->Mailer = "smtp";
$mail->SMTPAuth = SMTP_LOGIN != '';
$mail->Username = SMTP_LOGIN;
$mail->Password = SMTP_PASSWORD;
}
$mail->AddAddress($_REQUEST['destination']);
$mail->IsHTML(false);
$mail->Subject = $subject;
$mail->Body = $content;
$mail->Subject = $_REQUEST['subject'];
$mail->Body = $_REQUEST['content'];
$rc = $mail->Send();