Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS

diff --combined plugins/af_comics/init.php
index 4672f33564b52799b8556ec0cb582e4983a9f662,88d5378141b57b17781dbb4658eed27598d61120..0d1a49a573c4d4fa0ed47fae9c531f8020083069
--- 1/plugins/af_comics/init.php
--- 2/plugins/af_comics/init.php
+++ b/plugins/af_comics/init.php
@@@ -27,7 -27,6 +27,7 @@@ class Af_Comics extends Plugin 
                print "<li>Buni</li>
                <li>Buttersafe</li>
                <li>CSection</li>
 +              <li>Ctrl+Alt+Del</li>
                <li>Dilbert</li>
                <li>Explosm</li>
                <li>GoComics</li>
@@@ -151,29 -150,6 +151,29 @@@
                        }
                }
  
 +              if (strpos($article["link"], "cad-comic.com/cad/") !== FALSE) {
 +                      if (strpos($article["plugin_data"], "af_comics,$owner_uid:") === FALSE) {
 +
 +                              $doc = new DOMDocument();
 +                              @$doc->loadHTML(fetch_file_contents($article["link"]));
 +
 +                              $basenode = false;
 +
 +                              if ($doc) {
 +                                      $xpath = new DOMXPath($doc);
 +                                      $basenode = $xpath->query('(//img[contains(@src, "/comics/cad-")])')->item(0);
 +
 +                                      if ($basenode) {
 +                                              $article["content"] = $doc->saveXML($basenode);
 +                                              $article["plugin_data"] = "af_comics,$owner_uid:" . $article["plugin_data"];
 +                                      }
 +                              }
 +
 +                      } else if (isset($article["stored"]["content"])) {
 +                              $article["content"] = $article["stored"]["content"];
 +                      }
 +              }
 +
                if (strpos($article["guid"], "gocomics.com") !== FALSE) {
                        if (strpos($article["plugin_data"], "af_comics,$owner_uid:") === FALSE) {
                                $doc = new DOMDocument();
@@@ -264,7 -240,19 +264,19 @@@
                                                $basenode = $entry;
                                        }
  
-                                       $uninteresting = $xpath->query('(//div[@class="heading"])');
+                                       $meta = $xpath->query('(//div[@class="meta"])')->item(0);
+                                       if ($meta->parentNode) { $meta->parentNode->removeChild($meta); }
+ 
+                                       $header = $xpath->query('(//div[@class="postBody"]/h2)')->item(0);
+                                       if ($header->parentNode) { $header->parentNode->removeChild($header); }
+ 
+                                       $header = $xpath->query('(//div[@class="postBody"]/div[@class="comicPost"])')->item(0);
+                                       if ($header->parentNode) { $header->parentNode->removeChild($header); }
+ 
+                                       $avatar = $xpath->query('(//div[@class="avatar"]//img)')->item(0);
+                                       $basenode->insertBefore($avatar, $basenode->firstChild);
+ 
+                                       $uninteresting = $xpath->query('(//div[@class="avatar"])');
                                        foreach ($uninteresting as $i) {
                                                $i->parentNode->removeChild($i);
                                        }