mail plugin: use system from address

[tt-rss.git] / plugins / mail / init.php

diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index 3b1582081d885d82097a2eb630f90a88c1a97e25..21b58d73721b298c27d368705e1d62e10d9e98c1 100644 (file)
--- a/plugins/mail/init.php
+++ b/plugins/mail/init.php
@@ -13,12 +13,61 @@ class Mail extends Plugin {
                $this->host = $host;
 
                $host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
+               $host->add_hook($host::HOOK_PREFS_TAB, $this);
        }
 
        function get_js() {
                return file_get_contents(dirname(__FILE__) . "/mail.js");
        }
 
+       function save() {
+               $addresslist = db_escape_string($_POST["addresslist"]);
+
+               $this->host->set($this, "addresslist", $addresslist);
+
+               echo __("Mail addresses saved.");
+       }
+
+       function hook_prefs_tab($args) {
+               if ($args != "prefPrefs") return;
+
+               print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Mail plugin')."\">";
+
+               print "<p>" . __("You can set predefined email addressed here (comma-separated list):") . "</p>";
+
+               print "<form dojoType=\"dijit.form.Form\">";
+
+               print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
+                       evt.preventDefault();
+                       if (this.validate()) {
+                               console.log(dojo.objectToQuery(this.getValues()));
+                               new Ajax.Request('backend.php', {
+                                       parameters: dojo.objectToQuery(this.getValues()),
+                                       onComplete: function(transport) {
+                                               notify_info(transport.responseText);
+                                       }
+                               });
+                               //this.reset();
+                       }
+                       </script>";
+
+                       print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pluginhandler\">";
+                       print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"save\">";
+                       print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"plugin\" value=\"mail\">";
+
+                       $addresslist = $this->host->get($this, "addresslist");
+
+                       print "<textarea dojoType=\"dijit.form.SimpleTextarea\" style='font-size : 12px; width : 50%' rows=\"3\"
+                               name='addresslist'>$addresslist</textarea>";
+
+                       print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\">".
+                               __("Save")."</button>";
+
+                       print "</form>";
+
+               print "</div>";
+       }
+
        function hook_article_button($line) {
                return "<img src=\"plugins/mail/mail.png\"
                                        class='tagsPic' style=\"cursor : pointer\"
@@ -48,18 +97,14 @@ class Mail extends Plugin {
                require_once "lib/MiniTemplator.class.php";
 
                $tpl = new MiniTemplator;
-               $tpl_t = new MiniTemplator;
 
-               $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->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("SELECT link, content, title, note 
+               $result = db_query("SELECT DISTINCT link, content, title, note
                        FROM ttrss_user_entries, ttrss_entries WHERE id = ref_id AND
                        id IN ($param) AND owner_uid = " . $_SESSION["uid"]);
 
@@ -90,25 +135,20 @@ class Mail extends Plugin {
 
                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>";
+               $addresslist = explode(",", $this->host->get($this, "addresslist"));
 
                print __('To:');
 
                print "</td><td>";
 
-               print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"true\"
+/*             print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"true\"
                                style=\"width : 30em;\"
-                               name=\"destination\" id=\"emailArticleDlg_destination\">";
+                               name=\"destination\" id=\"emailArticleDlg_destination\">"; */
+
+               print_select("destination", "", $addresslist, 'style="width: 30em" dojoType="dijit.form.FilteringSelect"');
 
-               print "<div class=\"autocomplete\" id=\"emailArticleDlg_dst_choices\"
-                               style=\"z-index: 30; display : none\"></div>";
+/*             print "<div class=\"autocomplete\" id=\"emailArticleDlg_dst_choices\"
+       style=\"z-index: 30; display : none\"></div>"; */
 
                print "</td></tr><tr><td>";
 
@@ -142,8 +182,7 @@ class Mail extends Plugin {
 
                $mail = new ttrssMailer();
 
-               $mail->From = strip_tags($_REQUEST['from_email']);
-               $mail->FromName = strip_tags($_REQUEST['from_name']);
+               $mail->AddReplyTo(strip_tags($_REQUEST['from_email'], $_REQUEST['from_name']));
                //$mail->AddAddress($_REQUEST['destination']);
                $addresses = explode(';', $_REQUEST['destination']);
                foreach($addresses as $nextaddr)
@@ -158,14 +197,14 @@ class Mail extends Plugin {
                if (!$rc) {
                        $reply['error'] =  $mail->ErrorInfo;
                } else {
-                       save_email_address(db_escape_string($destination));
+                       //save_email_address(db_escape_string($destination));
                        $reply['message'] = "UPDATE_COUNTERS";
                }
 
                print json_encode($reply);
        }
 
-       function completeEmails() {
+       /* function completeEmails() {
                $search = db_escape_string($_REQUEST["search"]);
 
                print "<ul>";
@@ -177,7 +216,7 @@ class Mail extends Plugin {
                }
 
                print "</ul>";
-       }
+       } */
 
        function api_version() {
                return 2;