Use 'saveHTML' when generating HTML from a DOMDocument.

[tt-rss.git] / plugins / af_comics / filters / af_comics_cad.php

diff --git a/plugins/af_comics/filters/af_comics_cad.php b/plugins/af_comics/filters/af_comics_cad.php
index fcc9078197360b3bc0efe5f14d98b279d0fe742f..d2eb38cafce697ce589ac526cfe8200033139753 100644 (file)
--- a/plugins/af_comics/filters/af_comics_cad.php
+++ b/plugins/af_comics/filters/af_comics_cad.php
@@ -6,28 +6,29 @@ class Af_Comics_Cad extends Af_ComicFilter {
        }
 
        function process(&$article) {
-               $owner_uid = $article["owner_uid"];
+               if (strpos($article["link"], "cad-comic.com") !== FALSE) {
+                       if (strpos($article["title"], "News:") === FALSE) {
 
-               if (strpos($article["link"], "cad-comic.com/cad/") !== FALSE) {
-                       if (strpos($article["title"], "News:") === FALSE && strpos($article["plugin_data"], "af_comics,$owner_uid:") === FALSE) {
+                               global $fetch_last_error_content;
 
                                $doc = new DOMDocument();
-                               @$doc->loadHTML(fetch_file_contents($article["link"]));
 
-                               $basenode = false;
+                               $res = fetch_file_contents($article["link"], false, false, false,
+                                       false, false, 0,
+                                       "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:50.0) Gecko/20100101 Firefox/50.0");
 
-                               if ($doc) {
+                               if (!$res && $fetch_last_error_content)
+                                       $res = $fetch_last_error_content;
+
+                               if (@$doc->loadHTML($res)) {
                                        $xpath = new DOMXPath($doc);
-                                       $basenode = $xpath->query('(//img[contains(@src, "/comics/cad-")])')->item(0);
+                                       $basenode = $xpath->query('//div[@class="comicpage"]/a/img')->item(0);
 
                                        if ($basenode) {
-                                               $article["content"] = $doc->saveXML($basenode);
-                                               $article["plugin_data"] = "af_comics,$owner_uid:" . $article["plugin_data"];
+                                               $article["content"] = $doc->saveHTML($basenode);
                                        }
                                }
 
-                       } else if (isset($article["stored"]["content"])) {
-                               $article["content"] = $article["stored"]["content"];
                        }
 
                        return true;
@@ -36,4 +37,3 @@ class Af_Comics_Cad extends Af_ComicFilter {
                return false;
        }
 }
-?>