mail plugin: fix blank From: header
This commit is contained in:
parent
40fe2d7382
commit
ea4e11032a
|
@ -44,8 +44,8 @@ class Mail extends Plugin {
|
||||||
|
|
||||||
if (!$user_name) $user_name = $_SESSION['name'];
|
if (!$user_name) $user_name = $_SESSION['name'];
|
||||||
|
|
||||||
$_SESSION['email_replyto'] = $user_email;
|
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"from_email\" value=\"$user_email\">";
|
||||||
$_SESSION['email_fromname'] = $user_name;
|
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"from_name\" value=\"$user_name\">";
|
||||||
|
|
||||||
require_once "lib/MiniTemplator.class.php";
|
require_once "lib/MiniTemplator.class.php";
|
||||||
|
|
||||||
|
@ -134,15 +134,10 @@ class Mail extends Plugin {
|
||||||
|
|
||||||
$reply = array();
|
$reply = array();
|
||||||
|
|
||||||
$_SESSION['email_secretkey'] = '';
|
|
||||||
|
|
||||||
$replyto = strip_tags($_SESSION['email_replyto']);
|
|
||||||
$fromname = strip_tags($_SESSION['email_fromname']);
|
|
||||||
|
|
||||||
$mail = new ttrssMailer();
|
$mail = new ttrssMailer();
|
||||||
|
|
||||||
$mail->From = $replyto;
|
$mail->From = strip_tags($_REQUEST['from_email']);
|
||||||
$mail->FromName = $fromname;
|
$mail->FromName = strip_tags($_REQUEST['from_name']);
|
||||||
$mail->AddAddress($_REQUEST['destination']);
|
$mail->AddAddress($_REQUEST['destination']);
|
||||||
|
|
||||||
$mail->IsHTML(false);
|
$mail->IsHTML(false);
|
||||||
|
|
Loading…
Reference in New Issue