From 257efb43c6e32226280d8198acc946a2fc4c454f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 15 Feb 2021 15:52:28 +0300
Subject: article: unify naming

---
 plugins/note/init.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/note')

diff --git a/plugins/note/init.php b/plugins/note/init.php
index 3c2ca0075..d5b231190 100644
--- a/plugins/note/init.php
+++ b/plugins/note/init.php
@@ -65,7 +65,7 @@ class Note extends Plugin {
 			WHERE ref_id = ? AND owner_uid = ?");
 		$sth->execute([$note, $id, $_SESSION['uid']]);
 
-		$formatted_note = Article::format_article_note($id, $note);
+		$formatted_note = Article::_format_note_html($id, $note);
 
 		print json_encode(array("note" => $formatted_note,
 				"raw_length" => mb_strlen($note)));
-- 
cgit v1.2.3


From 1f43d7916cda16e9680b9087bda1f52934e8f25b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 16 Feb 2021 14:32:06 +0300
Subject: replace print_hidden with hidden_tag

---
 plugins/note/init.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'plugins/note')

diff --git a/plugins/note/init.php b/plugins/note/init.php
index d5b231190..0634d4c57 100644
--- a/plugins/note/init.php
+++ b/plugins/note/init.php
@@ -37,10 +37,10 @@ class Note extends Plugin {
 
 			$note = $row['note'];
 
-			print_hidden("id", "$param");
-			print_hidden("op", "pluginhandler");
-			print_hidden("method", "setNote");
-			print_hidden("plugin", "note");
+			print \Controls\hidden_tag("id", "$param");
+			print \Controls\hidden_tag("op", "pluginhandler");
+			print \Controls\hidden_tag("method", "setNote");
+			print \Controls\hidden_tag("plugin", "note");
 
 			print "<textarea dojoType='dijit.form.SimpleTextarea'
 				style='font-size : 12px; width : 98%; height: 100px;'
-- 
cgit v1.2.3


From 0fc783e2b350b8ac6ff275fd9b201674cbcf2c16 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 16 Feb 2021 22:07:37 +0300
Subject: cleanup markup in some plugins, make nsfw generate dijit widgets

---
 plugins/note/init.php | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'plugins/note')

diff --git a/plugins/note/init.php b/plugins/note/init.php
index 0634d4c57..12c56f7ad 100644
--- a/plugins/note/init.php
+++ b/plugins/note/init.php
@@ -42,19 +42,18 @@ class Note extends Plugin {
 			print \Controls\hidden_tag("method", "setNote");
 			print \Controls\hidden_tag("plugin", "note");
 
-			print "<textarea dojoType='dijit.form.SimpleTextarea'
+			?>
+			<textarea dojoType='dijit.form.SimpleTextarea'
 				style='font-size : 12px; width : 98%; height: 100px;'
-				name='note'>$note</textarea>";
-
+				name='note'><?= $note ?></textarea>
+			<?php
 		}
-
-		print "<footer class='text-center'>";
-		print "<button dojoType=\"dijit.form.Button\"
-			onclick=\"dijit.byId('editNoteDlg').execute()\">".__('Save')."</button> ";
-		print "<button dojoType=\"dijit.form.Button\"
-			onclick=\"dijit.byId('editNoteDlg').hide()\">".__('Cancel')."</button>";
-		print "</footer>";
-
+		?>
+		<footer class='text-center'>
+			<?= \Controls\submit_tag(__('Save')) ?>
+			<?= \Controls\cancel_dialog_tag(__('Cancel')) ?>
+		</footer>
+		<?php
 	}
 
 	function setNote() {
-- 
cgit v1.2.3


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/note/init.php |  6 +++---
 plugins/note/note.js  | 15 ++++++++++-----
 2 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'plugins/note')

diff --git a/plugins/note/init.php b/plugins/note/init.php
index 12c56f7ad..65e1f0eef 100644
--- a/plugins/note/init.php
+++ b/plugins/note/init.php
@@ -27,17 +27,17 @@ class Note extends Plugin {
 	}
 
 	function edit() {
-		$param = $_REQUEST['param'];
+		$id = clean($_REQUEST['id']);
 
 		$sth = $this->pdo->prepare("SELECT note FROM ttrss_user_entries WHERE
 			ref_id = ? AND owner_uid = ?");
-		$sth->execute([$param, $_SESSION['uid']]);
+		$sth->execute([$id, $_SESSION['uid']]);
 
 		if ($row = $sth->fetch()) {
 
 			$note = $row['note'];
 
-			print \Controls\hidden_tag("id", "$param");
+			print \Controls\hidden_tag("id", $id);
 			print \Controls\hidden_tag("op", "pluginhandler");
 			print \Controls\hidden_tag("method", "setNote");
 			print \Controls\hidden_tag("plugin", "note");
diff --git a/plugins/note/note.js b/plugins/note/note.js
index ab2ed9208..215058b21 100644
--- a/plugins/note/note.js
+++ b/plugins/note/note.js
@@ -1,11 +1,8 @@
-/* global Plugins, xhrJson, Notify, fox, __ */
+/* global dojo, xhrPost, Plugins, xhrJson, Notify, fox, __ */
 
 Plugins.Note = {
 	edit: function(id) {
-		const query = "backend.php?op=pluginhandler&plugin=note&method=edit&param=" + encodeURIComponent(id);
-
 		const dialog = new fox.SingleUseDialog({
-			id: "editNoteDlg",
 			title: __("Edit article note"),
 			execute: function () {
 				if (this.validate()) {
@@ -30,7 +27,15 @@ Plugins.Note = {
 					});
 				}
 			},
-			href: query,
+			content: __("Loading, please wait...")
+		});
+
+		const tmph = dojo.connect(dialog, 'onShow', function () {
+			dojo.disconnect(tmph);
+
+			xhrPost("backend.php", {op: "pluginhandler", plugin: "note", method: "edit", id: id}, (transport) => {
+				dialog.attr('content', transport.responseText);
+			});
 		});
 
 		dialog.show();
-- 
cgit v1.2.3


From e4609c18efceebb1e021d814f53061ada7f6489a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 17 Feb 2021 21:44:21 +0300
Subject:  * add (disabled) shortcut syntax for plugin methods  * add controls
 shortcut for pluginhandler tags  * add similar shortcut for frontend  * allow
 plugins to selectively exclude their methods from CSRF checking

---
 plugins/note/init.php | 4 +---
 plugins/note/note.js  | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'plugins/note')

diff --git a/plugins/note/init.php b/plugins/note/init.php
index 65e1f0eef..278cfe6c3 100644
--- a/plugins/note/init.php
+++ b/plugins/note/init.php
@@ -38,9 +38,7 @@ class Note extends Plugin {
 			$note = $row['note'];
 
 			print \Controls\hidden_tag("id", $id);
-			print \Controls\hidden_tag("op", "pluginhandler");
-			print \Controls\hidden_tag("method", "setNote");
-			print \Controls\hidden_tag("plugin", "note");
+			print \Controls\pluginhandler_tags($this, "setnote");
 
 			?>
 			<textarea dojoType='dijit.form.SimpleTextarea'
diff --git a/plugins/note/note.js b/plugins/note/note.js
index 215058b21..bc6c48156 100644
--- a/plugins/note/note.js
+++ b/plugins/note/note.js
@@ -33,7 +33,7 @@ Plugins.Note = {
 		const tmph = dojo.connect(dialog, 'onShow', function () {
 			dojo.disconnect(tmph);
 
-			xhrPost("backend.php", {op: "pluginhandler", plugin: "note", method: "edit", id: id}, (transport) => {
+			xhrPost("backend.php", App.getPhArgs("note", "edit", {id: id}), (transport) => {
 				dialog.attr('content', transport.responseText);
 			});
 		});
-- 
cgit v1.2.3


From 00310d2d23dd459c17b3f6e86a127de348b330f8 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 19 Feb 2021 06:58:50 +0300
Subject: cleanup some unused code, fix App.byId() invoked by wrong name

---
 plugins/note/note.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/note')

diff --git a/plugins/note/note.js b/plugins/note/note.js
index bc6c48156..d2d9c2b01 100644
--- a/plugins/note/note.js
+++ b/plugins/note/note.js
@@ -13,7 +13,7 @@ Plugins.Note = {
 						dialog.hide();
 
 						if (reply) {
-							const elem = $("POSTNOTE-" + id);
+							const elem = App.byId("POSTNOTE-" + id);
 
 							if (elem) {
 								elem.innerHTML = reply.note;
-- 
cgit v1.2.3


From 6b43b788d909ce20f07f29f9f3ccd2f6a8715616 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 19 Feb 2021 10:22:00 +0300
Subject: migrate xhrJson invocations to the new helper

---
 plugins/note/note.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/note')

diff --git a/plugins/note/note.js b/plugins/note/note.js
index d2d9c2b01..36bc426cd 100644
--- a/plugins/note/note.js
+++ b/plugins/note/note.js
@@ -8,7 +8,7 @@ Plugins.Note = {
 				if (this.validate()) {
 					Notify.progress("Saving article note...", true);
 
-					xhrJson("backend.php", this.attr('value'), (reply) => {
+					xhr.json("backend.php", this.attr('value'), (reply) => {
 						Notify.close();
 						dialog.hide();
 
-- 
cgit v1.2.3


From 660a1bbe011fef5f0fa6bb0af43521fed7598cc7 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 19 Feb 2021 13:44:56 +0300
Subject:  * switch to xhr.post() almost everywhere  * call App.handlerpcjson()
 automatically on json request (if possible)  * show net/log indicators in
 prefs

---
 plugins/note/note.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'plugins/note')

diff --git a/plugins/note/note.js b/plugins/note/note.js
index 36bc426cd..d42fca2c1 100644
--- a/plugins/note/note.js
+++ b/plugins/note/note.js
@@ -1,4 +1,4 @@
-/* global dojo, xhrPost, Plugins, xhrJson, Notify, fox, __ */
+/* global dojo, Plugins, xhr, App, Notify, fox, __ */
 
 Plugins.Note = {
 	edit: function(id) {
@@ -33,8 +33,8 @@ Plugins.Note = {
 		const tmph = dojo.connect(dialog, 'onShow', function () {
 			dojo.disconnect(tmph);
 
-			xhrPost("backend.php", App.getPhArgs("note", "edit", {id: id}), (transport) => {
-				dialog.attr('content', transport.responseText);
+			xhr.post("backend.php", App.getPhArgs("note", "edit", {id: id}), (reply) => {
+				dialog.attr('content', reply);
 			});
 		});
 
-- 
cgit v1.2.3


From d445530fa08cdbe2088150a3e7d23596eab9b142 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 19 Feb 2021 17:15:22 +0300
Subject: format note on the client

---
 plugins/note/init.php |  9 +++------
 plugins/note/note.js  | 14 ++++++--------
 2 files changed, 9 insertions(+), 14 deletions(-)

(limited to 'plugins/note')

diff --git a/plugins/note/init.php b/plugins/note/init.php
index 278cfe6c3..f4bdf45bc 100644
--- a/plugins/note/init.php
+++ b/plugins/note/init.php
@@ -55,17 +55,14 @@ class Note extends Plugin {
 	}
 
 	function setNote() {
-		$id = $_REQUEST["id"];
-		$note = trim(strip_tags($_REQUEST["note"]));
+		$id = (int)clean($_REQUEST["id"]);
+		$note = clean($_REQUEST["note"]);
 
 		$sth = $this->pdo->prepare("UPDATE ttrss_user_entries SET note = ?
 			WHERE ref_id = ? AND owner_uid = ?");
 		$sth->execute([$note, $id, $_SESSION['uid']]);
 
-		$formatted_note = Article::_format_note_html($id, $note);
-
-		print json_encode(array("note" => $formatted_note,
-				"raw_length" => mb_strlen($note)));
+		print json_encode(["id" => $id, "note" => $note]);
 	}
 
 	function api_version() {
diff --git a/plugins/note/note.js b/plugins/note/note.js
index d42fca2c1..a46acb355 100644
--- a/plugins/note/note.js
+++ b/plugins/note/note.js
@@ -13,16 +13,14 @@ Plugins.Note = {
 						dialog.hide();
 
 						if (reply) {
-							const elem = App.byId("POSTNOTE-" + id);
+							App.findAll(`div[data-note-for="${reply.id}"]`).forEach((elem) => {
+								elem.querySelector(".body").innerHTML = reply.note;
 
-							if (elem) {
-								elem.innerHTML = reply.note;
-
-								if (reply.raw_length != 0)
-									Element.show(elem);
+								if (reply.note)
+									elem.show();
 								else
-									Element.hide(elem);
-							}
+									elem.hide();
+							});
 						}
 					});
 				}
-- 
cgit v1.2.3


From 42173386b39bed4b06c5ac6c2fc0da510673b354 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 22 Feb 2021 17:38:46 +0300
Subject: dirname(__FILE__) -> __DIR__

---
 plugins/note/init.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/note')

diff --git a/plugins/note/init.php b/plugins/note/init.php
index f4bdf45bc..52f7be3eb 100644
--- a/plugins/note/init.php
+++ b/plugins/note/init.php
@@ -17,7 +17,7 @@ class Note extends Plugin {
 	}
 
 	function get_js() {
-		return file_get_contents(dirname(__FILE__) . "/note.js");
+		return file_get_contents(__DIR__ . "/note.js");
 	}
 
 
-- 
cgit v1.2.3