Browse Source

implement mail plugin using mailto: links; deprecate mail plugin

Andrew Dolgov 7 years ago
parent
commit
1d5cf085a3

+ 5 - 0
classes/feeds.php

@@ -126,6 +126,11 @@ class Feeds extends Handler_Protected {
 				"</option>";
 		}
 
+		if ($pluginhost->get_plugin("mailto")) {
+			$reply .= "<option value=\"mailtoArticle(false)\">".__('Forward by email').
+				"</option>";
+		}
+
 		$reply .= "<option value=\"0\" disabled=\"1\">".__('Feed:')."</option>";
 
 		$reply .= "<option value=\"catchupPage()\">".__('Mark as read')."</option>";

+ 2 - 0
js/tt-rss.js

@@ -670,6 +670,8 @@ function hotkey_handler(e) {
 		case "email_article":
 			if (typeof emailArticle != "undefined") {
 				emailArticle();
+			} else if (typeof mailtoArticle != "undefined") {
+				mailtoArticle();
 			} else {
 				alert(__("Please enable mail plugin first."));
 			}

+ 4 - 5
plugins/mail/init.php

@@ -6,7 +6,7 @@ class Mail extends Plugin {
 
 	function about() {
 		return array(1.0,
-			"Share article via email",
+			"Share article via email (deprecated)",
 			"fox");
 	}
 
@@ -59,10 +59,9 @@ class Mail extends Plugin {
 
 		$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"]);
-
+		$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($this->link, "SELECT link, content, title
 			FROM ttrss_user_entries, ttrss_entries WHERE id = ref_id AND

+ 32 - 0
plugins/mailto/init.js

@@ -0,0 +1,32 @@
+function mailtoArticle(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=pluginhandler&plugin=mailto&method=emailArticle&param=" + param_escape(id);
+
+		dialog = new dijit.Dialog({
+			id: "emailArticleDlg",
+			title: __("Forward article by email"),
+			style: "width: 600px",
+			href: query});
+
+		dialog.show();
+
+	} catch (e) {
+		exception_error("emailArticle", e);
+	}
+}
+
+

+ 93 - 0
plugins/mailto/init.php

@@ -0,0 +1,93 @@
+<?php
+class MailTo extends Plugin {
+
+	private $link;
+	private $host;
+
+	function about() {
+		return array(1.0,
+			"Share article via email (using mailto: links, invoking your mail client)",
+			"fox");
+	}
+
+	function init($host) {
+		$this->link = $host->get_link();
+		$this->host = $host;
+
+		$host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
+	}
+
+	function get_js() {
+		return file_get_contents(dirname(__FILE__) . "/init.js");
+	}
+
+	function hook_article_button($line) {
+		return "<img src=\"".theme_image($link, 'plugins/mailto/mail.png')."\"
+					class='tagsPic' style=\"cursor : pointer\"
+					onclick=\"mailtoArticle(".$line["id"].")\"
+					alt='Zoom' title='".__('Forward by email')."'>";
+	}
+
+	function emailArticle() {
+
+		$param = db_escape_string($_REQUEST['param']);
+
+		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"], true);
+		$tpl->setVariable('USER_EMAIL', $user_email, true);
+		$tpl->setVariable('TTRSS_HOST', $_SERVER["HTTP_HOST"], true);
+
+
+		$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);
+
+		$mailto_link = htmlspecialchars("mailto: ?subject=".urlencode($subject).
+			"&body=".urlencode($content));
+
+		print __("Clicking the following link to invoke your mail client:");
+
+		print "<div class=\"tagCloudContainer\">";
+		print "<a target=\"_blank\" href=\"$mailto_link\">".
+			__("Forward selected article(s) by email.")."</a>";
+		print "</div>";
+
+		print __("You should be able to edit the message before sending in your mail client.");
+
+		print "<p>";
+
+		print "<div style='text-align : center'>";
+		print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('emailArticleDlg').hide()\">".__('Close this dialog')."</button>";
+		print "</div>";
+
+		//return;
+	}
+
+}
+?>

BIN
plugins/mailto/mail.png


+ 0 - 2
templates/email_article_template.txt

@@ -6,8 +6,6 @@ I've been reading this and thought it might interest you:
 * ${ARTICLE_TITLE}
   ${ARTICLE_URL}
 <!-- $EndBlock article -->
-Sincerely yours, 
-	${USER_NAME} <${USER_EMAIL}>.
 
 -- 
 This message has been sent by Tiny Tiny RSS installation at ${TTRSS_HOST}.