From 2b2833bb4fa6f958b89a83adea89d9e7c73daee7 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 17 Feb 2021 14:56:36 +0300
Subject: plugins: load dialogs via xhr instead of http

---
 plugins/mail/init.php | 35 ++++++++---------------------------
 plugins/mail/mail.js  | 19 ++++++++-----------
 2 files changed, 16 insertions(+), 38 deletions(-)

(limited to 'plugins/mail')

diff --git a/plugins/mail/init.php b/plugins/mail/init.php
index c054196df..8a0d01aca 100644
--- a/plugins/mail/init.php
+++ b/plugins/mail/init.php
@@ -19,7 +19,7 @@ class Mail extends Plugin {
 	}
 
 	function get_js() {
-		return file_get_contents(dirname(__FILE__) . "/mail.js");
+		return file_get_contents(__DIR__ . "/mail.js");
 	}
 
 	function hook_headline_toolbar_select_menu_item($feed_id, $is_cat) {
@@ -83,9 +83,11 @@ class Mail extends Plugin {
 
 	function emailArticle() {
 
-		$ids = explode(",", $_REQUEST['param']);
+		$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");
@@ -156,15 +158,8 @@ class Mail extends Plugin {
 
 		print "</td><td>";
 
-/*		print "<input dojoType=\"dijit.form.ValidationTextBox\" required=\"true\"
-				style=\"width : 30em;\"
-				name=\"destination\" id=\"emailArticleDlg_destination\">"; */
-
 		print \Controls\select_tag("destination", "", $addresslist,
-									["style" => "width: 30em", "dojoType" => "dijit.form.ComboBox"]);
-
-/*		print "<div class=\"autocomplete\" id=\"emailArticleDlg_dst_choices\"
-	style=\"z-index: 30; display : none\"></div>"; */
+									["style" => "width: 30em", "required" => 1, "dojoType" => "dijit.form.ComboBox"]);
 
 		print "</td></tr><tr><td>";
 
@@ -184,11 +179,11 @@ class Mail extends Plugin {
 		print "</td></tr></table>";
 
 		print "<footer>";
-		print "<button dojoType='dijit.form.Button' onclick=\"dijit.byId('emailArticleDlg').execute()\">".__('Send e-mail')."</button> ";
-		print "<button dojoType='dijit.form.Button' onclick=\"dijit.byId('emailArticleDlg').hide()\">".__('Cancel')."</button>";
+		print \Controls\submit_tag(__('Send email'));
+		print \Controls\cancel_dialog_tag(__('Cancel'));
 		print "</footer>";
 
-		//return;
+		print "</form>";
 	}
 
 	function sendEmail() {
@@ -229,20 +224,6 @@ class Mail extends Plugin {
 		print json_encode($reply);
 	}
 
-	/* function completeEmails() {
-		$search = $_REQUEST["search"];
-
-		print "<ul>";
-
-		foreach ($_SESSION['stored_emails'] as $email) {
-			if (strpos($email, $search) !== false) {
-				print "<li>$email</li>";
-			}
-		}
-
-		print "</ul>";
-	} */
-
 	function api_version() {
 		return 2;
 	}
diff --git a/plugins/mail/mail.js b/plugins/mail/mail.js
index 5ddc0dc41..4cdf6999d 100644
--- a/plugins/mail/mail.js
+++ b/plugins/mail/mail.js
@@ -1,4 +1,4 @@
-/* global Plugins, Headlines, xhrJson, Notify, fox, __ */
+/* global Plugins, Headlines, dojo, xhrPost, xhrJson, Notify, fox, __ */
 
 Plugins.Mail = {
 	send: function(id) {
@@ -13,10 +13,7 @@ Plugins.Mail = {
 			id = ids.toString();
 		}
 
-		const query = "backend.php?op=pluginhandler&plugin=mail&method=emailArticle&param=" + encodeURIComponent(id);
-
 		const dialog = new fox.SingleUseDialog({
-			id: "emailArticleDlg",
 			title: __("Forward article by email"),
 			execute: function () {
 				if (this.validate()) {
@@ -35,16 +32,16 @@ Plugins.Mail = {
 					});
 				}
 			},
-			href: query
+			content: __("Loading, please wait...")
 		});
 
-		/* var tmph = dojo.connect(dialog, 'onLoad', function() {
-		dojo.disconnect(tmph);
+		const tmph = dojo.connect(dialog, 'onShow', function () {
+			dojo.disconnect(tmph);
 
-		   new Ajax.Autocompleter('emailArticleDlg_destination', 'emailArticleDlg_dst_choices',
-			   "backend.php?op=pluginhandler&plugin=mail&method=completeEmails",
-			   { tokens: '', paramName: "search" });
-		}); */
+			xhrPost("backend.php", {op: "pluginhandler", plugin: "mail", method: "emailArticle", ids: id}, (transport) => {
+				dialog.attr('content', transport.responseText);
+			});
+		});
 
 		dialog.show();
 	},
-- 
cgit v1.2.3-54-g00ecf