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

This commit is contained in:
Andrew Dolgov 2014-07-02 10:38:59 +04:00
parent 18c1b21d28
commit 3e0f2090bf
3 changed files with 64 additions and 12 deletions

View File

@ -1747,7 +1747,7 @@
return $rv; return $rv;
} }
function save_email_address($email) { /* function save_email_address($email) {
// FIXME: implement persistent storage of emails // FIXME: implement persistent storage of emails
if (!$_SESSION['stored_emails']) if (!$_SESSION['stored_emails'])
@ -1755,7 +1755,7 @@
if (!in_array($email, $_SESSION['stored_emails'])) if (!in_array($email, $_SESSION['stored_emails']))
array_push($_SESSION['stored_emails'], $email); array_push($_SESSION['stored_emails'], $email);
} } */
function get_feed_access_key($feed_id, $is_cat, $owner_uid = false) { function get_feed_access_key($feed_id, $is_cat, $owner_uid = false) {

View File

@ -13,12 +13,61 @@ class Mail extends Plugin {
$this->host = $host; $this->host = $host;
$host->add_hook($host::HOOK_ARTICLE_BUTTON, $this); $host->add_hook($host::HOOK_ARTICLE_BUTTON, $this);
$host->add_hook($host::HOOK_PREFS_TAB, $this);
} }
function get_js() { function get_js() {
return file_get_contents(dirname(__FILE__) . "/mail.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) { function hook_article_button($line) {
return "<img src=\"plugins/mail/mail.png\" return "<img src=\"plugins/mail/mail.png\"
class='tagsPic' style=\"cursor : pointer\" class='tagsPic' style=\"cursor : pointer\"
@ -48,7 +97,6 @@ class Mail extends Plugin {
require_once "lib/MiniTemplator.class.php"; require_once "lib/MiniTemplator.class.php";
$tpl = new MiniTemplator; $tpl = new MiniTemplator;
$tpl_t = new MiniTemplator;
$tpl->readTemplateFromFile("templates/email_article_template.txt"); $tpl->readTemplateFromFile("templates/email_article_template.txt");
@ -96,16 +144,20 @@ class Mail extends Plugin {
print "</td></tr><tr><td>"; print "</td></tr><tr><td>";
$addresslist = explode(",", $this->host->get($this, "addresslist"));
print __('To:'); print __('To:');
print "</td><td>"; print "</td><td>";
print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"true\" /* print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"true\"
style=\"width : 30em;\" style=\"width : 30em;\"
name=\"destination\" id=\"emailArticleDlg_destination\">"; name=\"destination\" id=\"emailArticleDlg_destination\">"; */
print "<div class=\"autocomplete\" id=\"emailArticleDlg_dst_choices\" print_select("destination", "", $addresslist, 'dojoType="dijit.form.FilteringSelect"');
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>"; print "</td></tr><tr><td>";
@ -155,14 +207,14 @@ class Mail extends Plugin {
if (!$rc) { if (!$rc) {
$reply['error'] = $mail->ErrorInfo; $reply['error'] = $mail->ErrorInfo;
} else { } else {
save_email_address(db_escape_string($destination)); //save_email_address(db_escape_string($destination));
$reply['message'] = "UPDATE_COUNTERS"; $reply['message'] = "UPDATE_COUNTERS";
} }
print json_encode($reply); print json_encode($reply);
} }
function completeEmails() { /* function completeEmails() {
$search = db_escape_string($_REQUEST["search"]); $search = db_escape_string($_REQUEST["search"]);
print "<ul>"; print "<ul>";
@ -174,7 +226,7 @@ class Mail extends Plugin {
} }
print "</ul>"; print "</ul>";
} } */
function api_version() { function api_version() {
return 2; return 2;

View File

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