various minor style updates, add danger buttons

[tt-rss.git] / plugins / af_redditimgur / init.php

diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index 2b71a8e9dbe7200fa6966ecc9b29eeb5739494dc..9b3a999d30d864da7eea775ea9d3b980a12c9cc6 100644 (file)
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -43,9 +43,7 @@ class Af_RedditImgur extends Plugin {
                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_redditimgur\">";
 
-               print "<h3>" . __("Global settings") . "</h3>";
-
-               print_notice("Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>");
+               print "<p>" . __("Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>");
                print "<p/>";
 
                print "<input dojoType=\"dijit.form.CheckBox\" id=\"enable_readability\"
@@ -95,7 +93,7 @@ class Af_RedditImgur extends Plugin {
                                                if ($tmpdoc) {
                                                        $tmpxpath = new DOMXPath($tmpdoc);
 
-                                                       $source_meta = $tmpxpath->query("//meta[@property='og:video']")->item(0);
+                                                       $source_meta = $tmpxpath->query("//meta[@name='twitter:player:stream' and contains(@content, '.mp4')]")->item(0);
                                                        $poster_meta = $tmpxpath->query("//meta[@property='og:image' and contains(@content,'thumbs.gfycat.com')]")->item(0);
 
                                                        if ($source_meta) {
@@ -188,9 +186,13 @@ class Af_RedditImgur extends Plugin {
 
                                                        foreach ($aentries as $aentry) {
 
-                                                               if (!in_array($aentry->getAttribute("content"), $urls)) {
+                                                               $url = str_replace("?fb", "", $aentry->getAttribute("content"));
+                                                               $check_url = basename($url);
+                                                               $check_url = mb_substr($check_url, 0, strrpos($check_url, "."));
+
+                                                               if (!in_array($check_url, $urls)) {
                                                                        $img = $doc->createElement('img');
-                                                                       $img->setAttribute("src", str_replace("?fb", "", $aentry->getAttribute("content")));
+                                                                       $img->setAttribute("src", $url);
                                                                        $entry->parentNode->insertBefore($doc->createElement('br'), $entry);
 
                                                                        $br = $doc->createElement('br');
@@ -198,7 +200,7 @@ class Af_RedditImgur extends Plugin {
                                                                        $entry->parentNode->insertBefore($img, $entry);
                                                                        $entry->parentNode->insertBefore($br, $entry);
 
-                                                                       array_push($urls, $aentry->getAttribute("content"));
+                                                                       array_push($urls, $check_url);
 
                                                                        $found = true;
                                                                }
@@ -226,6 +228,8 @@ class Af_RedditImgur extends Plugin {
                        @$doc->loadHTML($article["content"]);
                        $xpath = new DOMXPath($doc);
 
+                       $content_link = $xpath->query("(//a[contains(., '[link]')])")->item(0);
+
                        $found = $this->inline_stuff($article, $doc, $xpath);
 
                        if (function_exists("curl_init") && !$found && $this->host->get($this, "enable_readability") &&
@@ -233,8 +237,6 @@ class Af_RedditImgur extends Plugin {
 
                                if (!class_exists("Readability")) require_once(dirname(dirname(__DIR__)). "/lib/readability/Readability.php");
 
-                               $content_link = $xpath->query("(//a[contains(., '[link]')])")->item(0);
-
                                if ($content_link &&
                                        strpos($content_link->getAttribute("href"), "twitter.com") === FALSE &&
                                        strpos($content_link->getAttribute("href"), "youtube.com") === FALSE &&