X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=plugins%2Faf_psql_trgm%2Finit.php;h=fe5b1a959909ce54fc2c9c4583bbb3263c0584f1;hb=c10a43069ec1e71b6608574a81fb29c76919e132;hp=559a5a71c9b151bbfe18f5086f8ca364c35f7410;hpb=d806953471684c45b3ebe93de46fb4294f55ca49;p=tt-rss.git

diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php
index 559a5a71..fe5b1a95 100644
--- a/plugins/af_psql_trgm/init.php
+++ b/plugins/af_psql_trgm/init.php
@@ -1,6 +1,7 @@
 <?php
 class Af_Psql_Trgm extends Plugin {
 
+	/* @var PluginHost $host */
 	private $host;
 
 	function about() {
@@ -10,8 +11,9 @@ class Af_Psql_Trgm extends Plugin {
 	}
 
 	function save() {
-		$similarity = (float) db_escape_string($_POST["similarity"]);
-		$min_title_length = (int) db_escape_string($_POST["min_title_length"]);
+		$similarity = (float) $_POST["similarity"];
+		$min_title_length = (int) $_POST["min_title_length"];
+		$enable_globally = checkbox_to_sql_bool($_POST["enable_globally"]);
 
 		if ($similarity < 0) $similarity = 0;
 		if ($similarity > 1) $similarity = 1;
@@ -22,8 +24,9 @@ class Af_Psql_Trgm extends Plugin {
 
 		$this->host->set($this, "similarity", $similarity);
 		$this->host->set($this, "min_title_length", $min_title_length);
+		$this->host->set($this, "enable_globally", $enable_globally);
 
-		echo T_sprintf("Data saved (%s)", $similarity);
+		echo T_sprintf("Data saved (%s, %d)", $similarity, $enable_globally);
 	}
 
 	function init($host) {
@@ -42,18 +45,20 @@ class Af_Psql_Trgm extends Plugin {
 	}
 
 	function showrelated() {
-		$id = (int) db_escape_string($_REQUEST['param']);
+		$id = (int) $_REQUEST['param'];
 		$owner_uid = $_SESSION["uid"];
 
-		$result = db_query("SELECT title FROM ttrss_entries, ttrss_user_entries
-			WHERE ref_id = id AND id = $id AND owner_uid = $owner_uid");
+		$sth = $this->pdo->prepare("SELECT title FROM ttrss_entries, ttrss_user_entries
+			WHERE ref_id = id AND id = ? AND owner_uid = ?");
+		$sth->execute([$id, $owner_uid]);
 
-		$title = db_fetch_result($result, 0, "title");
+		if ($row = $sth->fetch()) {
 
-		print "<h2>$title</h2>";
+			$title = $row['title'];
 
-		$title = db_escape_string($title);
-		$result = db_query("SELECT ttrss_entries.id AS id,
+			print "<h2>$title</h2>";
+
+			$sth = $this->pdo->prepare("SELECT ttrss_entries.id AS id,
 				feed_id,
 				ttrss_entries.title AS title,
 				updated, link,
@@ -63,35 +68,42 @@ class Af_Psql_Trgm extends Plugin {
 				ttrss_entries, ttrss_user_entries LEFT JOIN ttrss_feeds ON (ttrss_feeds.id = feed_id)
 			WHERE
 				ttrss_entries.id = ref_id AND
-				ttrss_user_entries.owner_uid = $owner_uid AND
-				ttrss_entries.id != $id AND
+				ttrss_user_entries.owner_uid = ? AND
+				ttrss_entries.id != ? AND
 				date_entered >= NOW() - INTERVAL '2 weeks'
 			ORDER BY
 				sm DESC, date_entered DESC
 			LIMIT 10");
 
-		print "<ul class=\"browseFeedList\" style=\"border-width : 1px\">";
+			$sth->execute([$owner_uid, $id]);
+
+			print "<ul class=\"browseFeedList\" style=\"border-width : 1px\">";
 
-		while ($line = db_fetch_assoc($result)) {
-			print "<li>";
-			print "<div class='insensitive small' style='margin-left : 20px; float : right'>" .
-				smart_date_time(strtotime($line["updated"]))
-				. "</div>";
+			while ($line = $sth->fetch()) {
+				print "<li>";
+				print "<div class='insensitive small' style='margin-left : 20px; float : right'>" .
+					smart_date_time(strtotime($line["updated"]))
+					. "</div>";
 
-			print "<img src='images/score_high.png' title='".sprintf("%.2f", $line['sm'])."'
+				$sm = sprintf("%.2f", $line['sm']);
+				print "<img src='images/score_high.png' title='$sm'
 				style='vertical-align : middle'>";
 
-			$article_link = htmlspecialchars($line["link"]);
-			print " <a target=\"_blank\" href=\"$article_link\">".
-				$line["title"]."</a>";
+				$article_link = htmlspecialchars($line["link"]);
+				print " <a target=\"_blank\" rel=\"noopener noreferrer\" href=\"$article_link\">".
+					$line["title"]."</a>";
 
-			print " (<a href=\"#\" onclick=\"viewfeed(".$line["feed_id"].")\">".
-				htmlspecialchars($line["feed_title"])."</a>)";
+				print " (<a href=\"#\" onclick=\"viewfeed({feed:".$line["feed_id"]."})\">".
+					htmlspecialchars($line["feed_title"])."</a>)";
 
-			print "</li>";
-		}
+				print " <span class='insensitive'>($sm)</span>";
+
+				print "</li>";
+			}
 
-		print "</ul>";
+			print "</ul>";
+
+		}
 
 		print "<div style='text-align : center'>";
 		print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('trgmRelatedDlg').hide()\">".__('Close this window')."</button>";
@@ -114,82 +126,87 @@ class Af_Psql_Trgm extends Plugin {
 
 		if (DB_TYPE != "pgsql") {
 			print_error("Database type not supported.");
-		}
+		} else {
 
-		$result = db_query("select 'similarity'::regproc");
+			$res = $this->pdo->query("select 'similarity'::regproc");
 
-		if (db_num_rows($result) == 0) {
-			print_error("pg_trgm extension not found.");
-		}
-
-		$similarity = $this->host->get($this, "similarity");
-		$min_title_length = $this->host->get($this, "min_title_length");
-
-		if (!$similarity) $similarity = '0.75';
-		if (!$min_title_length) $min_title_length = '32';
-
-		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);
-					}
-				});
-				//this.reset();
+			if (!$res->fetch()) {
+				print_error("pg_trgm extension not found.");
 			}
-			</script>";
-
-		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pluginhandler\">";
-		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"save\">";
-		print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"plugin\" value=\"af_psql_trgm\">";
-
-		print_notice("PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking.");
-
-		print "<br/>";
-		print_notice("Enable the plugin for specific feeds in the feed editor.");
-
-		print "<h3>" . __("Global settings") . "</h3>";
-
-		print "<table>";
-
-		print "<tr><td width=\"40%\">".__("Minimum similarity:")."</td>";
-		print "<td>
-			<input dojoType=\"dijit.form.ValidationTextBox\"
-			placeholder=\"0.75\"
-			required=\"1\" name=\"similarity\" value=\"$similarity\"></td></tr>";
-		print "<tr><td width=\"40%\">".__("Minimum title length:")."</td>";
-		print "<td>
-			<input dojoType=\"dijit.form.ValidationTextBox\"
-			placeholder=\"32\"
-			required=\"1\" name=\"min_title_length\" value=\"$min_title_length\"></td></tr>";
-
-		print "</table>";
-
-		print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\">".
-			__("Save")."</button>";
-
-		print "</form>";
-
-		$enabled_feeds = $this->host->get($this, "enabled_feeds");
-		if (!array($enabled_feeds)) $enabled_feeds = array();
-
-		if (count($enabled_feeds) > 0) {
-			print "<h3>" . __("Currently enabled for (click to edit):") . "</h3>";
 
-			print "<ul class=\"browseFeedList\" style=\"border-width : 1px\">";
-			foreach ($enabled_feeds as $f) {
-				print "<li>" .
-					"<img src='images/pub_set.png'
-						style='vertical-align : middle'> <a href='#'
-						onclick='editFeed($f)'>".
-					getFeedTitle($f) . "</a></li>";
+			$similarity = $this->host->get($this, "similarity");
+			$min_title_length = $this->host->get($this, "min_title_length");
+			$enable_globally = $this->host->get($this, "enable_globally");
+
+			if (!$similarity) $similarity = '0.75';
+			if (!$min_title_length) $min_title_length = '32';
+
+			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);
+						}
+					});
+					//this.reset();
+				}
+				</script>";
+
+			print_hidden("op", "pluginhandler");
+			print_hidden("method", "save");
+			print_hidden("plugin", "af_psql_trgm");
+
+			print "<p>" . __("PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking.") . "</p>";
+			print_notice("Enable the plugin for specific feeds in the feed editor.");
+
+			print "<h3>" . __("Global settings") . "</h3>";
+
+			print "<table>";
+
+			print "<tr><td width=\"40%\">" . __("Minimum similarity:") . "</td>";
+			print "<td>
+				<input dojoType=\"dijit.form.ValidationTextBox\"
+				placeholder=\"0.75\"
+				required=\"1\" name=\"similarity\" value=\"$similarity\"></td></tr>";
+			print "<tr><td width=\"40%\">" . __("Minimum title length:") . "</td>";
+			print "<td>
+				<input dojoType=\"dijit.form.ValidationTextBox\"
+				placeholder=\"32\"
+				required=\"1\" name=\"min_title_length\" value=\"$min_title_length\"></td></tr>";
+			print "<tr><td width=\"40%\">" . __("Enable for all feeds:") . "</td>";
+			print "<td>";
+			print_checkbox("enable_globally", $enable_globally);
+			print "</td></tr>";
+
+			print "</table>";
+
+			print "<p>"; print_button("submit", __("Save"));
+			print "</form>";
+
+			$enabled_feeds = $this->host->get($this, "enabled_feeds");
+			if (!array($enabled_feeds)) $enabled_feeds = array();
+
+			$enabled_feeds = $this->filter_unknown_feeds($enabled_feeds);
+			$this->host->set($this, "enabled_feeds", $enabled_feeds);
+
+			if (count($enabled_feeds) > 0) {
+				print "<h3>" . __("Currently enabled for (click to edit):") . "</h3>";
+
+				print "<ul class=\"browseFeedList\" style=\"border-width : 1px\">";
+				foreach ($enabled_feeds as $f) {
+					print "<li>" .
+						"<img src='images/pub_set.png'
+							style='vertical-align : middle'> <a href='#'
+							onclick='editFeed($f)'>" .
+						Feeds::getFeedTitle($f) . "</a></li>";
+				}
+				print "</ul>";
 			}
-			print "</ul>";
 		}
 
 		print "</div>";
@@ -216,7 +233,7 @@ class Af_Psql_Trgm extends Plugin {
 		$enabled_feeds = $this->host->get($this, "enabled_feeds");
 		if (!is_array($enabled_feeds)) $enabled_feeds = array();
 
-		$enable = checkbox_to_sql_bool($_POST["trgm_similarity_enabled"]) == 'true';
+		$enable = checkbox_to_sql_bool($_POST["trgm_similarity_enabled"]);
 		$key = array_search($feed_id, $enabled_feeds);
 
 		if ($enable) {
@@ -236,32 +253,58 @@ class Af_Psql_Trgm extends Plugin {
 
 		if (DB_TYPE != "pgsql") return $article;
 
-		$result = db_query("select 'similarity'::regproc");
-		if (db_num_rows($result) == 0) return $article;
+		$res = $this->pdo->query("select 'similarity'::regproc");
+		if (!$res->fetch()) return $article;
 
-		$enabled_feeds = $this->host->get($this, "enabled_feeds");
-		$key = array_search($article["feed"]["id"], $enabled_feeds);
-		if ($key === FALSE) return $article;
+		$enable_globally = $this->host->get($this, "enable_globally");
+
+		if (!$enable_globally) {
+			$enabled_feeds = $this->host->get($this, "enabled_feeds");
+			$key = array_search($article["feed"]["id"], $enabled_feeds);
+			if ($key === FALSE) return $article;
+		}
 
 		$similarity = (float) $this->host->get($this, "similarity");
 		if ($similarity < 0.01) return $article;
 
-		$min_title_length = (int) $this->host->get($this, "min_length");
+		$min_title_length = (int) $this->host->get($this, "min_title_length");
 		if (mb_strlen($article["title"]) < $min_title_length) return $article;
 
 		$owner_uid = $article["owner_uid"];
-		$feed_id = $article["feed"]["id"];
+		$entry_guid = $article["guid_hashed"];
+		$title_escaped = $article["title"];
 
-		$title_escaped = db_escape_string($article["title"]);
+		// trgm does not return similarity=1 for completely equal strings
 
-		$result = db_query("SELECT MAX(SIMILARITY(title, '$title_escaped')) AS ms
+		$sth = $this->pdo->prepare("SELECT COUNT(id) AS nequal
+		  FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id AND
+		  date_entered >= NOW() - interval '3 days' AND
+		  title = ? AND
+		  guid != ? AND
+		  owner_uid = ?");
+		$sth->execute([$title_escaped, $entry_guid, $owner_uid]);
+
+		$row = $sth->fetch();
+		$nequal = $row['nequal'];
+
+		Debug::log("af_psql_trgm: num equals: $nequal", Debug::$LOG_EXTENDED);
+
+		if ($nequal != 0) {
+			$article["force_catchup"] = true;
+			return $article;
+		}
+
+		$sth = $this->pdo->prepare("SELECT MAX(SIMILARITY(title, ?)) AS ms
 		  FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id AND
 		  date_entered >= NOW() - interval '1 day' AND
-		  owner_uid = $owner_uid");
+		  guid != ? AND
+		  owner_uid = ?");
+		$sth->execute([$title_escaped, $entry_guid, $owner_uid]);
 
-		$similarity_result = db_fetch_result($result, 0, "ms");
+		$row = $sth->fetch();
+		$similarity_result = $row['ms'];
 
-		//_debug("similarity result: $similarity_result");
+		Debug::log("af_psql_trgm: similarity result: $similarity_result", Debug::$LOG_EXTENDED);
 
 		if ($similarity_result >= $similarity) {
 			$article["force_catchup"] = true;
@@ -275,5 +318,20 @@ class Af_Psql_Trgm extends Plugin {
 		return 2;
 	}
 
-}
-?>
+	private function filter_unknown_feeds($enabled_feeds) {
+		$tmp = array();
+
+		foreach ($enabled_feeds as $feed) {
+
+			$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE id = ? AND owner_uid = ?");
+			$sth->execute([$feed, $_SESSION['uid']]);
+
+			if ($row = $sth->fetch()) {
+				array_push($tmp, $feed);
+			}
+		}
+
+		return $tmp;
+	}
+
+}
\ No newline at end of file