checkbox to sql bool related changes, some more boolean fixes

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

diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index b5b4cca346e7b6d2719bc45fc59b5af93b6f9835..82e3226a7c764c848b0cbbaa1f4731d0f1da699c 100755 (executable)
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -22,13 +22,10 @@ class Af_RedditImgur extends Plugin {
        function hook_prefs_tab($args) {
                if ($args != "prefFeeds") return;
 
-               print "<div id=\"af_redditimgur_prefs\" dojoType=\"dijit.layout.AccordionPane\" title=\"".__('af_redditimgur settings')."\">";
+               print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Reddit content settings (af_redditimgur)')."\">";
 
                $enable_readability = $this->host->get($this, "enable_readability");
-               $enable_readability_checked = $enable_readability ? "checked" : "";
-
                $enable_content_dupcheck = $this->host->get($this, "enable_content_dupcheck");
-               $enable_content_dupcheck_checked = $enable_content_dupcheck ? "checked" : "";
 
                print "<form dojoType=\"dijit.form.Form\">";
 
@@ -53,28 +50,22 @@ class Af_RedditImgur extends Plugin {
                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\"
-                       $enable_readability_checked name=\"enable_readability\">&nbsp;";
-
-               print "<label for=\"enable_readability\">" . __("Extract missing content using Readability") . "</label>";
+               print_checkbox("enable_readability", $enable_readability);
+               print "&nbsp;<label for=\"enable_readability\">" . __("Extract missing content using Readability") . "</label>";
 
                print "<br/>";
 
-               print "<input dojoType=\"dijit.form.CheckBox\" id=\"enable_content_dupcheck\"
-                       $enable_content_dupcheck_checked name=\"enable_content_dupcheck\">&nbsp;";
-
-               print "<label for=\"enable_content_dupcheck\">" . __("Enable additional duplicate checking") . "</label>";
-               print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\">".
-                       __("Save")."</button>";
-
+               print_checkbox("enable_content_dupcheck", $enable_content_dupcheck);
+               print "&nbsp;<label for=\"enable_content_dupcheck\">" . __("Enable additional duplicate checking") . "</label>";
+               print "<p>"; print_button("submit", __("Save"));
                print "</form>";
 
                print "</div>";
        }
 
        function save() {
-               $enable_readability = checkbox_to_sql_bool($_POST["enable_readability"]) == "true";
-               $enable_content_dupcheck = checkbox_to_sql_bool($_POST["enable_content_dupcheck"]) == "true";
+               $enable_readability = checkbox_to_sql_bool($_POST["enable_readability"]);
+               $enable_content_dupcheck = checkbox_to_sql_bool($_POST["enable_content_dupcheck"]);
 
                $this->host->set($this, "enable_readability", $enable_readability, false);
                $this->host->set($this, "enable_content_dupcheck", $enable_content_dupcheck);
@@ -82,9 +73,13 @@ class Af_RedditImgur extends Plugin {
                echo __("Configuration saved");
        }
 
+       /**
+        * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+        */
        private function inline_stuff($article, &$doc, $xpath, $debug = false) {
 
                $entries = $xpath->query('(//a[@href]|//img[@src])');
+               $img_entries = $xpath->query("(//img[@src])");
 
                $found = false;
 
@@ -152,6 +147,51 @@ class Af_RedditImgur extends Plugin {
                                        }
                                }
 
+                               if (!$found && preg_match("/https?:\/\/v\.redd\.it\/(.*)$/i", $entry->getAttribute("href"), $matches)) {
+
+                                       _debug("Handling as reddit inline video", $debug);
+
+                                       $img = $img_entries->item(0);
+
+                                       if ($img) {
+                                               $poster_url = $img->getAttribute("src");
+                                       } else {
+                                               $poster_url = false;
+                                       }
+
+                                       // Get original article URL from v.redd.it redirects
+                                       $source_article_url = $this->get_location($matches[0]);
+                                       _debug("Resolved ".$matches[0]." to ".$source_article_url, $debug);
+
+                                       $source_stream = false;
+
+                                       if ($source_article_url) {
+                                               $j = json_decode(fetch_file_contents($source_article_url.".json"), true);
+
+                                               if ($j) {
+                                                       foreach ($j as $listing) {
+                                                               foreach ($listing["data"]["children"] as $child) {
+                                                                       if ($child["data"]["url"] == $matches[0]) {
+                                                                               try {
+                                                                                       $source_stream = $child["data"]["media"]["reddit_video"]["fallback_url"];
+                                                                               }
+                                                                               catch (Exception $e) {
+                                                                               }
+                                                                               break 2;
+                                                                       }
+                                                               }
+                                                       }
+                                               }
+                                       }
+
+                                       if (!$source_stream) {
+                                               $source_stream = "https://v.redd.it/" . $matches[1] . "/DASH_600_K";
+                                       }
+
+                                       $this->handle_as_video($doc, $entry, $source_stream, $poster_url);
+                                       $found = 1;
+                               }
+
                                if (!$found && preg_match("/https?:\/\/(www\.)?streamable.com\//i", $entry->getAttribute("href"))) {
 
                                        _debug("Handling as Streamable", $debug);
@@ -370,7 +410,7 @@ class Af_RedditImgur extends Plugin {
                        $node = $doc->getElementsByTagName('body')->item(0);
 
                        if ($node && $found) {
-                               $article["content"] = $doc->saveXML($node);
+                               $article["content"] = $doc->saveHTML($node);
                        } else if ($content_link) {
                                $article = $this->readability($article, $content_link->getAttribute("href"), $doc, $xpath);
                        }
@@ -439,8 +479,8 @@ class Af_RedditImgur extends Plugin {
                }
        }
 
-       private function get_content_type($url, $useragent = SELF_USER_AGENT) {
-               $content_type = false;
+       private function get_header($url, $useragent = SELF_USER_AGENT, $header) {
+               $ret = false;
 
                if (function_exists("curl_init") && !defined("NO_CURL")) {
                        $ch = curl_init($url);
@@ -451,13 +491,24 @@ class Af_RedditImgur extends Plugin {
                        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("open_basedir"));
                        curl_setopt($ch, CURLOPT_USERAGENT, $useragent);
 
-                       @$result = curl_exec($ch);
-                       $content_type = curl_getinfo($ch, CURLINFO_CONTENT_TYPE);
+                       @curl_exec($ch);
+                       $ret = curl_getinfo($ch, $header);
                }
 
-               return $content_type;
+               return $ret;
+       }
+
+       private function get_content_type($url, $useragent = SELF_USER_AGENT) {
+               return $this->get_header($url, $useragent, CURLINFO_CONTENT_TYPE);
+       }
+
+       private function get_location($url, $useragent = SELF_USER_AGENT) {
+               return $this->get_header($url, $useragent, CURLINFO_EFFECTIVE_URL);
        }
 
+       /**
+        * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+        */
        private function readability($article, $url, $doc, $xpath, $debug = false) {
 
                if (!defined('NO_CURL') && function_exists("curl_init") && $this->host->get($this, "enable_readability") &&
@@ -519,4 +570,3 @@ class Af_RedditImgur extends Plugin {
                return $article;
        }
 }
-?>