From 42b5564d1e4c06b18e37071459e04f6fcd36a85a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 15 Sep 2020 18:47:19 +0300
Subject: [PATCH] editarticletags: load dialog via XHR

---
 classes/article.php |  6 ----
 js/Article.js       | 75 +++++++++++++++++++++++----------------------
 2 files changed, 39 insertions(+), 42 deletions(-)

diff --git a/classes/article.php b/classes/article.php
index 9c664a8f6..42f98a489 100755
--- a/classes/article.php
+++ b/classes/article.php
@@ -1,12 +1,6 @@
 <?php
 class Article extends Handler_Protected {
 
-	function csrf_ignore($method) {
-		$csrf_ignored = array("editarticletags");
-
-		return array_search($method, $csrf_ignored) !== false;
-	}
-
 	function redirect() {
 		$id = clean($_REQUEST['id']);
 
diff --git a/js/Article.js b/js/Article.js
index 174015a61..1fc5bc9ab 100644
--- a/js/Article.js
+++ b/js/Article.js
@@ -257,53 +257,56 @@ const Article = {
 		return false;
 	},
 	editTags: function (id) {
-		const query = "backend.php?op=article&method=editArticleTags&param=" + encodeURIComponent(id);
-
 		if (dijit.byId("editTagsDlg"))
 			dijit.byId("editTagsDlg").destroyRecursive();
 
-		const dialog = new dijit.Dialog({
-			id: "editTagsDlg",
-			title: __("Edit article Tags"),
-			style: "width: 600px",
-			execute: function () {
-				if (this.validate()) {
-					Notify.progress("Saving article tags...", true);
+		xhrPost("backend.php", {op: "article", method: "editarticletags", param: id}, (transport) => {
 
-					xhrPost("backend.php", this.attr('value'), (transport) => {
-						try {
-							Notify.close();
-							dialog.hide();
+			const dialog = new dijit.Dialog({
+				id: "editTagsDlg",
+				title: __("Edit article Tags"),
+				style: "width: 600px",
+				content: transport.responseText,
+				execute: function () {
+					if (this.validate()) {
+						Notify.progress("Saving article tags...", true);
 
-							const data = JSON.parse(transport.responseText);
+						xhrPost("backend.php", this.attr('value'), (transport) => {
+							try {
+								Notify.close();
+								dialog.hide();
 
-							if (data) {
-								const id = data.id;
+								const data = JSON.parse(transport.responseText);
 
-								const tags = $("ATSTR-" + id);
-								const tooltip = dijit.byId("ATSTRTIP-" + id);
+								if (data) {
+									const id = data.id;
 
-								if (tags) tags.innerHTML = data.content;
-								if (tooltip) tooltip.attr('label', data.content_full);
+									const tags = $("ATSTR-" + id);
+									const tooltip = dijit.byId("ATSTRTIP-" + id);
+
+									if (tags) tags.innerHTML = data.content;
+									if (tooltip) tooltip.attr('label', data.content_full);
+								}
+							} catch (e) {
+								App.Error.report(e);
 							}
-						} catch (e) {
-							App.Error.report(e);
-						}
-					});
-				}
-			},
-			href: query
+						});
+					}
+				},
+			});
+
+			const tmph = dojo.connect(dialog, 'onLoad', function () {
+				dojo.disconnect(tmph);
+
+				new Ajax.Autocompleter('tags_str', 'tags_choices',
+					"backend.php?op=article&method=completeTags",
+					{tokens: ',', paramName: "search"});
+			});
+
+			dialog.show();
+
 		});
 
-		const tmph = dojo.connect(dialog, 'onLoad', function () {
-			dojo.disconnect(tmph);
-
-			new Ajax.Autocompleter('tags_str', 'tags_choices',
-				"backend.php?op=article&method=completeTags",
-				{tokens: ',', paramName: "search"});
-		});
-
-		dialog.show();
 	},
 	cdmMoveToId: function (id, params) {
 		params = params || {};