allow forwarding multiple articles by email
This commit is contained in:
parent
31a53903e6
commit
f72a7b6696
|
@ -4219,6 +4219,9 @@
|
|||
|
||||
}
|
||||
|
||||
print "<li onclick=\"emailArticle(false)\"> ".
|
||||
__('Forward by email')."</li>";
|
||||
|
||||
//print "<li><span class=\"insensitive\">--------</span></li>";
|
||||
print "<li class=\"insensitive\">".__('Assign label:')."</li>";
|
||||
|
||||
|
|
|
@ -681,6 +681,15 @@
|
|||
print "<input type=\"hidden\" name=\"op\" value=\"rpc\">";
|
||||
print "<input type=\"hidden\" name=\"subop\" value=\"sendEmail\">";
|
||||
|
||||
$result = db_query($link, "SELECT email FROM ttrss_users WHERE
|
||||
id = " . $_SESSION["uid"]);
|
||||
|
||||
$user_email = htmlspecialchars(db_fetch_result($result, 0, "email"));
|
||||
$user_name = htmlspecialchars($_SESSION["name"]);
|
||||
|
||||
$_SESSION['email_replyto'] = $user_email;
|
||||
$_SESSION['email_fromname'] = $user_name;
|
||||
|
||||
require_once "lib/MiniTemplator.class.php";
|
||||
|
||||
$tpl = new MiniTemplator;
|
||||
|
@ -688,39 +697,33 @@
|
|||
|
||||
$tpl->readTemplateFromFile("templates/email_article_template.txt");
|
||||
|
||||
$result = db_query($link, "SELECT link, content, title
|
||||
FROM ttrss_user_entries, ttrss_entries WHERE id = ref_id AND
|
||||
id = '$param' AND owner_uid = " . $_SESSION["uid"]);
|
||||
|
||||
$line = db_fetch_assoc($result);
|
||||
|
||||
$subject = htmlspecialchars(__("[Forwarded]") . " " . $line["title"]);
|
||||
|
||||
$tpl->setVariable('ARTICLE_TITLE', strip_tags($line["title"]));
|
||||
|
||||
/* $tpl->setVariable('ARTICLE_EXCERPT',
|
||||
truncate_string(strip_tags($line["content"]), 200)); */
|
||||
|
||||
$tpl->setVariable('ARTICLE_URL', strip_tags($line["link"]));
|
||||
|
||||
$result = db_query($link, "SELECT email FROM ttrss_users WHERE
|
||||
id = " . $_SESSION["uid"]);
|
||||
|
||||
$user_email = htmlspecialchars(db_fetch_result($result, 0, "email"));
|
||||
$user_name = htmlspecialchars($_SESSION["name"]);
|
||||
|
||||
//print "<input type=\"hidden\" name=\"replyto\" value=\"$user_email\">";
|
||||
//print "<input type=\"hidden\" name=\"fromname\" value=\"$user_name\">";
|
||||
|
||||
$_SESSION['email_replyto'] = $user_email;
|
||||
$_SESSION['email_fromname'] = $user_name;
|
||||
|
||||
$tpl->setVariable('USER_NAME', $_SESSION["name"]);
|
||||
$tpl->setVariable('USER_EMAIL', $user_email);
|
||||
$tpl->setVariable('TTRSS_HOST', $_SERVER["HTTP_HOST"]);
|
||||
|
||||
// $tpl->addBlock('header');
|
||||
|
||||
$result = db_query($link, "SELECT link, content, title
|
||||
FROM ttrss_user_entries, ttrss_entries WHERE id = ref_id AND
|
||||
id IN ($param) AND owner_uid = " . $_SESSION["uid"]);
|
||||
|
||||
if (db_num_rows($result) > 1) {
|
||||
$subject = __("[Forwarded]") . " " . __("Multiple articles");
|
||||
}
|
||||
|
||||
while ($line = db_fetch_assoc($result)) {
|
||||
|
||||
if (!$subject)
|
||||
$subject = __("[Forwarded]") . " " . htmlspecialchars($line["title"]);
|
||||
|
||||
$tpl->setVariable('ARTICLE_TITLE', strip_tags($line["title"]));
|
||||
$tpl->setVariable('ARTICLE_URL', strip_tags($line["link"]));
|
||||
|
||||
$tpl->addBlock('article');
|
||||
}
|
||||
|
||||
$tpl->addBlock('email');
|
||||
|
||||
|
||||
$content = "";
|
||||
$tpl->generateOutputToString($content);
|
||||
|
||||
|
|
|
@ -1,12 +1,11 @@
|
|||
<!-- $BeginBlock email -->
|
||||
Hi,
|
||||
|
||||
I've been reading this article and thought it might interest you:
|
||||
|
||||
${ARTICLE_TITLE}
|
||||
|
||||
${ARTICLE_URL}
|
||||
|
||||
I've been reading this and thought it might interest you:
|
||||
<!-- $BeginBlock article -->
|
||||
* ${ARTICLE_TITLE}
|
||||
${ARTICLE_URL}
|
||||
<!-- $EndBlock article -->
|
||||
Sincerely yours,
|
||||
${USER_NAME} <${USER_EMAIL}>.
|
||||
|
||||
|
|
13
viewfeed.js
13
viewfeed.js
|
@ -2265,6 +2265,17 @@ function publishWithNote(id, def_note) {
|
|||
|
||||
function emailArticle(id) {
|
||||
try {
|
||||
if (!id) {
|
||||
var ids = getSelectedArticleIds2();
|
||||
|
||||
if (ids.length == 0) {
|
||||
alert(__("No articles are selected."));
|
||||
return;
|
||||
}
|
||||
|
||||
id = ids.toString();
|
||||
}
|
||||
|
||||
displayDlg('emailArticle', id,
|
||||
function () {
|
||||
document.forms['article_email_form'].destination.focus();
|
||||
|
@ -2280,7 +2291,7 @@ function emailArticle(id) {
|
|||
}
|
||||
}
|
||||
|
||||
function emailArticleDo(id) {
|
||||
function emailArticleDo() {
|
||||
try {
|
||||
var f = document.forms['article_email_form'];
|
||||
|
||||
|
|
Loading…
Reference in New Issue