From 020f062a76746a313fae9c82fbcf9b37fcc9d459 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 15 Feb 2021 15:43:07 +0300 Subject: feeds: unify naming --- plugins/af_psql_trgm/init.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/af_psql_trgm/init.php') diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php index 163b0ec38..47ff98fc2 100644 --- a/plugins/af_psql_trgm/init.php +++ b/plugins/af_psql_trgm/init.php @@ -209,7 +209,7 @@ class Af_Psql_Trgm extends Plugin { print "
  • " . "rss_feed " . - Feeds::getFeedTitle($f) . "
    • "; + Feeds::_get_title($f) . ""; } print ""; } -- cgit v1.2.3 From 1f43d7916cda16e9680b9087bda1f52934e8f25b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 16 Feb 2021 14:32:06 +0300 Subject: replace print_hidden with hidden_tag --- plugins/af_psql_trgm/init.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins/af_psql_trgm/init.php') diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php index 47ff98fc2..715e63927 100644 --- a/plugins/af_psql_trgm/init.php +++ b/plugins/af_psql_trgm/init.php @@ -157,9 +157,9 @@ class Af_Psql_Trgm extends Plugin { } "; - print_hidden("op", "pluginhandler"); - print_hidden("method", "save"); - print_hidden("plugin", "af_psql_trgm"); + print \Controls\hidden_tag("op", "pluginhandler"); + print \Controls\hidden_tag("method", "save"); + print \Controls\hidden_tag("plugin", "af_psql_trgm"); print "

    " . __("Global settings") . "

    "; -- cgit v1.2.3 From f58c49beaa5e2e0bf924f0ea844ede18abd0bc27 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 16 Feb 2021 18:50:18 +0300 Subject: replace a few more controls to new style --- plugins/af_psql_trgm/init.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'plugins/af_psql_trgm/init.php') diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php index 715e63927..3662e490a 100644 --- a/plugins/af_psql_trgm/init.php +++ b/plugins/af_psql_trgm/init.php @@ -139,7 +139,7 @@ class Af_Psql_Trgm extends Plugin { $similarity = $this->host->get($this, "similarity", $this->default_similarity); $min_title_length = $this->host->get($this, "min_title_length", $this->default_min_length); - $enable_globally = $this->host->get($this, "enable_globally"); + $enable_globally = sql_bool_to_bool($this->host->get($this, "enable_globally")); print "
    "; @@ -186,13 +186,14 @@ class Af_Psql_Trgm extends Plugin { print "
    "; print ""; print "
    "; - print_button("submit", __("Save"), "class='alt-primary'"); + print "
    "; + print \Controls\submit_tag(__("Save")); print "
    "; /* cleanup */ @@ -202,6 +203,7 @@ class Af_Psql_Trgm extends Plugin { $this->host->set($this, "enabled_feeds", $enabled_feeds); if (count($enabled_feeds) > 0) { + print "
    "; print "

    " . __("Currently enabled for (click to edit):") . "

    "; print "
      "; -- cgit v1.2.3 From 538f87e41551745a49cacf41c1a5d3772d3581a6 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 17 Feb 2021 14:08:06 +0300 Subject: af_psql_trgm: don't load dialog via http --- plugins/af_psql_trgm/init.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/af_psql_trgm/init.php') diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php index 3662e490a..d1a029adc 100644 --- a/plugins/af_psql_trgm/init.php +++ b/plugins/af_psql_trgm/init.php @@ -46,7 +46,7 @@ class Af_Psql_Trgm extends Plugin { } function showrelated() { - $id = (int) $_REQUEST['param']; + $id = (int) $_REQUEST['id']; $owner_uid = $_SESSION["uid"]; $sth = $this->pdo->prepare("SELECT title FROM ttrss_entries, ttrss_user_entries -- cgit v1.2.3 From 4632d6cf558774cfcb17b3b4cf10399c3626096b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 17 Feb 2021 14:14:17 +0300 Subject: fix some php8 warnings --- plugins/af_psql_trgm/init.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/af_psql_trgm/init.php') diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php index d1a029adc..1d83ce5e0 100644 --- a/plugins/af_psql_trgm/init.php +++ b/plugins/af_psql_trgm/init.php @@ -15,7 +15,7 @@ class Af_Psql_Trgm extends Plugin { function save() { $similarity = (float) $_POST["similarity"]; $min_title_length = (int) $_POST["min_title_length"]; - $enable_globally = checkbox_to_sql_bool($_POST["enable_globally"]); + $enable_globally = checkbox_to_sql_bool($_POST["enable_globally"] ?? ""); if ($similarity < 0) $similarity = 0; if ($similarity > 1) $similarity = 1; -- cgit v1.2.3 From e4609c18efceebb1e021d814f53061ada7f6489a Mon Sep 17 00:00:00 2001 From: Andrew Dolgov 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/af_psql_trgm/init.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'plugins/af_psql_trgm/init.php') diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php index 1d83ce5e0..bfbbdf49c 100644 --- a/plugins/af_psql_trgm/init.php +++ b/plugins/af_psql_trgm/init.php @@ -157,9 +157,7 @@ class Af_Psql_Trgm extends Plugin { } "; - print \Controls\hidden_tag("op", "pluginhandler"); - print \Controls\hidden_tag("method", "save"); - print \Controls\hidden_tag("plugin", "af_psql_trgm"); + print \Controls\pluginhandler_tags($this, "save"); print "

      " . __("Global settings") . "

      "; -- cgit v1.2.3 From d8a99ce06a3ce789a5971a03d97f37b2df23d0f9 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 18 Feb 2021 12:45:31 +0300 Subject: remove unneeded headings --- plugins/af_psql_trgm/init.php | 2 -- 1 file changed, 2 deletions(-) (limited to 'plugins/af_psql_trgm/init.php') diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php index bfbbdf49c..c66c49aed 100644 --- a/plugins/af_psql_trgm/init.php +++ b/plugins/af_psql_trgm/init.php @@ -159,8 +159,6 @@ class Af_Psql_Trgm extends Plugin { print \Controls\pluginhandler_tags($this, "save"); - print "

      " . __("Global settings") . "

      "; - print_notice("Enable for specific feeds in the feed editor."); print "
      "; -- cgit v1.2.3 From bed36cbf9fde4a9016029fb8c21e6e68d540dee2 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 18 Feb 2021 13:41:40 +0300 Subject: af_psql_trgm: cleanup --- plugins/af_psql_trgm/init.php | 196 +++++++++++++++++++++--------------------- 1 file changed, 100 insertions(+), 96 deletions(-) (limited to 'plugins/af_psql_trgm/init.php') diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php index c66c49aed..4ecfe0cd5 100644 --- a/plugins/af_psql_trgm/init.php +++ b/plugins/af_psql_trgm/init.php @@ -124,113 +124,117 @@ class Af_Psql_Trgm extends Plugin { function hook_prefs_tab($args) { if ($args != "prefFeeds") return; - print "
      extension ".__('Mark similar articles as read (af_psql_trgm)')."\">"; + $similarity = $this->host->get($this, "similarity", $this->default_similarity); + $min_title_length = $this->host->get($this, "min_title_length", $this->default_min_length); + $enable_globally = sql_bool_to_bool($this->host->get($this, "enable_globally")); - if (DB_TYPE != "pgsql") { - print_error("Database type not supported."); - } else { - - $res = $this->pdo->query("select 'similarity'::regproc"); - - if (!$res || !$res->fetch()) { - print_error("pg_trgm extension not found."); - } + ?> - $similarity = $this->host->get($this, "similarity", $this->default_similarity); - $min_title_length = $this->host->get($this, "min_title_length", $this->default_min_length); - $enable_globally = sql_bool_to_bool($this->host->get($this, "enable_globally")); +
      - print "
      "; + pdo->query("select 'similarity'::regproc"); - print ""; - - print \Controls\pluginhandler_tags($this, "save"); - - print_notice("Enable for specific feeds in the feed editor."); - - print "
      "; - - print " "; - print ""; - - print "
      " . - __("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 "
      "; - - print " "; - print ""; - - print "
      "; - - print ""; + } ?> - print "
      "; + - print "
      "; - print \Controls\submit_tag(__("Save")); - print "
      "; + - /* cleanup */ - $enabled_feeds = $this->filter_unknown_feeds( - $this->get_stored_array("enabled_feeds")); - - $this->host->set($this, "enabled_feeds", $enabled_feeds); - - if (count($enabled_feeds) > 0) { - print "
      "; - print "

      " . __("Currently enabled for (click to edit):") . "

      "; - - print ""; - } - } - - print "
      "; + + + + +
      + + + +
      + +
      +
      + +
      + + +
      + +
      + +
      + +
      + + + + + filter_unknown_feeds( + $this->get_stored_array("enabled_feeds")); + + $this->host->set($this, "enabled_feeds", $enabled_feeds); + ?> + + 0) { ?> +
      +

      + +
        + +
      • + rss_feed + + + +
        • + +
      + +
      + ".__("Similarity (af_psql_trgm)").""; - print "
      "; - - $enabled_feeds = $this->get_stored_array("enabled_feeds"); - $checked = in_array($feed_id, $enabled_feeds) ? "checked" : ""; - - print "
      "; - - print ""; - - print "
      "; - - print "
      "; + $enabled_feeds = $this->get_stored_array("enabled_feeds"); + ?> +
      + +
      +
      + +
      +
      + + 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/af_psql_trgm/init.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/af_psql_trgm/init.php') diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php index 4ecfe0cd5..3b7ed6b14 100644 --- a/plugins/af_psql_trgm/init.php +++ b/plugins/af_psql_trgm/init.php @@ -152,8 +152,8 @@ class Af_Psql_Trgm extends Plugin { evt.preventDefault(); if (this.validate()) { Notify.progress('Saving data...', true); - xhrPost("backend.php", this.getValues(), (transport) => { - Notify.info(transport.responseText); + xhr.post("backend.php", this.getValues(), (reply) => { + Notify.info(reply); }) } -- cgit v1.2.3 From e4107ac9520ca404d4ab49ef79ca74430e8fd772 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 22 Feb 2021 21:47:48 +0300 Subject: wip: initial for config object --- plugins/af_psql_trgm/init.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/af_psql_trgm/init.php') diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php index 3b7ed6b14..5611d8998 100644 --- a/plugins/af_psql_trgm/init.php +++ b/plugins/af_psql_trgm/init.php @@ -134,7 +134,7 @@ class Af_Psql_Trgm extends Plugin { title="extension "> pdo->query("select 'similarity'::regproc"); @@ -258,7 +258,7 @@ class Af_Psql_Trgm extends Plugin { function hook_article_filter($article) { - if (DB_TYPE != "pgsql") return $article; + if (Config::get(Config::DB_TYPE) != "pgsql") return $article; $res = $this->pdo->query("select 'similarity'::regproc"); if (!$res || !$res->fetch()) return $article; -- cgit v1.2.3