diff options
author | Andrew Dolgov <[email protected]> | 2021-02-17 15:53:00 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2021-02-17 15:53:00 +0300 |
commit | 2ac6508fe697ed5e95cc7bf73ffb9e2e0bf0d3fa (patch) | |
tree | d9e556aa7efecd891e04952e60b2e8254a2ec241 /plugins | |
parent | 7be1e3ed38baf8233b7f6733db3f57859c1b2086 (diff) |
mail, mailto: cleanup markup
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/mail/init.php | 150 | ||||
-rw-r--r-- | plugins/mailto/init.js | 2 | ||||
-rw-r--r-- | plugins/mailto/init.php | 33 |
3 files changed, 97 insertions, 88 deletions
diff --git a/plugins/mail/init.php b/plugins/mail/init.php index 8a0d01aca..bb576a4d9 100644 --- a/plugins/mail/init.php +++ b/plugins/mail/init.php @@ -37,42 +37,44 @@ class Mail extends Plugin { function hook_prefs_tab($args) { if ($args != "prefPrefs") return; - print "<div dojoType=\"dijit.layout.AccordionPane\" - title=\"<i class='material-icons'>mail</i> ".__('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); + $addresslist = $this->host->get($this, "addresslist"); + + ?> + + <div dojoType="dijit.layout.AccordionPane" + title="<i class='material-icons'>mail</i> <?= __('Mail plugin') ?>"> + + <form dojoType="dijit.form.Form"> + <?= \Controls\hidden_tag("op", "pluginhandler") ?> + <?= \Controls\hidden_tag("method", "save") ?> + <?= \Controls\hidden_tag("plugin", "mail") ?> + + <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>"; + </script> - print \Controls\hidden_tag("op", "pluginhandler"); - print \Controls\hidden_tag("method", "save"); - print \Controls\hidden_tag("plugin", "mail"); + <header><?= __("You can set predefined email addressed here (comma-separated list):") ?></header> - $addresslist = $this->host->get($this, "addresslist"); + <textarea dojoType="dijit.form.SimpleTextarea" style='font-size : 12px; width : 50%' rows="3" + name='addresslist'><?= $addresslist ?></textarea> - print "<textarea dojoType=\"dijit.form.SimpleTextarea\" style='font-size : 12px; width : 50%' rows=\"3\" - name='addresslist'>$addresslist</textarea>"; + <hr/> - print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\">". - __("Save")."</button>"; + <?= \Controls\submit_tag(__("Save")) ?> - print "</form>"; + </form> - print "</div>"; + </div> + <?php } function hook_article_button($line) { @@ -86,11 +88,6 @@ class Mail extends Plugin { $ids = explode(",", clean($_REQUEST['ids'])); $ids_qmarks = arr_qmarks($ids); - print "<form onsubmit=\"return false\">"; - - print \Controls\hidden_tag("op", "pluginhandler"); - print \Controls\hidden_tag("plugin", "mail"); - print \Controls\hidden_tag("method", "sendEmail"); $sth = $this->pdo->prepare("SELECT email, full_name FROM ttrss_users WHERE id = ?"); @@ -107,9 +104,6 @@ class Mail extends Plugin { if (!$user_name) $user_name = $_SESSION['name']; - print \Controls\hidden_tag("from_email", "$user_email"); - print \Controls\hidden_tag("from_name", "$user_name"); - $tpl = new Templator(); $tpl->readTemplateFromFile("email_article_template.txt"); @@ -150,40 +144,58 @@ class Mail extends Plugin { $content = ""; $tpl->generateOutputToString($content); - print "<table width='100%'><tr><td>"; - $addresslist = explode(",", $this->host->get($this, "addresslist")); - print __('To:'); - - print "</td><td>"; - - print \Controls\select_tag("destination", "", $addresslist, - ["style" => "width: 30em", "required" => 1, "dojoType" => "dijit.form.ComboBox"]); - - print "</td></tr><tr><td>"; - - print __('Subject:'); - - print "</td><td>"; - - print "<input dojoType='dijit.form.ValidationTextBox' required='true' - style='width : 30em;' name='subject' value=\"$subject\" id='subject'>"; - - print "</td></tr>"; - - print "<tr><td colspan='2'><textarea dojoType='dijit.form.SimpleTextarea' - style='height : 200px; font-size : 12px; width : 98%' rows=\"20\" - name='content'>$content</textarea>"; - - print "</td></tr></table>"; - - print "<footer>"; - print \Controls\submit_tag(__('Send email')); - print \Controls\cancel_dialog_tag(__('Cancel')); - print "</footer>"; - - print "</form>"; + ?> + + <form dojoType='dijit.form.Form'> + + <?= \Controls\hidden_tag("op", "pluginhandler") ?> + <?= \Controls\hidden_tag("plugin", "mail") ?> + <?= \Controls\hidden_tag("method", "sendEmail") ?> + + <?= \Controls\hidden_tag("from_email", "$user_email") ?> + <?= \Controls\hidden_tag("from_name", "$user_name") ?> + + <script type='dojo/method' event='onSubmit' args='evt'> + evt.preventDefault(); + if (this.validate()) { + xhrJson("backend.php", this.getValues(), (reply) => { + if (reply && reply.error) + Notify.error(reply.error); + else + this.hide(); + }); + } + </script> + + <section> + <fieldset class='narrow'> + <label><?= __('To:') ?></label> + <?= \Controls\select_tag("destination", "", $addresslist, + ["style" => "width: 380px", "required" => 1, "dojoType" => "dijit.form.ComboBox"]) ?> + </fieldset> + </section> + + <section> + <fieldset class='narrow'> + <label><?= __('Subject:') ?></label> + <input dojoType='dijit.form.ValidationTextBox' required='true' + style='width : 380px' name='subject' value="<?= htmlspecialchars($subject) ?>" id='subject'> + </fieldset> + </section> + + <textarea dojoType='dijit.form.SimpleTextarea' + style='height : 200px; font-size : 12px; width : 98%' rows="20" + name='content'><?= $content ?></textarea> + + <footer> + <?= \Controls\submit_tag(__('Send email')) ?> + <?= \Controls\cancel_dialog_tag(__('Cancel')) ?> + </footer> + + </form> + <?php } function sendEmail() { diff --git a/plugins/mailto/init.js b/plugins/mailto/init.js index 4bf672a88..56afa1cca 100644 --- a/plugins/mailto/init.js +++ b/plugins/mailto/init.js @@ -14,7 +14,7 @@ Plugins.Mailto = { } const dialog = new fox.SingleUseDialog({ - title: __("Forward article by email"), + title: __("Forward article by email (mailto:)"), content: __("Loading, please wait...") }); diff --git a/plugins/mailto/init.php b/plugins/mailto/init.php index 4b858eae6..c34b400ce 100644 --- a/plugins/mailto/init.php +++ b/plugins/mailto/init.php @@ -16,7 +16,7 @@ class MailTo extends Plugin { } function hook_headline_toolbar_select_menu_item($feed_id, $is_cat) { - return "<div dojoType='dijit.MenuItem' onclick='Plugins.Mailto.send()'>".__('Forward by email')."</div>"; + return "<div dojoType='dijit.MenuItem' onclick='Plugins.Mailto.send()'>".__('Forward by email (mailto:)')."</div>"; } function get_js() { @@ -26,7 +26,7 @@ class MailTo extends Plugin { function hook_article_button($line) { return "<i class='material-icons' style=\"cursor : pointer\" onclick=\"Plugins.Mailto.send(".$line["id"].")\" - title='".__('Forward by email')."'>mail_outline</i>"; + title='".__('Forward by email (mailto:)')."'>mail_outline</i>"; } function emailArticle() { @@ -42,7 +42,6 @@ class MailTo extends Plugin { //$tpl->setVariable('USER_EMAIL', $user_email, true); $tpl->setVariable('TTRSS_HOST', $_SERVER["HTTP_HOST"], true); - $sth = $this->pdo->prepare("SELECT DISTINCT link, content, title FROM ttrss_user_entries, ttrss_entries WHERE id = ref_id AND id IN ($ids_qmarks) AND owner_uid = ?"); @@ -70,25 +69,23 @@ class MailTo extends Plugin { $content = ""; $tpl->generateOutputToString($content); - $mailto_link = htmlspecialchars("mailto:?subject=".rawurlencode($subject). - "&body=".rawurlencode($content)); - - print __("Clicking the following link to invoke your mail client:"); - - print "<div class='panel text-center'>"; - print "<a target=\"_blank\" href=\"$mailto_link\">". - __("Forward selected article(s) by email.")."</a>"; - print "</div>"; + $mailto_link = "mailto:?subject=".rawurlencode($subject)."&body=".rawurlencode($content); - print __("You should be able to edit the message before sending in your mail client."); + ?> - print "<p>"; + <section> + <div class='panel text-center'> + <a target="_blank" href="<?= htmlspecialchars($mailto_link) ?>"> + <?= __("Click to open your mail client") ?> + </a> + </div> + </section> - print "<footer class='text-center'>"; - print \Controls\submit_tag(__('Close this dialog')); - print "</footer>"; + <footer class='text-center'> + <?= \Controls\submit_tag(__('Close this dialog')) ?> + </footer> - //return; + <?php } function api_version() { |