xle/tt-rss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/justauserx/Tiny-Tiny-RSS into justauserx-master

Browse Source
This commit is contained in:
Andrew Dolgov
2013-05-30 08:36:42 +04:00
parent 37f00f7fcc f766373271
commit 1f5e9d9ab0
32 changed files with 4502 additions and 2573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/mail/init.php
View File

@@ -50,13 +50,16 @@ class Mail extends Plugin {
$tpl = new MiniTemplator;
$tpl_t = new MiniTemplator;
$tpl->readTemplateFromFile("templates/email_article_template.txt");
$templ_name = "templates/email_article_template.txt";
if(file_exists("templates/my_email_article_template.txt"))
$templ_name = "templates/my_email_article_template.txt";
$tpl->readTemplateFromFile($templ_name);
$tpl->setVariable('USER_NAME', $_SESSION["name"], true);
$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"]);
@@ -70,6 +73,11 @@ class Mail extends Plugin {
$subject = __("[Forwarded]") . " " . htmlspecialchars($line["title"]);
$tpl->setVariable('ARTICLE_TITLE', strip_tags($line["title"]));
$tnote = strip_tags($line["note"]);
if( $tnote != ''){
$tpl->setVariable('ARTICLE_NOTE', $tnote, true);
$tpl->addBlock('note');
}
$tpl->setVariable('ARTICLE_URL', strip_tags($line["link"]));
$tpl->addBlock('article');
@@ -136,7 +144,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 = explode(';', $_REQUEST['destination']);
foreach($addresses as $nextaddr)
$mail->AddAddress($nextaddr);
$mail->IsHTML(false);
$mail->Subject = $_REQUEST['subject'];