summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mail/init.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index 80bc7d417..a7efcf273 100644
--- a/plugins/mail/init.php
+++ b/plugins/mail/init.php
@@ -56,7 +56,7 @@ class Mail extends Plugin {
$tpl->setVariable('USER_EMAIL', $user_email, true);
$tpl->setVariable('TTRSS_HOST', $_SERVER["HTTP_HOST"], true);
- $result = db_query("SELECT link, content, title
+ $result = db_query("SELECT link, content, title, note
FROM ttrss_user_entries, ttrss_entries WHERE id = ref_id AND
id IN ($param) AND owner_uid = " . $_SESSION["uid"]);
@@ -71,6 +71,7 @@ class Mail extends Plugin {
$tpl->setVariable('ARTICLE_TITLE', strip_tags($line["title"]));
$tpl->setVariable('ARTICLE_URL', strip_tags($line["link"]));
+ $tpl->setVariable('ARTICLE_NOTE', strip_tags($line["note"]));
$tpl->addBlock('article');
}
@@ -136,7 +137,10 @@ class Mail extends Plugin {
$mail->From = strip_tags($_REQUEST['from_email']);
$mail->FromName = strip_tags($_REQUEST['from_name']);
- $mail->AddAddress($_REQUEST['destination']);
+ //$mail->AddAddress($_REQUEST['destination']);
+ $addresses = preg_split('/;/', $_REQUEST['destination'],-1,PREG_SPLIT_NO_EMPTY);
+ foreach($addresses as $nextaddr)
+ $mail->AddAddress($nextaddr);
$mail->IsHTML(false);
$mail->Subject = $_REQUEST['subject'];