From 96aba17f013a8457d154a7ba5c85451cfd69d239 Mon Sep 17 00:00:00 2001 From: Bram Schoenmakers Date: Wed, 17 Sep 2014 19:05:52 +0200 Subject: Updater: check whether system() is useable. system() was disabled on my system for security reasons, but the updater would just continue, only to find out that the tarball hasn't been extracted. --- plugins/updater/init.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'plugins') diff --git a/plugins/updater/init.php b/plugins/updater/init.php index ef48858b2..6ee018f74 100644 --- a/plugins/updater/init.php +++ b/plugins/updater/init.php @@ -63,6 +63,20 @@ class Updater extends Plugin { putenv("PATH=" . getenv("PATH") . PATH_SEPARATOR . "/bin" . PATH_SEPARATOR . "/usr/bin"); + array_push($log, "Checking for system() call..."); + + $disabled = explode(',', ini_get('disable_functions')); + foreach ($disabled as $function) { + if ( trim($function) == 'system' ) { + array_push($log, "Can not execute commands with PHP's system() function."); + $stop = true; + } + } + + if ( $stop == true ) { + break; + } + array_push($log, "Checking for tar..."); $system_rc = 0; -- cgit v1.2.3-54-g00ecf From 110ce72a72468c30ffb9bb9b77e449314e4b10a1 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 21 Oct 2014 16:53:17 +0400 Subject: add af_comics filter for toothpastefordinner --- plugins/af_comics/filters/af_comics_tfd.php | 32 +++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 plugins/af_comics/filters/af_comics_tfd.php (limited to 'plugins') diff --git a/plugins/af_comics/filters/af_comics_tfd.php b/plugins/af_comics/filters/af_comics_tfd.php new file mode 100644 index 000000000..c4e594551 --- /dev/null +++ b/plugins/af_comics/filters/af_comics_tfd.php @@ -0,0 +1,32 @@ +loadHTML(fetch_file_contents($article["link"])); + + $basenode = false; + + if ($doc) { + $xpath = new DOMXPath($doc); + $basenode = $xpath->query('//img[@class="comic"]')->item(0); + + if ($basenode) { + $article["content"] = $doc->saveXML($basenode); + return true; + } + } + } + + return false; + } +} +?> -- cgit v1.2.3-54-g00ecf From 346297d4d216e58566e6f35b7b6fbd2235f46258 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 9 Nov 2014 20:31:46 +0300 Subject: add imgsetsizes plugin --- plugins/af_zz_imgsetsizes/init.php | 88 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 plugins/af_zz_imgsetsizes/init.php (limited to 'plugins') diff --git a/plugins/af_zz_imgsetsizes/init.php b/plugins/af_zz_imgsetsizes/init.php new file mode 100644 index 000000000..d71ec096e --- /dev/null +++ b/plugins/af_zz_imgsetsizes/init.php @@ -0,0 +1,88 @@ +host = $host; + + if (function_exists("curl_init") && function_exists("getimagesize")) { + $host->add_hook($host::HOOK_ARTICLE_FILTER, $this); + } + } + + function hook_article_filter($article) { + + $owner_uid = $article["owner_uid"]; + + $charset_hack = ' + + '; + + $doc = new DOMDocument(); + $doc->loadHTML($charset_hack . $article["content"]); + + $found = false; + + if ($doc) { + $xpath = new DOMXpath($doc); + + $images = $xpath->query('(//img[@src])'); + + foreach ($images as $img) { + $src = $img->getAttribute("src"); + + $ch = curl_init($src); + curl_setopt($ch, CURLOPT_HEADER, 0); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($ch, CURLOPT_BINARYTRANSFER,1); + curl_setopt($ch, CURLOPT_RANGE, "0-32768"); + + @$result = curl_exec($ch); + $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE); + + if ($result && ($http_code == 200 || $http_code == 206)) { + $filename = tempnam(sys_get_temp_dir(), "ttsizecheck"); + + if ($filename) { + $fh = fopen($filename, "w"); + if ($fh) { + fwrite($fh, $result); + fclose($fh); + + @$info = getimagesize($filename); + + if ($info && $info[0] > 0 && $info[1] > 0) { + $img->setAttribute("width", $info[0]); + $img->setAttribute("height", $info[1]); + $found = true; + } + + unlink($filename); + } + } + } + } + + if ($found) { + $doc->removeChild($doc->firstChild); //remove doctype + $article["content"] = $doc->saveHTML(); + } + } + + return $article; + + } + + + function api_version() { + return 2; + } + +} +?> -- cgit v1.2.3-54-g00ecf From 84c6f17deb6d35f3d1ef4738488b20f4ae4bcf34 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 15 Nov 2014 16:37:21 +0300 Subject: add af_tumblr_1280 --- plugins/af_tumblr_1280/init.php | 79 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 plugins/af_tumblr_1280/init.php (limited to 'plugins') diff --git a/plugins/af_tumblr_1280/init.php b/plugins/af_tumblr_1280/init.php new file mode 100644 index 000000000..f9938048b --- /dev/null +++ b/plugins/af_tumblr_1280/init.php @@ -0,0 +1,79 @@ +host = $host; + + if (function_exists("curl_init")) { + $host->add_hook($host::HOOK_ARTICLE_FILTER, $this); + } + } + + function hook_article_filter($article) { + + $owner_uid = $article["owner_uid"]; + + $charset_hack = ' + + '; + + $doc = new DOMDocument(); + $doc->loadHTML($charset_hack . $article["content"]); + + $found = false; + + if ($doc) { + $xpath = new DOMXpath($doc); + + $images = $xpath->query('(//img[contains(@src, \'media.tumblr.com\')])'); + + foreach ($images as $img) { + $src = $img->getAttribute("src"); + + $test_src = preg_replace("/_\d{3}.(jpg|gif|png)/", "_1280.$1", $src); + + if ($src != $test_src) { + + $ch = curl_init($test_src); + curl_setopt($ch, CURLOPT_TIMEOUT, 5); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($ch, CURLOPT_HEADER, true); + curl_setopt($ch, CURLOPT_NOBODY, true); + curl_setopt($ch, CURLOPT_FOLLOWLOCATION, + !ini_get("safe_mode") && !ini_get("open_basedir")); + curl_setopt($ch, CURLOPT_USERAGENT, SELF_USER_AGENT); + + @$result = curl_exec($ch); + $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE); + + if ($result && $http_code == 200) { + $img->setAttribute("src", $test_src); + $found = true; + } + } + } + + if ($found) { + $doc->removeChild($doc->firstChild); //remove doctype + $article["content"] = $doc->saveHTML(); + } + } + + return $article; + + } + + + function api_version() { + return 2; + } + +} +?> -- cgit v1.2.3-54-g00ecf From e8a0d290c0622d8f1d008e92c4bc56fd701a8b68 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 25 Nov 2014 18:40:19 +0300 Subject: no_iframes: remove everything except good iframes --- plugins/no_iframes/init.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'plugins') diff --git a/plugins/no_iframes/init.php b/plugins/no_iframes/init.php index c66d7abaf..35f7187f5 100644 --- a/plugins/no_iframes/init.php +++ b/plugins/no_iframes/init.php @@ -4,7 +4,7 @@ class No_Iframes extends Plugin { function about() { return array(1.0, - "Remove embedded iframes", + "Remove embedded iframes (unless whitelisted)", "fox"); } @@ -16,7 +16,13 @@ class No_Iframes extends Plugin { function hook_sanitize($doc, $site_url, $allowed_elements, $disallowed_attributes) { - $allowed_elements = array_diff($allowed_elements, array("iframe")); + $xpath = new DOMXpath($doc); + $entries = $xpath->query('//iframe'); + + foreach ($entries as $entry) { + if (!iframe_whitelisted($entry)) + $entry->parentNode->removeChild($entry); + } return array($doc, $allowed_elements, $disallowed_attributes); } -- cgit v1.2.3-54-g00ecf From 2681f684c7ceed8b3de70223582e947c4b83143b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 3 Dec 2014 18:06:22 +0300 Subject: af_comics_pa: check node exists before trying to manipulate it --- plugins/af_comics/filters/af_comics_pa.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'plugins') diff --git a/plugins/af_comics/filters/af_comics_pa.php b/plugins/af_comics/filters/af_comics_pa.php index a13857cc1..0848adbd0 100644 --- a/plugins/af_comics/filters/af_comics_pa.php +++ b/plugins/af_comics/filters/af_comics_pa.php @@ -56,7 +56,9 @@ class Af_Comics_Pa extends Af_ComicFilter { if ($header->parentNode) { $header->parentNode->removeChild($header); } $avatar = $xpath->query('(//div[@class="avatar"]//img)')->item(0); - $basenode->insertBefore($avatar, $basenode->firstChild); + + if ($basenode) + $basenode->insertBefore($avatar, $basenode->firstChild); $uninteresting = $xpath->query('(//div[@class="avatar"])'); foreach ($uninteresting as $i) { -- cgit v1.2.3-54-g00ecf From 9fd581336e3044425c3d2d915ee81c8c5741d226 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 3 Dec 2014 22:43:25 +0300 Subject: fetch_file_contents: support retarded schema-less urls af_comics_dilbert: fix for new dilbert.com shenanigans --- include/functions.php | 3 +++ plugins/af_comics/filters/af_comics_dilbert.php | 22 ++++++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) (limited to 'plugins') diff --git a/include/functions.php b/include/functions.php index 1dbf004da..769c27af9 100644 --- a/include/functions.php +++ b/include/functions.php @@ -357,6 +357,9 @@ $url = ltrim($url, ' '); $url = str_replace(' ', '%20', $url); + if (strpos($url, "//") === 0) + $url = 'http:' . $url; + if (!defined('NO_CURL') && function_exists('curl_init')) { $fetch_curl_used = true; diff --git a/plugins/af_comics/filters/af_comics_dilbert.php b/plugins/af_comics/filters/af_comics_dilbert.php index f0e31cf88..67d9788ab 100644 --- a/plugins/af_comics/filters/af_comics_dilbert.php +++ b/plugins/af_comics/filters/af_comics_dilbert.php @@ -6,23 +6,33 @@ class Af_Comics_Dilbert extends Af_ComicFilter { } function process(&$article) { - $owner_uid = $article["owner_uid"]; - if (strpos($article["guid"], "dilbert.com") !== FALSE) { + $res = fetch_file_contents($article["link"], false, false, false, + false, false, 0, + "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)"); + + global $fetch_last_error_content; + + if (!$res && $fetch_last_error_content) + $res = $fetch_last_error_content; + $doc = new DOMDocument(); - @$doc->loadHTML(fetch_file_contents($article["link"])); + @$doc->loadHTML($res); $basenode = false; if ($doc) { $xpath = new DOMXPath($doc); - $entries = $xpath->query('(//img[@src])'); // we might also check for img[@class='strip'] I guess... + + $basenode = $xpath->query('//div[@class="STR_Image"]')->item(0); + + /* $entries = $xpath->query('(//img[@src])'); // we might also check for img[@class='strip'] I guess... $matches = array(); foreach ($entries as $entry) { - if (preg_match("/dyn\/str_strip\/.*zoom\.gif$/", $entry->getAttribute("src"), $matches)) { + if (preg_match("/dyn\/str_strip\/.*strip\.gif$/", $entry->getAttribute("src"), $matches)) { $entry->setAttribute("src", rewrite_relative_url("http://dilbert.com/", @@ -31,7 +41,7 @@ class Af_Comics_Dilbert extends Af_ComicFilter { $basenode = $entry; break; } - } + } */ if ($basenode) { $article["content"] = $doc->saveXML($basenode); -- cgit v1.2.3-54-g00ecf From 945ecd7db66203ce117c1818b49e8204e92ceabe Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 12 Dec 2014 12:23:33 +0300 Subject: fix explosm comics plugin --- plugins/af_comics/filters/af_comics_explosm.php | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'plugins') diff --git a/plugins/af_comics/filters/af_comics_explosm.php b/plugins/af_comics/filters/af_comics_explosm.php index cba7ad0ad..30b7e24c9 100644 --- a/plugins/af_comics/filters/af_comics_explosm.php +++ b/plugins/af_comics/filters/af_comics_explosm.php @@ -17,18 +17,7 @@ class Af_Comics_Explosm extends Af_ComicFilter { if ($doc) { $xpath = new DOMXPath($doc); - $entries = $xpath->query('(//img[@src])'); // we might also check for img[@class='strip'] I guess... - - $matches = array(); - - foreach ($entries as $entry) { - - if (preg_match("/(http:\/\/.*\/db\/files\/Comics\/.*)/i", $entry->getAttribute("src"), $matches)) { - - $basenode = $entry; - break; - } - } + $basenode = $xpath->query('(//img[@id="main-comic"])')->item(0); if ($basenode) { $article["content"] = $doc->saveXML($basenode); -- cgit v1.2.3-54-g00ecf From 4262e0019a519b2db4d6507ff0f2984ac1c6249a Mon Sep 17 00:00:00 2001 From: zaikos Date: Fri, 26 Dec 2014 14:43:38 -0500 Subject: Temporarily disable entity loader when importing XML file. --- plugins/import_export/init.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'plugins') diff --git a/plugins/import_export/init.php b/plugins/import_export/init.php index d185210ee..e61b62b67 100644 --- a/plugins/import_export/init.php +++ b/plugins/import_export/init.php @@ -189,6 +189,8 @@ class Import_Export extends Plugin implements IHandler { $num_processed = 0; $num_feeds_created = 0; + libxml_disable_entity_loader(false); + $doc = @DOMDocument::load($filename); if (!$doc) { @@ -206,6 +208,8 @@ class Import_Export extends Plugin implements IHandler { $doc = DOMDocument::loadXML($data); } + libxml_disable_entity_loader(true); + if ($doc) { $xpath = new DOMXpath($doc); -- cgit v1.2.3-54-g00ecf From b1bb951fb81d084429539c9d5b216dead56c9bd7 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 15 Jan 2015 09:23:45 +0300 Subject: fix for yet another dilbert changes --- plugins/af_comics/filters/af_comics_dilbert.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins') diff --git a/plugins/af_comics/filters/af_comics_dilbert.php b/plugins/af_comics/filters/af_comics_dilbert.php index 67d9788ab..5faba7eb7 100644 --- a/plugins/af_comics/filters/af_comics_dilbert.php +++ b/plugins/af_comics/filters/af_comics_dilbert.php @@ -6,7 +6,7 @@ class Af_Comics_Dilbert extends Af_ComicFilter { } function process(&$article) { - if (strpos($article["guid"], "dilbert.com") !== FALSE) { + if (strpos($article["link"], "dilbert.com") !== FALSE) { $res = fetch_file_contents($article["link"], false, false, false, false, false, 0, "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)"); @@ -24,7 +24,7 @@ class Af_Comics_Dilbert extends Af_ComicFilter { if ($doc) { $xpath = new DOMXPath($doc); - $basenode = $xpath->query('//div[@class="STR_Image"]')->item(0); + $basenode = $xpath->query('//img[contains(@class, "img-comic")]')->item(0); /* $entries = $xpath->query('(//img[@src])'); // we might also check for img[@class='strip'] I guess... -- cgit v1.2.3-54-g00ecf From 117efb6fa497ce873c9e18368d2a9fc61eaa8ef8 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 19 Jan 2015 12:52:15 +0300 Subject: add trgm plugin for postgresql --- plugins/af_psql_trgm/init.php | 202 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) create mode 100644 plugins/af_psql_trgm/init.php (limited to 'plugins') diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php new file mode 100644 index 000000000..a1ee040e8 --- /dev/null +++ b/plugins/af_psql_trgm/init.php @@ -0,0 +1,202 @@ + 1) $similarity = 1; + + if ($min_title_length < 0) $min_title_length = 0; + + $similarity = sprintf("%.2f", $similarity); + + $this->host->set($this, "similarity", $similarity); + $this->host->set($this, "min_title_length", $min_title_length); + + echo T_sprintf("Data saved (%s)", $similarity); + } + + function init($host) { + $this->host = $host; + + $host->add_hook($host::HOOK_ARTICLE_FILTER, $this); + $host->add_hook($host::HOOK_PREFS_TAB, $this); + $host->add_hook($host::HOOK_PREFS_EDIT_FEED, $this); + $host->add_hook($host::HOOK_PREFS_SAVE_FEED, $this); + + } + + function hook_prefs_tab($args) { + if ($args != "prefFeeds") return; + + print "
"; + + if (DB_TYPE != "pgsql") { + print_error("Database type not supported."); + } + + $result = db_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 "
"; + + print ""; + + print ""; + print ""; + print ""; + + 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 "
"; + print_notice("Only data in other feeds is checked, i.e. sequential duplicate posts in one feed will not be detected by this plugin."); + + print "
"; + print_notice("Enable the plugin for specific feeds in the feed editor."); + + print "

" . __("Global settings") . "

"; + + print ""; + + print ""; + print ""; + print ""; + print ""; + + + print "
".__("Minimum similarity:")." +
".__("Minimum title length:")." +
"; + + print "

"; + + print "

"; + + print "
"; + } + + //PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_EDIT_FEED, + // "hook_prefs_edit_feed", $feed_id); + // PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_SAVE_FEED, + // "hook_prefs_save_feed", $feed_id); + + function hook_prefs_edit_feed($feed_id) { + print "
".__("Similarity (pg_trgm)")."
"; + print "
"; + + $enabled_feeds = $this->host->get($this, "enabled_feeds"); + if (!array($enabled_feeds)) $enabled_feeds = array(); + + $key = array_search($feed_id, $enabled_feeds); + $checked = $key !== FALSE ? "checked" : ""; + + print "
 "; + + print "
"; + } + + function hook_prefs_save_feed($feed_id) { + $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'; + $key = array_search($feed_id, $enabled_feeds); + + if ($enable) { + if ($key === FALSE) { + array_push($enabled_feeds, $feed_id); + } + } else { + if ($key !== FALSE) { + unset($enabled_feeds[$key]); + } + } + + $this->host->set($this, "enabled_feeds", $enabled_feeds); + } + + function hook_article_filter($article) { + + if (DB_TYPE != "pgsql") return $article; + + $result = db_query("select 'similarity'::regproc"); + if (db_num_rows($result) == 0) return $article; + + $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"); + if (mb_strlen($article["title"]) < $min_title_length) return $article; + + $owner_uid = $article["owner_uid"]; + $feed_id = $article["feed"]["id"]; + + $title_escaped = db_escape_string($article["title"]); + + $result = db_query("SELECT MAX(SIMILARITY(title, '$title_escaped')) AS ms + FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id AND + date_entered >= NOW() - interval '1 day' AND + feed_id != $feed_id AND + owner_uid = $owner_uid"); + + $similarity_result = db_fetch_result($result, 0, "ms"); + + //_debug("similarity result: $similarity_result"); + + if ($similarity_result >= $similarity) { + $article["force_catchup"] = true; + } + + return $article; + + } + + function api_version() { + return 2; + } + +} +?> -- cgit v1.2.3-54-g00ecf From 97600ddd978e20dde613085ea03453ddd102b8fc Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 19 Jan 2015 12:56:36 +0300 Subject: af_psql_trgm: allow dupe checking within one feed --- plugins/af_psql_trgm/init.php | 9 --------- 1 file changed, 9 deletions(-) (limited to 'plugins') diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php index a1ee040e8..95b78dec1 100644 --- a/plugins/af_psql_trgm/init.php +++ b/plugins/af_psql_trgm/init.php @@ -80,9 +80,6 @@ class Af_Psql_Trgm extends Plugin { 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 "
"; - print_notice("Only data in other feeds is checked, i.e. sequential duplicate posts in one feed will not be detected by this plugin."); - print "
"; print_notice("Enable the plugin for specific feeds in the feed editor."); @@ -112,11 +109,6 @@ class Af_Psql_Trgm extends Plugin { print ""; } - //PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_EDIT_FEED, - // "hook_prefs_edit_feed", $feed_id); - // PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_SAVE_FEED, - // "hook_prefs_save_feed", $feed_id); - function hook_prefs_edit_feed($feed_id) { print "
".__("Similarity (pg_trgm)")."
"; print "
"; @@ -179,7 +171,6 @@ class Af_Psql_Trgm extends Plugin { $result = db_query("SELECT MAX(SIMILARITY(title, '$title_escaped')) AS ms FROM ttrss_entries, ttrss_user_entries WHERE ref_id = id AND date_entered >= NOW() - interval '1 day' AND - feed_id != $feed_id AND owner_uid = $owner_uid"); $similarity_result = db_fetch_result($result, 0, "ms"); -- cgit v1.2.3-54-g00ecf From 9a121298e15856638be6f3e44593ab06a172bc17 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 19 Jan 2015 14:22:41 +0300 Subject: add some stuff to the trgm plugin --- plugins/af_psql_trgm/init.php | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'plugins') diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php index 95b78dec1..f55aa1156 100644 --- a/plugins/af_psql_trgm/init.php +++ b/plugins/af_psql_trgm/init.php @@ -2,7 +2,6 @@ class Af_Psql_Trgm extends Plugin { private $host; - private $filters = array(); function about() { return array(1.0, @@ -98,7 +97,6 @@ class Af_Psql_Trgm extends Plugin { placeholder=\"32\" required=\"1\" name=\"min_title_length\" value=\"$min_title_length\">"; - print ""; print "

"; } -- cgit v1.2.3-54-g00ecf From 167fb03f3e94d8a86c986e262952a6e124c12470 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 19 Jan 2015 14:59:33 +0300 Subject: trgm: add disabled for now button part --- plugins/af_psql_trgm/init.php | 47 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'plugins') diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php index f55aa1156..a451dce23 100644 --- a/plugins/af_psql_trgm/init.php +++ b/plugins/af_psql_trgm/init.php @@ -33,9 +33,56 @@ class Af_Psql_Trgm extends Plugin { $host->add_hook($host::HOOK_PREFS_TAB, $this); $host->add_hook($host::HOOK_PREFS_EDIT_FEED, $this); $host->add_hook($host::HOOK_PREFS_SAVE_FEED, $this); + //$host->add_hook($host::HOOK_ARTICLE_BUTTON, $this); } + /* function get_js() { + return file_get_contents(__DIR__ . "/init.js"); + } + + function showrelated() { + $id = (int) db_escape_string($_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"); + + $title = db_fetch_result($result, 0, "title"); + + print "

$title

"; + + $title = db_escape_string($title); + $result = db_query("SELECT id,title,updated + FROM ttrss_entries, ttrss_user_entries + WHERE owner_uid = $owner_uid AND + id = ref_id AND + id != $id AND + date_entered >= NOW() - INTERVAL '1 day' AND + SIMILARITY(title, '$title') >= 0.5 + LIMIT 30"); + + print "
    "; + + while ($line = db_fetch_assoc($result)) { + print "
  • "; + print "
    " . smart_date_time($line["updated"]) + . "
    "; + print $line["title"]; + print "
    • "; + } + + print "
"; + + } */ + + /* function hook_article_button($line) { + return ""; + } */ + function hook_prefs_tab($args) { if ($args != "prefFeeds") return; -- cgit v1.2.3-54-g00ecf From 7ebb2daf91e145e5e037af3b830a2a65b3edcd0d Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 19 Jan 2015 15:12:40 +0300 Subject: trgm: add disabled for now button part (add missing files) --- plugins/af_psql_trgm/button.png | Bin 0 -> 523 bytes plugins/af_psql_trgm/init.js | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 plugins/af_psql_trgm/button.png create mode 100644 plugins/af_psql_trgm/init.js (limited to 'plugins') diff --git a/plugins/af_psql_trgm/button.png b/plugins/af_psql_trgm/button.png new file mode 100644 index 000000000..9b3422c61 Binary files /dev/null and b/plugins/af_psql_trgm/button.png differ diff --git a/plugins/af_psql_trgm/init.js b/plugins/af_psql_trgm/init.js new file mode 100644 index 000000000..8affb72d4 --- /dev/null +++ b/plugins/af_psql_trgm/init.js @@ -0,0 +1,25 @@ +function showTrgmRelated(id) { + try { + + var query = "backend.php?op=pluginhandler&plugin=af_psql_trgm&method=showrelated¶m=" + param_escape(id); + + if (dijit.byId("editNoteDlg")) + dijit.byId("editNoteDlg").destroyRecursive(); + + dialog = new dijit.Dialog({ + id: "editNoteDlg", + title: __("Related articles"), + style: "width: 600px", + execute: function() { + + }, + href: query, + }); + + dialog.show(); + + } catch (e) { + exception_error("showTrgmRelated", e); + } +} + -- cgit v1.2.3-54-g00ecf From f52879fed516925a1cc026401671bcb083880e13 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 19 Jan 2015 15:46:15 +0300 Subject: trgm: add basic related stories dialog --- css/tt-rss.css | 4 ++++ plugins/af_psql_trgm/init.js | 6 ++--- plugins/af_psql_trgm/init.php | 54 +++++++++++++++++++++++++++++++------------ 3 files changed, 46 insertions(+), 18 deletions(-) (limited to 'plugins') diff --git a/css/tt-rss.css b/css/tt-rss.css index 3db8dc1d5..693541a7c 100644 --- a/css/tt-rss.css +++ b/css/tt-rss.css @@ -341,6 +341,10 @@ div.prefHelp { color : #555; } +.small { + font-size : 11px; +} + #main-toolbar > * { white-space : nowrap; display : table-cell; diff --git a/plugins/af_psql_trgm/init.js b/plugins/af_psql_trgm/init.js index 8affb72d4..621ccb746 100644 --- a/plugins/af_psql_trgm/init.js +++ b/plugins/af_psql_trgm/init.js @@ -3,11 +3,11 @@ function showTrgmRelated(id) { var query = "backend.php?op=pluginhandler&plugin=af_psql_trgm&method=showrelated¶m=" + param_escape(id); - if (dijit.byId("editNoteDlg")) - dijit.byId("editNoteDlg").destroyRecursive(); + if (dijit.byId("trgmRelatedDlg")) + dijit.byId("trgmRelatedDlg").destroyRecursive(); dialog = new dijit.Dialog({ - id: "editNoteDlg", + id: "trgmRelatedDlg", title: __("Related articles"), style: "width: 600px", execute: function() { diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php index a451dce23..97187a602 100644 --- a/plugins/af_psql_trgm/init.php +++ b/plugins/af_psql_trgm/init.php @@ -33,11 +33,11 @@ class Af_Psql_Trgm extends Plugin { $host->add_hook($host::HOOK_PREFS_TAB, $this); $host->add_hook($host::HOOK_PREFS_EDIT_FEED, $this); $host->add_hook($host::HOOK_PREFS_SAVE_FEED, $this); - //$host->add_hook($host::HOOK_ARTICLE_BUTTON, $this); + $host->add_hook($host::HOOK_ARTICLE_BUTTON, $this); } - /* function get_js() { + function get_js() { return file_get_contents(__DIR__ . "/init.js"); } @@ -53,35 +53,59 @@ class Af_Psql_Trgm extends Plugin { print "

$title

"; $title = db_escape_string($title); - $result = db_query("SELECT id,title,updated - FROM ttrss_entries, ttrss_user_entries - WHERE owner_uid = $owner_uid AND - id = ref_id AND - id != $id AND - date_entered >= NOW() - INTERVAL '1 day' AND - SIMILARITY(title, '$title') >= 0.5 - LIMIT 30"); + $result = db_query("SELECT ttrss_entries.id AS id, + feed_id, + ttrss_entries.title AS title, + updated, link, + ttrss_feeds.title AS feed_title, + SIMILARITY(ttrss_entries.title, '$title') AS sm + FROM + 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 + date_entered >= NOW() - INTERVAL '1 week' + ORDER BY + sm DESC, date_entered DESC + LIMIT 10"); print "
    "; while ($line = db_fetch_assoc($result)) { print "
  • "; - print "
    " . smart_date_time($line["updated"]) + print "
    " . + smart_date_time(strtotime($line["updated"])) . "
    "; - print $line["title"]; + + print ""; + + $article_link = htmlspecialchars($line["link"]); + print " ". + $line["title"].""; + + print " (". + htmlspecialchars($line["feed_title"]).")"; + print "
    • "; } print "
"; - } */ + print "
"; + print ""; + print "
"; - /* function hook_article_button($line) { + + } + + function hook_article_button($line) { return ""; - } */ + } function hook_prefs_tab($args) { if ($args != "prefFeeds") return; -- cgit v1.2.3-54-g00ecf From d806953471684c45b3ebe93de46fb4294f55ca49 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 19 Jan 2015 16:42:10 +0300 Subject: trgm: extend relative articles search interval --- plugins/af_psql_trgm/init.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins') diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php index 97187a602..559a5a71c 100644 --- a/plugins/af_psql_trgm/init.php +++ b/plugins/af_psql_trgm/init.php @@ -65,7 +65,7 @@ class Af_Psql_Trgm extends Plugin { ttrss_entries.id = ref_id AND ttrss_user_entries.owner_uid = $owner_uid AND ttrss_entries.id != $id AND - date_entered >= NOW() - INTERVAL '1 week' + date_entered >= NOW() - INTERVAL '2 weeks' ORDER BY sm DESC, date_entered DESC LIMIT 10"); -- cgit v1.2.3-54-g00ecf From 94238b143a031d731341e1e344e7032f19f397ca Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 19 Jan 2015 18:18:03 +0300 Subject: related: do not consider negative scored headlines --- plugins/af_psql_trgm/init.php | 1 + 1 file changed, 1 insertion(+) (limited to 'plugins') diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php index 559a5a71c..02a0faba3 100644 --- a/plugins/af_psql_trgm/init.php +++ b/plugins/af_psql_trgm/init.php @@ -65,6 +65,7 @@ class Af_Psql_Trgm extends Plugin { ttrss_entries.id = ref_id AND ttrss_user_entries.owner_uid = $owner_uid AND ttrss_entries.id != $id AND + score >= 0 AND date_entered >= NOW() - INTERVAL '2 weeks' ORDER BY sm DESC, date_entered DESC -- cgit v1.2.3-54-g00ecf From ed775e4e8dba0e3a527ea13b5581c1ce6ee752bc Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 31 Jan 2015 15:08:55 +0300 Subject: remove obsolete code related to version checking and tarball updater plugin --- classes/dlg.php | 47 ------ config.php-dist | 5 +- include/functions2.php | 28 ---- include/sanity_config.php | 4 +- index.php | 7 - js/tt-rss.js | 30 ---- plugins/updater/init.php | 409 --------------------------------------------- plugins/updater/updater.js | 69 -------- 8 files changed, 3 insertions(+), 596 deletions(-) delete mode 100644 plugins/updater/init.php delete mode 100644 plugins/updater/updater.js (limited to 'plugins') diff --git a/classes/dlg.php b/classes/dlg.php index 25a194bed..e3931bc3a 100644 --- a/classes/dlg.php +++ b/classes/dlg.php @@ -220,52 +220,5 @@ class Dlg extends Handler_Protected { //return; } - function newVersion() { - - $version_data = check_for_update(); - $version = $version_data['version']; - $id = $version_data['version_id']; - - if ($version && $id) { - print "
"; - - print T_sprintf("New version of Tiny Tiny RSS is available (%s).", - "$version"); - - print "
"; - - $details = "http://tt-rss.org/redmine/versions/$id"; - $download = "http://tt-rss.org/#Download"; - - print "

".__("You can update using built-in updater in the Preferences or by using update.php")."

"; - - print "
"; - print ""; - print ""; - print ""; - - } else { - print "
"; - - print "

".__("Error receiving version information or no new version available.")."

"; - - print "
"; - - print "
"; - print ""; - print "
"; - - } - print "
"; - - } - - } ?> diff --git a/config.php-dist b/config.php-dist index 0c3e92b74..d821329d0 100644 --- a/config.php-dist +++ b/config.php-dist @@ -177,9 +177,6 @@ // *** Other settings (less important) *** // *************************************** - define('CHECK_FOR_NEW_VERSION', true); - // Check for new versions of tt-rss automatically. - define('DETECT_ARTICLE_LANGUAGE', false); // Detect article language when updating feeds, presently this is only // used for hyphenation. This may increase amount of CPU time used by @@ -193,7 +190,7 @@ // if you experience weird errors and tt-rss failing to start, blank pages // after login, or content encoding errors, disable it. - define('PLUGINS', 'auth_internal, note, updater'); + define('PLUGINS', 'auth_internal, note'); // Comma-separated list of plugins to load automatically for all users. // System plugins have to be specified here. Please enable at least one // authentication plugin here (auth_*). diff --git a/include/functions2.php b/include/functions2.php index 669bbe038..4e133dde4 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -248,15 +248,6 @@ } } - if ($_SESSION["last_version_check"] + 86400 + rand(-1000, 1000) < time()) { - $new_version_details = @check_for_update(); - - $data['new_version_available'] = (int) ($new_version_details != false); - - $_SESSION["last_version_check"] = time(); - $_SESSION["version_data"] = $new_version_details; - } - return $data; } @@ -1019,25 +1010,6 @@ return $doc; } - function check_for_update() { - if (CHECK_FOR_NEW_VERSION && $_SESSION['access_level'] >= 10) { - $version_url = "http://tt-rss.org/version.php?ver=" . VERSION . - "&iid=" . sha1(SELF_URL_PATH); - - $version_data = @fetch_file_contents($version_url); - - if ($version_data) { - $version_data = json_decode($version_data, true); - if ($version_data && $version_data['version']) { - if (version_compare(VERSION_STATIC, $version_data['version']) == -1) { - return $version_data; - } - } - } - } - return false; - } - function catchupArticlesById($ids, $cmode, $owner_uid = false) { if (!$owner_uid) $owner_uid = $_SESSION["uid"]; diff --git a/include/sanity_config.php b/include/sanity_config.php index 76fba4b81..890c0c050 100644 --- a/include/sanity_config.php +++ b/include/sanity_config.php @@ -1,3 +1,3 @@ - +$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'FEED_CRYPT_KEY', 'SINGLE_USER_MODE', 'SIMPLE_UPDATE_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'PUBSUBHUBBUB_HUB', 'PUBSUBHUBBUB_ENABLED', 'SPHINX_SERVER', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SESSION_CHECK_ADDRESS', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_SERVER', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'SMTP_SECURE', 'DETECT_ARTICLE_LANGUAGE', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'LOG_DESTINATION', 'CONFIG_VERSION'); ?> diff --git a/index.php b/index.php index 058e7d8e3..309ca2e29 100644 --- a/index.php +++ b/index.php @@ -221,13 +221,6 @@ src="images/error.png" /> - - -
diff --git a/js/tt-rss.js b/js/tt-rss.js index 84f2e67b1..26749d108 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -756,15 +756,6 @@ function parse_runtime_info(data) { // console.log("RI: " + k + " => " + v); - if (k == "new_version_available") { - if (v == "1") { - Element.show(dijit.byId("newVersionIcon").domNode); - } else { - Element.hide(dijit.byId("newVersionIcon").domNode); - } - return; - } - if (k == "dep_ts" && parseInt(getInitParam("dep_ts")) > 0) { if (parseInt(getInitParam("dep_ts")) < parseInt(v) && getInitParam("reload_on_ts_change")) { window.location.reload(); @@ -968,27 +959,6 @@ function reverseHeadlineOrder() { } } -function newVersionDlg() { - try { - var query = "backend.php?op=dlg&method=newVersion"; - - if (dijit.byId("newVersionDlg")) - dijit.byId("newVersionDlg").destroyRecursive(); - - dialog = new dijit.Dialog({ - id: "newVersionDlg", - title: __("New version available!"), - style: "width: 600px", - href: query, - }); - - dialog.show(); - - } catch (e) { - exception_error("newVersionDlg", e); - } -} - function handle_rpc_json(transport, scheduled_call) { try { var reply = JSON.parse(transport.responseText); diff --git a/plugins/updater/init.php b/plugins/updater/init.php deleted file mode 100644 index 6ee018f74..000000000 --- a/plugins/updater/init.php +++ /dev/null @@ -1,409 +0,0 @@ -host = $host; - - $host->add_hook($host::HOOK_PREFS_TAB, $this); - - $host->add_command("update-self", - "update tt-rss installation to latest version", - $this); - } - - function update_self_step($step, $params, $force = false) { - // __FILE__ is in plugins/updater so we need to go one level up - $work_dir = dirname(dirname(dirname(__FILE__))); - $parent_dir = dirname($work_dir); - // Set PATH to run "which" - putenv('PATH="$PATH:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"'); - - $log = array(); - if (!is_array($params)) $params = array(); - - $stop = false; - - if (!chdir($work_dir)) { - array_push($log, "Unable to change to work directory: $work_dir"); - $stop = true; - } - - if (!$stop) { - switch ($step) { - case 0: - array_push($log, "Work directory: $work_dir"); - - if (!is_writable($work_dir) || !is_writable("$parent_dir")) { - $user = posix_getpwuid(posix_geteuid()); - $user = $user["name"]; - array_push($log, "Both tt-rss and parent directories should be writable as current user ($user)."); - $stop = true; break; - } - - if (!file_exists("$work_dir/config.php") || !file_exists("$work_dir/include/sanity_check.php")) { - array_push($log, "Work directory $work_dir doesn't look like tt-rss installation."); - $stop = true; break; - } - - if (!is_writable(sys_get_temp_dir())) { - array_push($log, "System temporary directory should be writable as current user."); - $stop = true; break; - } - - // bah, also humbug - putenv("PATH=" . getenv("PATH") . PATH_SEPARATOR . "/bin" . - PATH_SEPARATOR . "/usr/bin"); - - array_push($log, "Checking for system() call..."); - - $disabled = explode(',', ini_get('disable_functions')); - foreach ($disabled as $function) { - if ( trim($function) == 'system' ) { - array_push($log, "Can not execute commands with PHP's system() function."); - $stop = true; - } - } - - if ( $stop == true ) { - break; - } - - array_push($log, "Checking for tar..."); - - $system_rc = 0; - system("which tar >/dev/null", $system_rc); - - if ($system_rc != 0) { - array_push($log, "Could not run tar executable (RC=$system_rc)."); - $stop = true; break; - } - - array_push($log, "Checking for gunzip..."); - - $system_rc = 0; - system("which gunzip >/dev/null", $system_rc); - - if ($system_rc != 0) { - array_push($log, "Could not run gunzip executable (RC=$system_rc)."); - $stop = true; break; - } - - array_push($log, "Checking for latest version..."); - - $version_info = json_decode(fetch_file_contents("http://tt-rss.org/version.php"), - true); - - if (!is_array($version_info)) { - array_push($log, "Unable to fetch version information."); - $stop = true; break; - } - - $target_version = $version_info["version"]; - $target_dir = "$parent_dir/Tiny-Tiny-RSS-$target_version"; - - array_push($log, "Target version: $target_version"); - $params["target_version"] = $target_version; - - if (version_compare(VERSION, $target_version) != -1 && !$force) { - array_push($log, "Your Tiny Tiny RSS installation is up to date."); - $stop = true; break; - } - - if (file_exists($target_dir)) { - array_push($log, "Target directory $target_dir already exists."); - $stop = true; break; - } - - break; - case 1: - $target_version = $params["target_version"]; - -/* array_push($log, "Downloading checksums..."); - $md5sum_data = fetch_file_contents("http://tt-rss.org/download/md5sum.txt"); - - if (!$md5sum_data) { - array_push($log, "Could not download checksums."); - $stop = true; break; - } - - $md5sum_data = explode("\n", $md5sum_data); - - foreach ($md5sum_data as $line) { - $pair = explode(" ", $line); - - if ($pair[1] == "tt-rss-$target_version.tar.gz") { - $target_md5sum = $pair[0]; - break; - } - } - - if (!$target_md5sum) { - array_push($log, "Unable to locate checksum for target version."); - $stop = true; break; - } - - $params["target_md5sum"] = $target_md5sum; */ - - array_push($log, "Proceeding to download..."); - - break; - case 2: - $target_version = $params["target_version"]; - // $target_md5sum = $params["target_md5sum"]; - - array_push($log, "Downloading distribution tarball..."); - - $tarball_url = "https://github.com/gothfox/Tiny-Tiny-RSS/archive/$target_version.tar.gz"; - $data = fetch_file_contents($tarball_url); - - if (!$data) { - array_push($log, "Could not download distribution tarball ($tarball_url)."); - $stop = true; break; - } - - /* array_push($log, "Verifying tarball checksum..."); - - $test_md5sum = md5($data); - - if ($test_md5sum != $target_md5sum) { - array_push($log, "Downloaded checksum doesn't match (got $test_md5sum, expected $target_md5sum)."); - $stop = true; break; - } */ - - $tmp_file = tempnam(sys_get_temp_dir(), 'tt-rss'); - array_push($log, "Saving download to $tmp_file"); - - if (!file_put_contents($tmp_file, $data)) { - array_push($log, "Unable to save download."); - $stop = true; break; - } - - $params["tmp_file"] = $tmp_file; - - break; - case 3: - $tmp_file = $params["tmp_file"]; - $target_version = $params["target_version"]; - - if (!chdir($parent_dir)) { - array_push($log, "Unable to change into parent directory."); - $stop = true; break; - } - - array_push($log, "Extracting tarball..."); - system("tar zxf $tmp_file", $system_rc); - - if ($system_rc != 0) { - array_push($log, "Error while extracting tarball (RC=$system_rc)."); - $stop = true; break; - } - - $target_dir = "$parent_dir/Tiny-Tiny-RSS-$target_version"; - - if (!is_dir($target_dir)) { - array_push($log, "Target directory ($target_dir) not found."); - $stop = true; break; - } - - $old_dir = tmpdirname($parent_dir, "tt-rss-old"); - - array_push($log, "Renaming tt-rss directory to ".basename($old_dir)); - if (!rename($work_dir, $old_dir)) { - array_push($log, "Unable to rename tt-rss directory."); - $stop = true; break; - } - - array_push($log, "Renaming target directory..."); - if (!rename($target_dir, $work_dir)) { - array_push($log, "Unable to rename target directory."); - $stop = true; break; - } - - if (!chdir($work_dir)) { - array_push($log, "Unable to change to work directory: $work_dir"); - $stop = true; break; - } - - array_push($log, "Copying config.php..."); - if (!copy("$old_dir/config.php", "$work_dir/config.php")) { - array_push($log, "Unable to copy config.php to $work_dir."); - $stop = true; break; - } - - array_push($log, "Cleaning up..."); - unlink($tmp_file); - - array_push($log, "Fixing permissions..."); - - $directories = array( - CACHE_DIR, - CACHE_DIR . "/export", - CACHE_DIR . "/images", - CACHE_DIR . "/js", - CACHE_DIR . "/simplepie", - CACHE_DIR . "/upload", - ICONS_DIR, - LOCK_DIRECTORY); - - foreach ($directories as $dir) { - array_push($log, "-> $dir"); - chmod($dir, 0777); - } - - if (ICONS_DIR == "feed-icons") { - array_push($log, "Migrating feed icons..."); - - $icons = glob("$old_dir/feed-icons/*.ico"); - $icons_copied = 0; - - foreach ($icons as $icon) { - $icon = basename($icon); - - if (copy("$old_dir/feed-icons/$icon", "$work_dir/feed-icons/$icon")) { - ++$icons_copied; - } - } - - array_push($log, "Done; $icons_copied files copied"); - - } else { - array_push($log, "Not migrating feed icons, ICONS_DIR modified."); - } - - array_push($log, "Upgrade completed."); - array_push($log, "Your old tt-rss directory is saved at $old_dir. ". - "Please migrate locally modified files (if any) and remove it."); - array_push($log, "You might need to re-enter current directory in shell to see new files."); - - $stop = true; - break; - default: - $stop = true; - } - } - - return array("step" => $step, "stop" => $stop, "params" => $params, "log" => $log); - } - - function update_self_cli($force = false) { - $step = 0; - $stop = false; - $params = array(); - - while (!$stop) { - $rc = $this->update_self_step($step, $params, $force); - - $params = $rc['params']; - $stop = $rc['stop']; - - foreach ($rc['log'] as $line) { - _debug($line); - } - ++$step; - } - } - - function update_self($args) { - _debug("READ THE FOLLOWING BEFORE CONTINUING!"); - _debug("* It is suggested to backup your tt-rss directory first."); - _debug("* Your database will not be modified."); - _debug("* Your current tt-rss installation directory will not be modified. It will be renamed and left in the parent directory. You will be able to migrate all your customized files after update finishes."); - _debug("Type 'yes' to continue."); - - $input = read_stdin(); - - if ($input != 'yes' && $input != 'force') - exit; - - $this->update_self_cli($input == 'force'); - } - - function get_prefs_js() { - return file_get_contents(dirname(__FILE__) . "/updater.js"); - } - - function hook_prefs_tab($args) { - if ($args != "prefPrefs") return; - - if (($_SESSION["access_level"] >= 10 || SINGLE_USER_MODE) && CHECK_FOR_NEW_VERSION) { - print "
"; - - if ($_SESSION["pref_last_version_check"] + 86400 + rand(-1000, 1000) < time()) { - $_SESSION["version_data"] = @check_for_update(); - $_SESSION["pref_last_version_check"] = time(); - } - - if (is_array($_SESSION["version_data"])) { - $version = $_SESSION["version_data"]["version"]; - $version_id = $_SESSION["version_data"]["version_id"]; - print_notice(T_sprintf("New version of Tiny Tiny RSS is available (%s).", "$version")); - - $details = "http://tt-rss.org/redmine/versions/$version_id"; - - print "

"; - - print "

"; - - } else { - print_notice(__("Your Tiny Tiny RSS installation is up to date.")); - - print "

"; - - } - - print "
"; #pane - } - } - - function updateSelf() { - print_warning(__("Do not close this dialog until updating is finished.")); - - print "
"; - - print ""; - - print "
    "; - print "
  • " .__("It is suggested to backup your tt-rss directory first.") . "
    • "; - print "
  • " . __("Your database will not be modified.") . "
    • "; - print "
  • " . __("Your current tt-rss installation directory will not be modified. It will be renamed and left in the parent directory. You will be able to migrate all your customized files after update finishes.") . "
    • "; - print "
  • " . __("Ready to update.") . "
    • "; - print "
"; - - print "
"; - print ""; - print ""; - print "
"; - print "
"; - } - - function performUpdate() { - $step = (int) $_REQUEST["step"]; - $params = json_decode($_REQUEST["params"], true); - $force = (bool) $_REQUEST["force"]; - - if (($_SESSION["access_level"] >= 10 || SINGLE_USER_MODE) && CHECK_FOR_NEW_VERSION) { - print json_encode($this->update_self_step($step, $params, $force)); - } - } - - function api_version() { - return 2; - } - -} -?> diff --git a/plugins/updater/updater.js b/plugins/updater/updater.js deleted file mode 100644 index 4a1847372..000000000 --- a/plugins/updater/updater.js +++ /dev/null @@ -1,69 +0,0 @@ -function updateSelf() { - try { - var query = "backend.php?op=pluginhandler&plugin=updater&method=updateSelf"; - - if (dijit.byId("updateSelfDlg")) - dijit.byId("updateSelfDlg").destroyRecursive(); - - var dialog = new dijit.Dialog({ - id: "updateSelfDlg", - title: __("Update Tiny Tiny RSS"), - style: "width: 600px", - closable: false, - performUpdate: function(step) { - dijit.byId("self_update_start_btn").attr("disabled", true); - dijit.byId("self_update_stop_btn").attr("disabled", true); - - notify_progress("Loading, please wait...", true); - new Ajax.Request("backend.php", { - parameters: "op=pluginhandler&plugin=updater&method=performUpdate&step=" + step + - "¶ms=" + param_escape(JSON.stringify(dialog.attr("update-params"))), - onComplete: function(transport) { - try { - rv = JSON.parse(transport.responseText); - if (rv) { - notify(''); - - rv['log'].each(function(line) { - $("self_update_log").innerHTML += "
  • " + line + "
    • "; - }); - - dialog.attr("update-params", rv['params']); - - if (!rv['stop']) { - window.setTimeout("dijit.byId('updateSelfDlg').performUpdate("+(step+1)+")", 500); - } else { - dijit.byId("self_update_stop_btn").attr("disabled", false); - } - - } else { - console.log(transport.responseText); - notify_error("Received invalid data from server."); - } - - dialog.attr("updated", true); - } catch (e) { - exception_error("updateSelf/inner", e); - } - } }); - }, - close: function() { - if (dialog.attr("updated")) { - window.location.reload(); - } else { - dialog.hide(); - } - }, - start: function() { - if (prompt(__("Backup your tt-rss directory before continuing. Please type 'yes' to continue.")) == 'yes') { - dialog.performUpdate(0); - } - }, - href: query}); - - dialog.show(); - } catch (e) { - exception_error("batchSubscribe", e); - } -} - -- cgit v1.2.3-54-g00ecf From 47cdc58c6065c997b03c311fa6c1d0ebf6b19690 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 3 Feb 2015 13:31:41 +0300 Subject: af_redditimgur: add support for bullshit ajaxified imgur albums --- plugins/af_redditimgur/init.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins') diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php index e513cc6f4..a23b3527f 100644 --- a/plugins/af_redditimgur/init.php +++ b/plugins/af_redditimgur/init.php @@ -42,7 +42,7 @@ class Af_RedditImgur extends Plugin { // links to imgur pages $matches = array(); - if (preg_match("/^http:\/\/imgur.com\/([^\.\/]+$)/", $entry->getAttribute("href"), $matches)) { + if (preg_match("/^https?:\/\/imgur.com\/([^\.\/]+$)/", $entry->getAttribute("href"), $matches)) { $token = $matches[1]; @@ -77,7 +77,7 @@ class Af_RedditImgur extends Plugin { } // linked albums, ffs - if (preg_match("/^http:\/\/imgur.com\/(a|album)\/[^\.]+$/", $entry->getAttribute("href"), $matches)) { + if (preg_match("/^https?:\/\/imgur.com\/(a|album)\/[^\.]+$/", $entry->getAttribute("href"), $matches)) { $album_content = fetch_file_contents($entry->getAttribute("href"), false, false, false, false, 10); @@ -88,11 +88,11 @@ class Af_RedditImgur extends Plugin { if ($adoc) { $axpath = new DOMXPath($adoc); - $aentries = $axpath->query("//div[@class='image']//a[@href and @class='zoom']"); + $aentries = $axpath->query("//meta[@property='og:image']"); foreach ($aentries as $aentry) { $img = $doc->createElement('img'); - $img->setAttribute("src", $aentry->getAttribute("href")); + $img->setAttribute("src", $aentry->getAttribute("content")); $entry->parentNode->insertBefore($doc->createElement('br'), $entry); $br = $doc->createElement('br'); -- cgit v1.2.3-54-g00ecf