add mail and share plugins
This commit is contained in:
Andrew Dolgov
parent
8e70d965a8
commit
1baac2803c
144
classes/dlg.php
144
classes/dlg.php
|
|
@ -795,110 +795,6 @@ class Dlg extends Protected_Handler {
|
||||||
print "]]></content>";
|
print "]]></content>";
|
||||||
}
|
}
|
||||||
|
|
||||||
function emailArticle() {
|
|
||||||
|
|
||||||
$secretkey = sha1(uniqid(rand(), true));
|
|
||||||
|
|
||||||
$_SESSION['email_secretkey'] = $secretkey;
|
|
||||||
|
|
||||||
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"secretkey\" value=\"$secretkey\">";
|
|
||||||
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"rpc\">";
|
|
||||||
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"sendEmail\">";
|
|
||||||
|
|
||||||
$result = db_query($this->link, "SELECT email, full_name FROM ttrss_users WHERE
|
|
||||||
id = " . $_SESSION["uid"]);
|
|
||||||
|
|
||||||
$user_email = htmlspecialchars(db_fetch_result($result, 0, "email"));
|
|
||||||
$user_name = htmlspecialchars(db_fetch_result($result, 0, "full_name"));
|
|
||||||
|
|
||||||
if (!$user_name) $user_name = $_SESSION['name'];
|
|
||||||
|
|
||||||
$_SESSION['email_replyto'] = $user_email;
|
|
||||||
$_SESSION['email_fromname'] = $user_name;
|
|
||||||
|
|
||||||
require_once "lib/MiniTemplator.class.php";
|
|
||||||
|
|
||||||
$tpl = new MiniTemplator;
|
|
||||||
$tpl_t = new MiniTemplator;
|
|
||||||
|
|
||||||
$tpl->readTemplateFromFile("templates/email_article_template.txt");
|
|
||||||
|
|
||||||
$tpl->setVariable('USER_NAME', $_SESSION["name"]);
|
|
||||||
$tpl->setVariable('USER_EMAIL', $user_email);
|
|
||||||
$tpl->setVariable('TTRSS_HOST', $_SERVER["HTTP_HOST"]);
|
|
||||||
|
|
||||||
|
|
||||||
$result = db_query($this->link, "SELECT link, content, title
|
|
||||||
FROM ttrss_user_entries, ttrss_entries WHERE id = ref_id AND
|
|
||||||
id IN ($this->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);
|
|
||||||
|
|
||||||
print "<table width='100%'><tr><td>";
|
|
||||||
|
|
||||||
print __('From:');
|
|
||||||
|
|
||||||
print "</td><td>";
|
|
||||||
|
|
||||||
print "<input dojoType=\"dijit.form.TextBox\" disabled=\"1\" style=\"width : 30em;\"
|
|
||||||
value=\"$user_name <$user_email>\">";
|
|
||||||
|
|
||||||
print "</td></tr><tr><td>";
|
|
||||||
|
|
||||||
print __('To:');
|
|
||||||
|
|
||||||
print "</td><td>";
|
|
||||||
|
|
||||||
print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"true\"
|
|
||||||
style=\"width : 30em;\"
|
|
||||||
name=\"destination\" id=\"emailArticleDlg_destination\">";
|
|
||||||
|
|
||||||
print "<div class=\"autocomplete\" id=\"emailArticleDlg_dst_choices\"
|
|
||||||
style=\"z-index: 30; display : none\"></div>";
|
|
||||||
|
|
||||||
print "</td></tr><tr><td>";
|
|
||||||
|
|
||||||
print __('Subject:');
|
|
||||||
|
|
||||||
print "</td><td>";
|
|
||||||
|
|
||||||
print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"true\"
|
|
||||||
style=\"width : 30em;\"
|
|
||||||
name=\"subject\" value=\"$subject\" id=\"subject\">";
|
|
||||||
|
|
||||||
print "</td></tr>";
|
|
||||||
|
|
||||||
print "<tr><td colspan='2'><textarea dojoType=\"dijit.form.SimpleTextarea\" style='font-size : 12px; width : 100%' rows=\"20\"
|
|
||||||
name='content'>$content</textarea>";
|
|
||||||
|
|
||||||
print "</td></tr></table>";
|
|
||||||
|
|
||||||
print "<div class='dlgButtons'>";
|
|
||||||
print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('emailArticleDlg').execute()\">".__('Send e-mail')."</button> ";
|
|
||||||
print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('emailArticleDlg').hide()\">".__('Cancel')."</button>";
|
|
||||||
print "</div>";
|
|
||||||
|
|
||||||
//return;
|
|
||||||
}
|
|
||||||
|
|
||||||
function generatedFeed() {
|
function generatedFeed() {
|
||||||
|
|
||||||
print "<title>".__('View as RSS')."</title>";
|
print "<title>".__('View as RSS')."</title>";
|
||||||
|
|
@ -1063,45 +959,5 @@ class Dlg extends Protected_Handler {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
function shareArticle() {
|
|
||||||
$result = db_query($this->link, "SELECT uuid, ref_id FROM ttrss_user_entries WHERE int_id = '$this->param'
|
|
||||||
AND owner_uid = " . $_SESSION['uid']);
|
|
||||||
|
|
||||||
if (db_num_rows($result) == 0) {
|
|
||||||
print "Article not found.";
|
|
||||||
} else {
|
|
||||||
|
|
||||||
$uuid = db_fetch_result($result, 0, "uuid");
|
|
||||||
$ref_id = db_fetch_result($result, 0, "ref_id");
|
|
||||||
|
|
||||||
if (!$uuid) {
|
|
||||||
$uuid = db_escape_string(sha1(uniqid(rand(), true)));
|
|
||||||
db_query($this->link, "UPDATE ttrss_user_entries SET uuid = '$uuid' WHERE int_id = '$this->param'
|
|
||||||
AND owner_uid = " . $_SESSION['uid']);
|
|
||||||
}
|
|
||||||
|
|
||||||
print __("You can share this article by the following unique URL:");
|
|
||||||
|
|
||||||
$url_path = get_self_url_prefix();
|
|
||||||
$url_path .= "/public.php?op=share&key=$uuid";
|
|
||||||
|
|
||||||
print "<div class=\"tagCloudContainer\">";
|
|
||||||
print "<a id='pub_opml_url' href='$url_path' target='_blank'>$url_path</a>";
|
|
||||||
print "</div>";
|
|
||||||
|
|
||||||
/* if (!label_find_id($this->link, __('Shared'), $_SESSION["uid"]))
|
|
||||||
label_create($this->link, __('Shared'), $_SESSION["uid"]);
|
|
||||||
|
|
||||||
label_add_article($this->link, $ref_id, __('Shared'), $_SESSION['uid']); */
|
|
||||||
}
|
|
||||||
|
|
||||||
print "<div align='center'>";
|
|
||||||
|
|
||||||
print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('shareArticleDlg').hide()\">".
|
|
||||||
__('Close this window')."</button>";
|
|
||||||
|
|
||||||
print "</div>";
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|
|
||||||
|
|
@ -272,6 +272,18 @@ class Feeds extends Protected_Handler {
|
||||||
|
|
||||||
$headlines_count = db_num_rows($result);
|
$headlines_count = db_num_rows($result);
|
||||||
|
|
||||||
|
if (get_pref($this->link, 'COMBINED_DISPLAY_MODE')) {
|
||||||
|
$button_plugins = array();
|
||||||
|
foreach (explode(",", ARTICLE_BUTTON_PLUGINS) as $p) {
|
||||||
|
$pclass = trim("${p}_button");
|
||||||
|
|
||||||
|
if (class_exists($pclass)) {
|
||||||
|
$plugin = new $pclass($link);
|
||||||
|
array_push($button_plugins, $plugin);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (db_num_rows($result) > 0) {
|
if (db_num_rows($result) > 0) {
|
||||||
|
|
||||||
$lnum = $offset;
|
$lnum = $offset;
|
||||||
|
|
@ -699,27 +711,10 @@ class Feeds extends Protected_Handler {
|
||||||
onclick=\"editArticleNote($id)\"
|
onclick=\"editArticleNote($id)\"
|
||||||
alt='PubNote' title='".__('Edit article note')."'>";
|
alt='PubNote' title='".__('Edit article note')."'>";
|
||||||
|
|
||||||
$reply['content'] .= "<img src=\"".theme_image($this->link, 'images/art-email.png')."\"
|
|
||||||
style=\"cursor : pointer\"
|
|
||||||
onclick=\"emailArticle($id)\"
|
|
||||||
alt='Zoom' title='".__('Forward by email')."'>";
|
|
||||||
|
|
||||||
$button_plugins = explode(",", ARTICLE_BUTTON_PLUGINS);
|
|
||||||
|
|
||||||
foreach ($button_plugins as $p) {
|
foreach ($button_plugins as $p) {
|
||||||
$pclass = "${p}_button";
|
$reply['content'] .= $p->render($id, $line);
|
||||||
|
|
||||||
if (class_exists($pclass)) {
|
|
||||||
$plugin = new $pclass($link);
|
|
||||||
$rv['content'] .= $plugin->render($id);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$reply['content'] .= "<img src=\"".theme_image($this->link, 'images/art-share.png')."\"
|
|
||||||
class='tagsPic' style=\"cursor : pointer\"
|
|
||||||
onclick=\"shareArticle(".$line['int_id'].")\"
|
|
||||||
alt='Zoom' title='".__('Share by URL')."'>";
|
|
||||||
|
|
||||||
$reply['content'] .= "<img src=\"images/digest_checkbox.png\"
|
$reply['content'] .= "<img src=\"images/digest_checkbox.png\"
|
||||||
style=\"cursor : pointer\" style=\"cursor : pointer\"
|
style=\"cursor : pointer\" style=\"cursor : pointer\"
|
||||||
onclick=\"dismissArticle($id)\"
|
onclick=\"dismissArticle($id)\"
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,192 @@
|
||||||
|
<?php
|
||||||
|
class Mail_Button extends Plugin_Button {
|
||||||
|
function render($article_id) {
|
||||||
|
return "<img src=\"".theme_image($link, 'images/art-email.png')."\"
|
||||||
|
class='tagsPic' style=\"cursor : pointer\"
|
||||||
|
onclick=\"emailArticle($article_id)\"
|
||||||
|
alt='Zoom' title='".__('Forward by email')."'>";
|
||||||
|
}
|
||||||
|
|
||||||
|
function emailArticle() {
|
||||||
|
|
||||||
|
$param = db_escape_string($_REQUEST['param']);
|
||||||
|
|
||||||
|
$secretkey = sha1(uniqid(rand(), true));
|
||||||
|
|
||||||
|
$_SESSION['email_secretkey'] = $secretkey;
|
||||||
|
|
||||||
|
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"secretkey\" value=\"$secretkey\">";
|
||||||
|
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"rpc\">";
|
||||||
|
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"buttonPlugin\">";
|
||||||
|
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"plugin\" value=\"mail\">";
|
||||||
|
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"plugin_method\" value=\"sendEmail\">";
|
||||||
|
|
||||||
|
$result = db_query($this->link, "SELECT email, full_name FROM ttrss_users WHERE
|
||||||
|
id = " . $_SESSION["uid"]);
|
||||||
|
|
||||||
|
$user_email = htmlspecialchars(db_fetch_result($result, 0, "email"));
|
||||||
|
$user_name = htmlspecialchars(db_fetch_result($result, 0, "full_name"));
|
||||||
|
|
||||||
|
if (!$user_name) $user_name = $_SESSION['name'];
|
||||||
|
|
||||||
|
$_SESSION['email_replyto'] = $user_email;
|
||||||
|
$_SESSION['email_fromname'] = $user_name;
|
||||||
|
|
||||||
|
require_once "lib/MiniTemplator.class.php";
|
||||||
|
|
||||||
|
$tpl = new MiniTemplator;
|
||||||
|
$tpl_t = new MiniTemplator;
|
||||||
|
|
||||||
|
$tpl->readTemplateFromFile("templates/email_article_template.txt");
|
||||||
|
|
||||||
|
$tpl->setVariable('USER_NAME', $_SESSION["name"]);
|
||||||
|
$tpl->setVariable('USER_EMAIL', $user_email);
|
||||||
|
$tpl->setVariable('TTRSS_HOST', $_SERVER["HTTP_HOST"]);
|
||||||
|
|
||||||
|
|
||||||
|
$result = db_query($this->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);
|
||||||
|
|
||||||
|
print "<table width='100%'><tr><td>";
|
||||||
|
|
||||||
|
print __('From:');
|
||||||
|
|
||||||
|
print "</td><td>";
|
||||||
|
|
||||||
|
print "<input dojoType=\"dijit.form.TextBox\" disabled=\"1\" style=\"width : 30em;\"
|
||||||
|
value=\"$user_name <$user_email>\">";
|
||||||
|
|
||||||
|
print "</td></tr><tr><td>";
|
||||||
|
|
||||||
|
print __('To:');
|
||||||
|
|
||||||
|
print "</td><td>";
|
||||||
|
|
||||||
|
print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"true\"
|
||||||
|
style=\"width : 30em;\"
|
||||||
|
name=\"destination\" id=\"emailArticleDlg_destination\">";
|
||||||
|
|
||||||
|
print "<div class=\"autocomplete\" id=\"emailArticleDlg_dst_choices\"
|
||||||
|
style=\"z-index: 30; display : none\"></div>";
|
||||||
|
|
||||||
|
print "</td></tr><tr><td>";
|
||||||
|
|
||||||
|
print __('Subject:');
|
||||||
|
|
||||||
|
print "</td><td>";
|
||||||
|
|
||||||
|
print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"true\"
|
||||||
|
style=\"width : 30em;\"
|
||||||
|
name=\"subject\" value=\"$subject\" id=\"subject\">";
|
||||||
|
|
||||||
|
print "</td></tr>";
|
||||||
|
|
||||||
|
print "<tr><td colspan='2'><textarea dojoType=\"dijit.form.SimpleTextarea\" style='font-size : 12px; width : 100%' rows=\"20\"
|
||||||
|
name='content'>$content</textarea>";
|
||||||
|
|
||||||
|
print "</td></tr></table>";
|
||||||
|
|
||||||
|
print "<div class='dlgButtons'>";
|
||||||
|
print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('emailArticleDlg').execute()\">".__('Send e-mail')."</button> ";
|
||||||
|
print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('emailArticleDlg').hide()\">".__('Cancel')."</button>";
|
||||||
|
print "</div>";
|
||||||
|
|
||||||
|
//return;
|
||||||
|
}
|
||||||
|
|
||||||
|
function sendEmail() {
|
||||||
|
$secretkey = $_REQUEST['secretkey'];
|
||||||
|
|
||||||
|
require_once 'lib/phpmailer/class.phpmailer.php';
|
||||||
|
|
||||||
|
$reply = array();
|
||||||
|
|
||||||
|
if ($_SESSION['email_secretkey'] &&
|
||||||
|
$secretkey == $_SESSION['email_secretkey']) {
|
||||||
|
|
||||||
|
$_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->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->IsHTML(false);
|
||||||
|
$mail->Subject = $subject;
|
||||||
|
$mail->Body = $content;
|
||||||
|
|
||||||
|
$rc = $mail->Send();
|
||||||
|
|
||||||
|
if (!$rc) {
|
||||||
|
$reply['error'] = $mail->ErrorInfo;
|
||||||
|
} else {
|
||||||
|
save_email_address($this->link, db_escape_string($destination));
|
||||||
|
$reply['message'] = "UPDATE_COUNTERS";
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
$reply['error'] = "Not authorized.";
|
||||||
|
}
|
||||||
|
|
||||||
|
print json_encode($reply);
|
||||||
|
}
|
||||||
|
|
||||||
|
function completeEmails() {
|
||||||
|
$search = db_escape_string($_REQUEST["search"]);
|
||||||
|
|
||||||
|
print "<ul>";
|
||||||
|
|
||||||
|
foreach ($_SESSION['stored_emails'] as $email) {
|
||||||
|
if (strpos($email, $search) !== false) {
|
||||||
|
print "<li>$email</li>";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
print "</ul>";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
|
@ -563,78 +563,6 @@ class RPC extends Protected_Handler {
|
||||||
print json_encode(array("message" => "UPDATE_COUNTERS"));
|
print json_encode(array("message" => "UPDATE_COUNTERS"));
|
||||||
}
|
}
|
||||||
|
|
||||||
function sendEmail() {
|
|
||||||
$secretkey = $_REQUEST['secretkey'];
|
|
||||||
|
|
||||||
require_once 'lib/phpmailer/class.phpmailer.php';
|
|
||||||
|
|
||||||
$reply = array();
|
|
||||||
|
|
||||||
if ($_SESSION['email_secretkey'] &&
|
|
||||||
$secretkey == $_SESSION['email_secretkey']) {
|
|
||||||
|
|
||||||
$_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->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->IsHTML(false);
|
|
||||||
$mail->Subject = $subject;
|
|
||||||
$mail->Body = $content;
|
|
||||||
|
|
||||||
$rc = $mail->Send();
|
|
||||||
|
|
||||||
if (!$rc) {
|
|
||||||
$reply['error'] = $mail->ErrorInfo;
|
|
||||||
} else {
|
|
||||||
save_email_address($this->link, db_escape_string($destination));
|
|
||||||
$reply['message'] = "UPDATE_COUNTERS";
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
$reply['error'] = "Not authorized.";
|
|
||||||
}
|
|
||||||
|
|
||||||
print json_encode($reply);
|
|
||||||
}
|
|
||||||
|
|
||||||
function completeEmails() {
|
|
||||||
$search = db_escape_string($_REQUEST["search"]);
|
|
||||||
|
|
||||||
print "<ul>";
|
|
||||||
|
|
||||||
foreach ($_SESSION['stored_emails'] as $email) {
|
|
||||||
if (strpos($email, $search) !== false) {
|
|
||||||
print "<li>$email</li>";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
print "</ul>";
|
|
||||||
}
|
|
||||||
|
|
||||||
function quickAddCat() {
|
function quickAddCat() {
|
||||||
$cat = db_escape_string($_REQUEST["cat"]);
|
$cat = db_escape_string($_REQUEST["cat"]);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,54 @@
|
||||||
|
<?php
|
||||||
|
class Share_Button extends Plugin_Button {
|
||||||
|
function render($article_id, $line) {
|
||||||
|
return "<img src=\"".theme_image($this->link, 'images/art-share.png')."\"
|
||||||
|
class='tagsPic' style=\"cursor : pointer\"
|
||||||
|
onclick=\"shareArticle(".$line['int_id'].")\"
|
||||||
|
title='".__('Share by URL')."'>";
|
||||||
|
}
|
||||||
|
|
||||||
|
function shareArticle() {
|
||||||
|
$param = db_escape_string($_REQUEST['param']);
|
||||||
|
|
||||||
|
$result = db_query($this->link, "SELECT uuid, ref_id FROM ttrss_user_entries WHERE int_id = '$param'
|
||||||
|
AND owner_uid = " . $_SESSION['uid']);
|
||||||
|
|
||||||
|
if (db_num_rows($result) == 0) {
|
||||||
|
print "Article not found.";
|
||||||
|
} else {
|
||||||
|
|
||||||
|
$uuid = db_fetch_result($result, 0, "uuid");
|
||||||
|
$ref_id = db_fetch_result($result, 0, "ref_id");
|
||||||
|
|
||||||
|
if (!$uuid) {
|
||||||
|
$uuid = db_escape_string(sha1(uniqid(rand(), true)));
|
||||||
|
db_query($this->link, "UPDATE ttrss_user_entries SET uuid = '$uuid' WHERE int_id = '$param'
|
||||||
|
AND owner_uid = " . $_SESSION['uid']);
|
||||||
|
}
|
||||||
|
|
||||||
|
print __("You can share this article by the following unique URL:");
|
||||||
|
|
||||||
|
$url_path = get_self_url_prefix();
|
||||||
|
$url_path .= "/public.php?op=share&key=$uuid";
|
||||||
|
|
||||||
|
print "<div class=\"tagCloudContainer\">";
|
||||||
|
print "<a id='pub_opml_url' href='$url_path' target='_blank'>$url_path</a>";
|
||||||
|
print "</div>";
|
||||||
|
|
||||||
|
/* if (!label_find_id($this->link, __('Shared'), $_SESSION["uid"]))
|
||||||
|
label_create($this->link, __('Shared'), $_SESSION["uid"]);
|
||||||
|
|
||||||
|
label_add_article($this->link, $ref_id, __('Shared'), $_SESSION['uid']); */
|
||||||
|
}
|
||||||
|
|
||||||
|
print "<div align='center'>";
|
||||||
|
|
||||||
|
print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('shareArticleDlg').hide()\">".
|
||||||
|
__('Close this window')."</button>";
|
||||||
|
|
||||||
|
print "</div>";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
|
@ -200,10 +200,10 @@
|
||||||
// Displays an URL for users to provide feedback or comments regarding
|
// Displays an URL for users to provide feedback or comments regarding
|
||||||
// this instance of tt-rss. Can lead to a forum, contact email, etc.
|
// this instance of tt-rss. Can lead to a forum, contact email, etc.
|
||||||
|
|
||||||
define('ARTICLE_BUTTON_PLUGINS', 'tweet');
|
define('ARTICLE_BUTTON_PLUGINS', 'tweet,share,mail');
|
||||||
// Comma-separated list of additional article action button plugins
|
// Comma-separated list of additional article action button plugins
|
||||||
// to enable, like tweet button, etc.
|
// to enable, like tweet button, etc.
|
||||||
// The following plugins are available: tweet
|
// The following plugins are available: tweet, share, mail
|
||||||
|
|
||||||
define('CONFIG_VERSION', 24);
|
define('CONFIG_VERSION', 24);
|
||||||
// Expected config version. Please update this option in config.php
|
// Expected config version. Please update this option in config.php
|
||||||
|
|
|
||||||
|
|
@ -3284,27 +3284,17 @@
|
||||||
onclick=\"editArticleNote($id)\"
|
onclick=\"editArticleNote($id)\"
|
||||||
alt='PubNote' title='".__('Edit article note')."'>";
|
alt='PubNote' title='".__('Edit article note')."'>";
|
||||||
|
|
||||||
$rv['content'] .= "<img src=\"".theme_image($link, 'images/art-email.png')."\"
|
|
||||||
class='tagsPic' style=\"cursor : pointer\"
|
|
||||||
onclick=\"emailArticle($id)\"
|
|
||||||
alt='Zoom' title='".__('Forward by email')."'>";
|
|
||||||
|
|
||||||
$button_plugins = explode(",", ARTICLE_BUTTON_PLUGINS);
|
$button_plugins = explode(",", ARTICLE_BUTTON_PLUGINS);
|
||||||
|
|
||||||
foreach ($button_plugins as $p) {
|
foreach ($button_plugins as $p) {
|
||||||
$pclass = "${p}_button";
|
$pclass = trim("${p}_button");
|
||||||
|
|
||||||
if (class_exists($pclass)) {
|
if (class_exists($pclass)) {
|
||||||
$plugin = new $pclass($link);
|
$plugin = new $pclass($link);
|
||||||
$rv['content'] .= $plugin->render($id);
|
$rv['content'] .= $plugin->render($id, $line);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$rv['content'] .= "<img src=\"".theme_image($link, 'images/art-share.png')."\"
|
|
||||||
class='tagsPic' style=\"cursor : pointer\"
|
|
||||||
onclick=\"shareArticle(".$line['int_id'].")\"
|
|
||||||
alt='Zoom' title='".__('Share by URL')."'>";
|
|
||||||
|
|
||||||
$rv['content'] .= "<img src=\"".theme_image($link, 'images/digest_checkbox.png')."\"
|
$rv['content'] .= "<img src=\"".theme_image($link, 'images/digest_checkbox.png')."\"
|
||||||
class='tagsPic' style=\"cursor : pointer\"
|
class='tagsPic' style=\"cursor : pointer\"
|
||||||
onclick=\"closeArticlePanel($id)\"
|
onclick=\"closeArticlePanel($id)\"
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,6 @@
|
||||||
$jsf = "js/${p}_button.js";
|
$jsf = "js/${p}_button.js";
|
||||||
if (file_exists($jsf)) {
|
if (file_exists($jsf)) {
|
||||||
include $jsf;
|
include $jsf;
|
||||||
print "</script>";
|
|
||||||
}
|
}
|
||||||
} ?>
|
} ?>
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,61 @@
|
||||||
|
function emailArticle(id) {
|
||||||
|
try {
|
||||||
|
if (!id) {
|
||||||
|
var ids = getSelectedArticleIds2();
|
||||||
|
|
||||||
|
if (ids.length == 0) {
|
||||||
|
alert(__("No articles are selected."));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
id = ids.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (dijit.byId("emailArticleDlg"))
|
||||||
|
dijit.byId("emailArticleDlg").destroyRecursive();
|
||||||
|
|
||||||
|
var query = "backend.php?op=rpc&method=buttonPlugin&plugin=mail&plugin_method=emailArticle¶m=" + param_escape(id);
|
||||||
|
|
||||||
|
dialog = new dijit.Dialog({
|
||||||
|
id: "emailArticleDlg",
|
||||||
|
title: __("Forward article by email"),
|
||||||
|
style: "width: 600px",
|
||||||
|
execute: function() {
|
||||||
|
if (this.validate()) {
|
||||||
|
|
||||||
|
new Ajax.Request("backend.php", {
|
||||||
|
parameters: dojo.objectToQuery(this.attr('value')),
|
||||||
|
onComplete: function(transport) {
|
||||||
|
|
||||||
|
var reply = JSON.parse(transport.responseText);
|
||||||
|
|
||||||
|
var error = reply['error'];
|
||||||
|
|
||||||
|
if (error) {
|
||||||
|
alert(__('Error sending email:') + ' ' + error);
|
||||||
|
} else {
|
||||||
|
notify_info('Your message has been sent.');
|
||||||
|
dialog.hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
} });
|
||||||
|
}
|
||||||
|
},
|
||||||
|
href: query});
|
||||||
|
|
||||||
|
var tmph = dojo.connect(dialog, 'onLoad', function() {
|
||||||
|
dojo.disconnect(tmph);
|
||||||
|
|
||||||
|
new Ajax.Autocompleter('emailArticleDlg_destination', 'emailArticleDlg_dst_choices',
|
||||||
|
"backend.php?op=rpc&method=buttonPlugin&plugin=mail&plugin_method=completeEmails",
|
||||||
|
{ tokens: '', paramName: "search" });
|
||||||
|
});
|
||||||
|
|
||||||
|
dialog.show();
|
||||||
|
|
||||||
|
} catch (e) {
|
||||||
|
exception_error("emailArticle", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -0,0 +1,21 @@
|
||||||
|
function shareArticle(id) {
|
||||||
|
try {
|
||||||
|
if (dijit.byId("shareArticleDlg"))
|
||||||
|
dijit.byId("shareArticleDlg").destroyRecursive();
|
||||||
|
|
||||||
|
var query = "backend.php?op=rpc&method=buttonPlugin&plugin=share&plugin_method=shareArticle¶m=" + param_escape(id);
|
||||||
|
|
||||||
|
dialog = new dijit.Dialog({
|
||||||
|
id: "shareArticleDlg",
|
||||||
|
title: __("Share article by URL"),
|
||||||
|
style: "width: 600px",
|
||||||
|
href: query});
|
||||||
|
|
||||||
|
dialog.show();
|
||||||
|
|
||||||
|
} catch (e) {
|
||||||
|
exception_error("emailArticle", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1498,76 +1498,6 @@ function show_labels_in_headlines(transport) {
|
||||||
}
|
}
|
||||||
} */
|
} */
|
||||||
|
|
||||||
function emailArticle(id) {
|
|
||||||
try {
|
|
||||||
if (!id) {
|
|
||||||
var ids = getSelectedArticleIds2();
|
|
||||||
|
|
||||||
if (ids.length == 0) {
|
|
||||||
alert(__("No articles are selected."));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
id = ids.toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (dijit.byId("emailArticleDlg"))
|
|
||||||
dijit.byId("emailArticleDlg").destroyRecursive();
|
|
||||||
|
|
||||||
var query = "backend.php?op=dlg&method=emailArticle¶m=" + param_escape(id);
|
|
||||||
|
|
||||||
dialog = new dijit.Dialog({
|
|
||||||
id: "emailArticleDlg",
|
|
||||||
title: __("Forward article by email"),
|
|
||||||
style: "width: 600px",
|
|
||||||
execute: function() {
|
|
||||||
if (this.validate()) {
|
|
||||||
|
|
||||||
new Ajax.Request("backend.php", {
|
|
||||||
parameters: dojo.objectToQuery(this.attr('value')),
|
|
||||||
onComplete: function(transport) {
|
|
||||||
|
|
||||||
var reply = JSON.parse(transport.responseText);
|
|
||||||
|
|
||||||
var error = reply['error'];
|
|
||||||
|
|
||||||
if (error) {
|
|
||||||
alert(__('Error sending email:') + ' ' + error);
|
|
||||||
} else {
|
|
||||||
notify_info('Your message has been sent.');
|
|
||||||
dialog.hide();
|
|
||||||
}
|
|
||||||
|
|
||||||
} });
|
|
||||||
}
|
|
||||||
},
|
|
||||||
href: query});
|
|
||||||
|
|
||||||
var tmph = dojo.connect(dialog, 'onLoad', function() {
|
|
||||||
dojo.disconnect(tmph);
|
|
||||||
|
|
||||||
new Ajax.Autocompleter('emailArticleDlg_destination', 'emailArticleDlg_dst_choices',
|
|
||||||
"backend.php?op=rpc&method=completeEmails",
|
|
||||||
{ tokens: '', paramName: "search" });
|
|
||||||
});
|
|
||||||
|
|
||||||
dialog.show();
|
|
||||||
|
|
||||||
/* displayDlg('emailArticle', id,
|
|
||||||
function () {
|
|
||||||
document.forms['article_email_form'].destination.focus();
|
|
||||||
|
|
||||||
new Ajax.Autocompleter('destination', 'destination_choices',
|
|
||||||
"backend.php?op=rpc&method=completeEmails",
|
|
||||||
{ tokens: '', paramName: "search" });
|
|
||||||
|
|
||||||
}); */
|
|
||||||
|
|
||||||
} catch (e) {
|
|
||||||
exception_error("emailArticle", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function dismissArticle(id) {
|
function dismissArticle(id) {
|
||||||
try {
|
try {
|
||||||
var elem = $("RROW-" + id);
|
var elem = $("RROW-" + id);
|
||||||
|
|
@ -2191,24 +2121,4 @@ function precache_headlines() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function shareArticle(id) {
|
|
||||||
try {
|
|
||||||
if (dijit.byId("shareArticleDlg"))
|
|
||||||
dijit.byId("shareArticleDlg").destroyRecursive();
|
|
||||||
|
|
||||||
var query = "backend.php?op=dlg&method=shareArticle¶m=" + param_escape(id);
|
|
||||||
|
|
||||||
dialog = new dijit.Dialog({
|
|
||||||
id: "shareArticleDlg",
|
|
||||||
title: __("Share article by URL"),
|
|
||||||
style: "width: 600px",
|
|
||||||
href: query});
|
|
||||||
|
|
||||||
dialog.show();
|
|
||||||
|
|
||||||
} catch (e) {
|
|
||||||
exception_error("emailArticle", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue