implement mail plugin using mailto: links; deprecate mail plugin

diff --git a/classes/feeds.php b/classes/feeds.php
index 4857cca78aa74bafc0e6d50b0543bd8662b290ee..5fa51768c5027761bd50600a7db99b28ffe8e39c 100644 (file)
--- a/classes/feeds.php
+++ b/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>";

diff --git a/js/tt-rss.js b/js/tt-rss.js
index 357e07780c0df0bea3c48e1d1a63477224d1da00..a8552d17373e57b0cccfda5ae53951a86c002985 100644 (file)
--- a/js/tt-rss.js
+++ b/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."));
                        }

diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index 2e972cf611c7a6ba318b01337b69e1241649d43c..0c8bc40aa88e9b24ec549319ccaef7f74a06bda1 100644 (file)
--- a/plugins/mail/init.php
+++ b/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

diff --git a/plugins/mailto/init.js b/plugins/mailto/init.js
new file mode 100644 (file)
index 0000000..8f7656a
--- /dev/null
+++ b/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);
+       }
+}
+
+

diff --git a/plugins/mailto/init.php b/plugins/mailto/init.php
new file mode 100644 (file)
index 0000000..bbc0dff
--- /dev/null
+++ b/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;
+       }
+
+}
+?>

diff --git a/plugins/mailto/mail.png b/plugins/mailto/mail.png
new file mode 100644 (file)
index 0000000..4d3fe77
Binary files /dev/null and b/plugins/mailto/mail.png differ

diff --git a/templates/email_article_template.txt b/templates/email_article_template.txt
index 0d151d18c2cd55101e92294aaa0f874720813f6b..5cf2b275055d573c342fcca4b6ece45ebb8b4f59 100644 (file)
--- a/templates/email_article_template.txt
+++ b/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}.