Additions:

[tt-rss.git] / plugins / mail / init.php

diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index 30a417a1b44104b2caa38f3b57e2580cb962c469..9d92781d70eda70cf30dd204033a5b1071cd4b09 100644 (file)
--- a/plugins/mail/init.php
+++ b/plugins/mail/init.php
@@ -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();