add note plugin

4 files changed, 55 insertions, 44 deletions

diff --git a/classes/dlg.php b/classes/dlg.php
index 8b088bc4e..b0cfe4451 100644
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -883,32 +883,6 @@ class Dlg extends Protected_Handler {
 
 	}
 
-	function editArticleNote() {
-		$result = db_query($this->link, "SELECT note FROM ttrss_user_entries WHERE
-			ref_id = '$this->param' AND owner_uid = " . $_SESSION['uid']);
-
-		$note = db_fetch_result($result, 0, "note");
-
-		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"id\" value=\"$this->param\">";
-		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"rpc\">";
-		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"setNote\">";
-
-		print "<table width='100%'><tr><td>";
-		print "<textarea dojoType=\"dijit.form.SimpleTextarea\"
-			style='font-size : 12px; width : 100%; height: 100px;'
-			placeHolder='body#ttrssMain { font-size : 14px; };'
-			name='note'>$note</textarea>";
-		print "</td></tr></table>";
-
-		print "<div class='dlgButtons'>";
-		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 "</div>";
-
-	}
-
 	function addInstance() {
 		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\"  name=\"op\" value=\"pref-instances\">";
 		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\"  name=\"method\" value=\"add\">";
diff --git a/classes/feeds.php b/classes/feeds.php
index 5d55f2f02..1b2eb70ee 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -706,11 +706,6 @@ class Feeds extends Protected_Handler {
 

 					//$note_escaped = htmlspecialchars($line['note'], ENT_QUOTES);

 

-					$reply['content'] .= "<img src=\"images/art-pub-note.png\"

-						style=\"cursor : pointer\" style=\"cursor : pointer\"

-						onclick=\"editArticleNote($id)\"

-						alt='PubNote' title='".__('Edit article note')."'>";

-

 					foreach ($button_plugins as $p) {

 						$reply['content'] .= $p->render($id, $line);

 					}

diff --git a/classes/note_button.php b/classes/note_button.php
new file mode 100644
index 000000000..794f17734
--- /dev/null
+++ b/classes/note_button.php
@@ -0,0 +1,55 @@
+<?php
+class Note_Button extends Plugin_Button {
+	function render($article_id) {
+		return "<img src=\"".theme_image($this->link, "images/art-pub-note.png")."\"
+				style=\"cursor : pointer\" style=\"cursor : pointer\"
+				onclick=\"editArticleNote($article_id)\"
+				class='tagsPic' title='".__('Edit article note')."'>";
+	}
+
+	function edit() {
+		$param = db_escape_string($_REQUEST['param']);
+
+		$result = db_query($this->link, "SELECT note FROM ttrss_user_entries WHERE
+			ref_id = '$param' AND owner_uid = " . $_SESSION['uid']);
+
+		$note = db_fetch_result($result, 0, "note");
+
+		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"id\" value=\"$param\">";
+		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"rpc\">";
+		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"buttonPlugin\">";
+		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"plugin\" value=\"note\">";
+		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"plugin_method\" value=\"setNote\">";
+
+		print "<table width='100%'><tr><td>";
+		print "<textarea dojoType=\"dijit.form.SimpleTextarea\"
+			style='font-size : 12px; width : 100%; height: 100px;'
+			placeHolder='body#ttrssMain { font-size : 14px; };'
+			name='note'>$note</textarea>";
+		print "</td></tr></table>";
+
+		print "<div class='dlgButtons'>";
+		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 "</div>";
+
+	}
+
+	function setNote() {
+		$id = db_escape_string($_REQUEST["id"]);
+		$note = trim(strip_tags(db_escape_string($_REQUEST["note"])));
+
+		db_query($this->link, "UPDATE ttrss_user_entries SET note = '$note'
+			WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+
+		$formatted_note = format_article_note($id, $note);
+
+		print json_encode(array("note" => $formatted_note,
+				"raw_length" => mb_strlen($note)));
+	}
+
+
+}
+?>
diff --git a/classes/rpc.php b/classes/rpc.php
index 55ea05da9..8145b0407 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -693,19 +693,6 @@ class RPC extends Protected_Handler {
 		}
 	}
 
-	function setNote() {
-		$id = db_escape_string($_REQUEST["id"]);
-		$note = trim(strip_tags(db_escape_string($_REQUEST["note"])));
-
-		db_query($this->link, "UPDATE ttrss_user_entries SET note = '$note'
-			WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]);
-
-		$formatted_note = format_article_note($id, $note);
-
-		print json_encode(array("note" => $formatted_note,
-				"raw_length" => mb_strlen($note)));
-	}
-
 	function genHash() {
 		$hash = sha1(uniqid(rand(), true));