mail plugin: cleanup disabled completion, add configurable destination email list

diff --git a/include/functions2.php b/include/functions2.php
index 507c5343e46e0c3cca80106160cb000595cc885b..d6a399ffcdd9a1fd4db9a5c7740abfe9ceb4d00d 100644 (file)
--- a/include/functions2.php
+++ b/include/functions2.php
@@ -1747,7 +1747,7 @@
                return $rv;
        }
 
-       function save_email_address($email) {
+       /* function save_email_address($email) {
                // FIXME: implement persistent storage of emails
 
                if (!$_SESSION['stored_emails'])
@@ -1755,7 +1755,7 @@
 
                if (!in_array($email, $_SESSION['stored_emails']))
                        array_push($_SESSION['stored_emails'], $email);
-       }
+       } */
 
 
        function get_feed_access_key($feed_id, $is_cat, $owner_uid = false) {

diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index 5fcdf32af9a2f662bd10267be3fb64395d369183..b2d73d4ebbd35509006e821d6fe4f199f3828366 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,7 +97,6 @@ class Mail extends Plugin {
                require_once "lib/MiniTemplator.class.php";
 
                $tpl = new MiniTemplator;
-               $tpl_t = new MiniTemplator;
 
                $tpl->readTemplateFromFile("templates/email_article_template.txt");
 
@@ -96,16 +144,20 @@ class Mail extends Plugin {
 
                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 "<div class=\"autocomplete\" id=\"emailArticleDlg_dst_choices\"
-                               style=\"z-index: 30; display : none\"></div>";
+               print_select("destination", "", $addresslist, 'dojoType="dijit.form.FilteringSelect"');
+
+/*             print "<div class=\"autocomplete\" id=\"emailArticleDlg_dst_choices\"
+       style=\"z-index: 30; display : none\"></div>"; */
 
                print "</td></tr><tr><td>";
 
@@ -155,14 +207,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>";
@@ -174,7 +226,7 @@ class Mail extends Plugin {
                }
 
                print "</ul>";
-       }
+       } */
 
        function api_version() {
                return 2;

diff --git a/plugins/mail/mail.js b/plugins/mail/mail.js
index 6166f01c11f4266d0ef58c3a56d56a4a3d5bb8b0..db0503ff95774173256400e0885d549939c3b80d 100644 (file)
--- a/plugins/mail/mail.js
+++ b/plugins/mail/mail.js
@@ -44,13 +44,13 @@ function emailArticle(id) {
                        },
                        href: query});
 
-               var tmph = dojo.connect(dialog, 'onLoad', function() {
+               /* var tmph = dojo.connect(dialog, 'onLoad', function() {
                dojo.disconnect(tmph);
 
                   new Ajax.Autocompleter('emailArticleDlg_destination', 'emailArticleDlg_dst_choices',
                           "backend.php?op=pluginhandler&plugin=mail&method=completeEmails",
                           { tokens: '', paramName: "search" });
-               });
+               }); */
 
                dialog.show();