codysnider / tt-rss

plugins/af_comics/filters/af_comics_explosm.php

Indentation +17 added lines, -17 removed lines

@@ -1,28 +1,28 @@
 <?php
 class Af_Comics_Explosm extends Af_ComicFilter {
 
-	public function supported() {
-		return array("Cyanide and Happiness");
-	}
+    public function supported() {
+        return array("Cyanide and Happiness");
+    }
 
-	public function process(&$article) {
+    public function process(&$article) {
 
-		if (strpos($article["link"], "explosm.net/comics") !== false) {
+        if (strpos($article["link"], "explosm.net/comics") !== false) {
 
-				$doc = new DOMDocument();
+                $doc = new DOMDocument();
 
-				if (@$doc->loadHTML(fetch_file_contents($article["link"]))) {
-					$xpath = new DOMXPath($doc);
-					$basenode = $xpath->query('(//img[@id="main-comic"])')->item(0);
+                if (@$doc->loadHTML(fetch_file_contents($article["link"]))) {
+                    $xpath = new DOMXPath($doc);
+                    $basenode = $xpath->query('(//img[@id="main-comic"])')->item(0);
 
-					if ($basenode) {
-						$article["content"] = $doc->saveHTML($basenode);
-					}
-				}
+                    if ($basenode) {
+                        $article["content"] = $doc->saveHTML($basenode);
+                    }
+                }
 
-			return true;
-		}
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 }

plugins/af_comics/filters/af_comics_dilbert.php

Indentation +50 added lines, -50 removed lines

@@ -2,72 +2,72 @@
 
 class Af_Comics_Dilbert extends Af_ComicFilter {
 
-	public function supported() {
-		return array("Dilbert");
-	}
+    public function supported() {
+        return array("Dilbert");
+    }
 
-	public function process(&$article) {
-		if (strpos($article["link"], "dilbert.com") !== false ||
-			strpos($article["link"], "/DilbertDailyStrip") !== false) {
+    public function process(&$article) {
+        if (strpos($article["link"], "dilbert.com") !== false ||
+            strpos($article["link"], "/DilbertDailyStrip") !== 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");
+                $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");
 
-				global $fetch_last_error_content;
+                global $fetch_last_error_content;
 
-				if (!$res && $fetch_last_error_content)
-					$res = $fetch_last_error_content;
+                if (!$res && $fetch_last_error_content)
+                    $res = $fetch_last_error_content;
 
-				$doc = new DOMDocument();
+                $doc = new DOMDocument();
 
-				if (@$doc->loadHTML($res)) {
-					$xpath = new DOMXPath($doc);
+                if (@$doc->loadHTML($res)) {
+                    $xpath = new DOMXPath($doc);
 
-					// Get the image container
-					$basenode = $xpath->query('(//div[@class="img-comic-container"]/a[@class="img-comic-link"])')->item(0);
+                    // Get the image container
+                    $basenode = $xpath->query('(//div[@class="img-comic-container"]/a[@class="img-comic-link"])')->item(0);
 
-					// Get the comic title
-					$comic_title = $xpath->query('(//span[@class="comic-title-name"])')->item(0)->textContent;
+                    // Get the comic title
+                    $comic_title = $xpath->query('(//span[@class="comic-title-name"])')->item(0)->textContent;
 
-					// Get tags from the article
-					$matches = $xpath->query('(//p[contains(@class, "comic-tags")][1]//a)');
-					$tags = array();
+                    // Get tags from the article
+                    $matches = $xpath->query('(//p[contains(@class, "comic-tags")][1]//a)');
+                    $tags = array();
 
-					foreach ($matches as $tag) {
-						// Only strings starting with a number sign are considered tags
-						if ( substr($tag->textContent, 0, 1) == '#' ) {
-							$tags[] = mb_strtolower(substr($tag->textContent, 1), 'utf-8');
-						}
-					}
+                    foreach ($matches as $tag) {
+                        // Only strings starting with a number sign are considered tags
+                        if ( substr($tag->textContent, 0, 1) == '#' ) {
+                            $tags[] = mb_strtolower(substr($tag->textContent, 1), 'utf-8');
+                        }
+                    }
 
-					// Get the current comics transcript and set it
-					// as the title so it will be visible on mousover
-					$transcript = $xpath->query('(//div[starts-with(@id, "js-toggle-transcript-")]//p)')->item(0);
-					if ($transcript) {
-						$basenode->setAttribute("title", $transcript->textContent);
-					}
+                    // Get the current comics transcript and set it
+                    // as the title so it will be visible on mousover
+                    $transcript = $xpath->query('(//div[starts-with(@id, "js-toggle-transcript-")]//p)')->item(0);
+                    if ($transcript) {
+                        $basenode->setAttribute("title", $transcript->textContent);
+                    }
 
-					if ($basenode) {
-						$article["content"] = $doc->saveHTML($basenode);
-					}
+                    if ($basenode) {
+                        $article["content"] = $doc->saveHTML($basenode);
+                    }
 
-					// Add comic title to article type if not empty (mostly Sunday strips)
-					if ($comic_title) {
-						$article["title"] = $article["title"] . " - " . $comic_title;
-					}
+                    // Add comic title to article type if not empty (mostly Sunday strips)
+                    if ($comic_title) {
+                        $article["title"] = $article["title"] . " - " . $comic_title;
+                    }
 
-					if (!empty($tags)) {
-						// Ignore existing tags and just replace them all
-						$article["tags"] = array_unique($tags);
-					}
+                    if (!empty($tags)) {
+                        // Ignore existing tags and just replace them all
+                        $article["tags"] = array_unique($tags);
+                    }
 
-				}
+                }
 
-			return true;
-		}
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 }
 ?>

plugins/af_comics/filters/af_comics_cad.php

Indentation +25 added lines, -25 removed lines

@@ -1,39 +1,39 @@
 <?php
 class Af_Comics_Cad extends Af_ComicFilter {
 
-	public function supported() {
-		return array("Ctrl+Alt+Del");
-	}
+    public function supported() {
+        return array("Ctrl+Alt+Del");
+    }
 
-	public function process(&$article) {
-		if (strpos($article["link"], "cad-comic.com") !== false) {
-			if (strpos($article["title"], "News:") === false) {
+    public function process(&$article) {
+        if (strpos($article["link"], "cad-comic.com") !== false) {
+            if (strpos($article["title"], "News:") === false) {
 
-				global $fetch_last_error_content;
+                global $fetch_last_error_content;
 
-				$doc = new DOMDocument();
+                $doc = new DOMDocument();
 
-				$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");
+                $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 (!$res && $fetch_last_error_content)
-					$res = $fetch_last_error_content;
+                if (!$res && $fetch_last_error_content)
+                    $res = $fetch_last_error_content;
 
-				if (@$doc->loadHTML($res)) {
-					$xpath = new DOMXPath($doc);
-					$basenode = $xpath->query('//div[@class="comicpage"]/a/img')->item(0);
+                if (@$doc->loadHTML($res)) {
+                    $xpath = new DOMXPath($doc);
+                    $basenode = $xpath->query('//div[@class="comicpage"]/a/img')->item(0);
 
-					if ($basenode) {
-						$article["content"] = $doc->saveHTML($basenode);
-					}
-				}
+                    if ($basenode) {
+                        $article["content"] = $doc->saveHTML($basenode);
+                    }
+                }
 
-			}
+            }
 
-			return true;
-		}
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 }

plugins/af_comics/filters/af_comics_comicclass.php

Indentation +22 added lines, -22 removed lines

@@ -1,34 +1,34 @@
 <?php
 class Af_Comics_ComicClass extends Af_ComicFilter {
 
-	public function supported() {
-		return array("Loading Artist");
-	}
+    public function supported() {
+        return array("Loading Artist");
+    }
 
-	public function process(&$article) {
-		if (strpos($article["guid"], "loadingartist.com") !== false) {
+    public function process(&$article) {
+        if (strpos($article["guid"], "loadingartist.com") !== false) {
 
-				// lol at people who block clients by user agent
-				// oh noes my ad revenue Q_Q
+                // lol at people who block clients by user agent
+                // oh noes my ad revenue Q_Q
 
-				$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)");
+                $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)");
 
-				$doc = new DOMDocument();
+                $doc = new DOMDocument();
 
-				if (@$doc->loadHTML($res)) {
-					$xpath = new DOMXPath($doc);
-					$basenode = $xpath->query('//div[@class="comic"]')->item(0);
+                if (@$doc->loadHTML($res)) {
+                    $xpath = new DOMXPath($doc);
+                    $basenode = $xpath->query('//div[@class="comic"]')->item(0);
 
-					if ($basenode) {
-						$article["content"] = $doc->saveHTML($basenode);
-					}
-				}
+                    if ($basenode) {
+                        $article["content"] = $doc->saveHTML($basenode);
+                    }
+                }
 
-			 return true;
-		}
+                return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 }

plugins/af_comics/filters/af_comics_pvp.php

Indentation +20 added lines, -20 removed lines

@@ -1,31 +1,31 @@
 <?php
 class Af_Comics_Pvp extends Af_ComicFilter {
 
-	public function supported() {
-		return array("PvP Online");
-	}
+    public function supported() {
+        return array("PvP Online");
+    }
 
-	public function process(&$article) {
-		if (strpos($article["guid"], "pvponline.com") !== false) {
+    public function process(&$article) {
+        if (strpos($article["guid"], "pvponline.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)");
+                $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)");
 
-				$doc = new DOMDocument();
+                $doc = new DOMDocument();
 
-				if (@$doc->loadHTML($res)) {
-					$xpath = new DOMXPath($doc);
-					$basenode = $xpath->query('//section[@class="comic-art"]')->item(0);
+                if (@$doc->loadHTML($res)) {
+                    $xpath = new DOMXPath($doc);
+                    $basenode = $xpath->query('//section[@class="comic-art"]')->item(0);
 
-					if ($basenode) {
-						$article["content"] = $doc->saveHTML($basenode);
-					}
-				}
+                    if ($basenode) {
+                        $article["content"] = $doc->saveHTML($basenode);
+                    }
+                }
 
-			 return true;
-		}
+                return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 }

plugins/af_comics/filters/af_comics_pa.php

Indentation +45 added lines, -45 removed lines

@@ -1,67 +1,67 @@
 <?php
 class Af_Comics_Pa extends Af_ComicFilter {
 
-	public function supported() {
-		return array("Penny Arcade");
-	}
+    public function supported() {
+        return array("Penny Arcade");
+    }
 
-	public function process(&$article) {
-		if (strpos($article["link"], "penny-arcade.com") !== false && strpos($article["title"], "Comic:") !== false) {
+    public function process(&$article) {
+        if (strpos($article["link"], "penny-arcade.com") !== false && strpos($article["title"], "Comic:") !== false) {
 
-				$doc = new DOMDocument();
+                $doc = new DOMDocument();
 
-				if ($doc->loadHTML(fetch_file_contents($article["link"]))) {
-					$xpath = new DOMXPath($doc);
-					$basenode = $xpath->query('(//div[@id="comicFrame"])')->item(0);
+                if ($doc->loadHTML(fetch_file_contents($article["link"]))) {
+                    $xpath = new DOMXPath($doc);
+                    $basenode = $xpath->query('(//div[@id="comicFrame"])')->item(0);
 
-					if ($basenode) {
-						$article["content"] = $doc->saveHTML($basenode);
-					}
-				}
+                    if ($basenode) {
+                        $article["content"] = $doc->saveHTML($basenode);
+                    }
+                }
 
-			return true;
-		}
+            return true;
+        }
 
-		if (strpos($article["link"], "penny-arcade.com") !== false && strpos($article["title"], "News Post:") !== false) {
-				$doc = new DOMDocument();
+        if (strpos($article["link"], "penny-arcade.com") !== false && strpos($article["title"], "News Post:") !== false) {
+                $doc = new DOMDocument();
 
-				if ($doc->loadHTML(fetch_file_contents($article["link"]))) {
-					$xpath = new DOMXPath($doc);
-					$entries = $xpath->query('(//div[@class="post"])');
+                if ($doc->loadHTML(fetch_file_contents($article["link"]))) {
+                    $xpath = new DOMXPath($doc);
+                    $entries = $xpath->query('(//div[@class="post"])');
 
-					$basenode = false;
+                    $basenode = false;
 
-					foreach ($entries as $entry) {
-						$basenode = $entry;
-					}
+                    foreach ($entries as $entry) {
+                        $basenode = $entry;
+                    }
 
-					$meta = $xpath->query('(//div[@class="meta"])')->item(0);
-					if ($meta->parentNode) { $meta->parentNode->removeChild($meta); }
+                    $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"]/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); }
+                    $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);
+                    $avatar = $xpath->query('(//div[@class="avatar"]//img)')->item(0);
 
-					if ($basenode)
-						$basenode->insertBefore($avatar, $basenode->firstChild);
+                    if ($basenode)
+                        $basenode->insertBefore($avatar, $basenode->firstChild);
 
-					$uninteresting = $xpath->query('(//div[@class="avatar"])');
-					foreach ($uninteresting as $i) {
-						$i->parentNode->removeChild($i);
-					}
+                    $uninteresting = $xpath->query('(//div[@class="avatar"])');
+                    foreach ($uninteresting as $i) {
+                        $i->parentNode->removeChild($i);
+                    }
 
-					if ($basenode){
-						$article["content"] = $doc->saveHTML($basenode);
-					}
-				}
+                    if ($basenode){
+                        $article["content"] = $doc->saveHTML($basenode);
+                    }
+                }
 
-			return true;
-		}
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 }

plugins/af_comics/filters/af_comics_comicpress.php

Indentation +46 added lines, -46 removed lines

@@ -1,64 +1,64 @@
 <?php
 class Af_Comics_ComicPress extends Af_ComicFilter {
 
-	public function supported() {
-		return array("Buni", "Buttersafe", "Happy Jar", "CSection",
-			"Extra Fabulous Comics", "Nedroid", "Stonetoss");
-	}
+    public function supported() {
+        return array("Buni", "Buttersafe", "Happy Jar", "CSection",
+            "Extra Fabulous Comics", "Nedroid", "Stonetoss");
+    }
 
-	public function process(&$article) {
-		if (strpos($article["guid"], "bunicomic.com") !== false ||
-				strpos($article["guid"], "buttersafe.com") !== false ||
-				strpos($article["guid"], "extrafabulouscomics.com") !== false ||
-				strpos($article["guid"], "happyjar.com") !== false ||
-				strpos($article["guid"], "nedroid.com") !== false ||
-				strpos($article["guid"], "stonetoss.com") !== false ||
-				strpos($article["guid"], "csectioncomics.com") !== false) {
+    public function process(&$article) {
+        if (strpos($article["guid"], "bunicomic.com") !== false ||
+                strpos($article["guid"], "buttersafe.com") !== false ||
+                strpos($article["guid"], "extrafabulouscomics.com") !== false ||
+                strpos($article["guid"], "happyjar.com") !== false ||
+                strpos($article["guid"], "nedroid.com") !== false ||
+                strpos($article["guid"], "stonetoss.com") !== false ||
+                strpos($article["guid"], "csectioncomics.com") !== false) {
 
-				// lol at people who block clients by user agent
-				// oh noes my ad revenue Q_Q
+                // lol at people who block clients by user agent
+                // oh noes my ad revenue Q_Q
 
-				$res = fetch_file_contents(["url" => $article["link"],
-					"useragent" => "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)"]);
+                $res = fetch_file_contents(["url" => $article["link"],
+                    "useragent" => "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)"]);
 
-				$doc = new DOMDocument();
+                $doc = new DOMDocument();
 
-				if (@$doc->loadHTML($res)) {
-					$xpath = new DOMXPath($doc);
-					$basenode = $xpath->query('//div[@id="comic"]')->item(0);
+                if (@$doc->loadHTML($res)) {
+                    $xpath = new DOMXPath($doc);
+                    $basenode = $xpath->query('//div[@id="comic"]')->item(0);
 
-					if ($basenode) {
-						$article["content"] = $doc->saveHTML($basenode);
-						return true;
-					}
+                    if ($basenode) {
+                        $article["content"] = $doc->saveHTML($basenode);
+                        return true;
+                    }
 
-					// buni-specific
-					$webtoon_link = $xpath->query("//a[contains(@href,'www.webtoons.com')]")->item(0);
+                    // buni-specific
+                    $webtoon_link = $xpath->query("//a[contains(@href,'www.webtoons.com')]")->item(0);
 
-					if ($webtoon_link) {
+                    if ($webtoon_link) {
 
-						$res = fetch_file_contents(["url" => $webtoon_link->getAttribute("href"),
-							"useragent" => "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)"]);
+                        $res = fetch_file_contents(["url" => $webtoon_link->getAttribute("href"),
+                            "useragent" => "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)"]);
 
-						if (@$doc->loadHTML($res)) {
-							$xpath = new DOMXPath($doc);
-							$basenode = $xpath->query('//div[@id="_viewerBox"]')->item(0);
+                        if (@$doc->loadHTML($res)) {
+                            $xpath = new DOMXPath($doc);
+                            $basenode = $xpath->query('//div[@id="_viewerBox"]')->item(0);
 
-							if ($basenode) {
-								$imgs = $xpath->query("//img[@data-url]", $basenode);
+                            if ($basenode) {
+                                $imgs = $xpath->query("//img[@data-url]", $basenode);
 
-								foreach ($imgs as $img) {
-									$img->setAttribute("src", $img->getAttribute("data-url"));
-								}
+                                foreach ($imgs as $img) {
+                                    $img->setAttribute("src", $img->getAttribute("data-url"));
+                                }
 
-								$article["content"] = $doc->saveHTML($basenode);
-								return true;
-							}
-						}
-					}
-				}
-		}
+                                $article["content"] = $doc->saveHTML($basenode);
+                                return true;
+                            }
+                        }
+                    }
+                }
+        }
 
-		return false;
-	}
+        return false;
+    }
 }

plugins/af_unburn/init.php

Indentation +57 added lines, -57 removed lines

@@ -1,84 +1,84 @@
 <?php
 class Af_Unburn extends Plugin {
-	private $host;
+    private $host;
 
-	public function about() {
-		return array(1.0,
-			"Resolves feedburner and similar feed redirector URLs (requires CURL)",
-			"fox");
-	}
+    public function about() {
+        return array(1.0,
+            "Resolves feedburner and similar feed redirector URLs (requires CURL)",
+            "fox");
+    }
 
-	public function flags() {
-		return array("needs_curl" => true);
-	}
+    public function flags() {
+        return array("needs_curl" => true);
+    }
 
-	public function init($host) {
-		$this->host = $host;
+    public function init($host) {
+        $this->host = $host;
 
-		$host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
-	}
+        $host->add_hook($host::HOOK_ARTICLE_FILTER, $this);
+    }
 
-	public function hook_article_filter($article) {
-		$owner_uid = $article["owner_uid"];
+    public function hook_article_filter($article) {
+        $owner_uid = $article["owner_uid"];
 
-		if (defined('NO_CURL') || !function_exists("curl_init") || ini_get("open_basedir"))
-			return $article;
+        if (defined('NO_CURL') || !function_exists("curl_init") || ini_get("open_basedir"))
+            return $article;
 
-		if ((strpos($article["link"], "feedproxy.google.com") !== false ||
-		  		strpos($article["link"], "/~r/") !== false ||
-				strpos($article["link"], "feedsportal.com") !== false)) {
+        if ((strpos($article["link"], "feedproxy.google.com") !== false ||
+                  strpos($article["link"], "/~r/") !== false ||
+                strpos($article["link"], "feedsportal.com") !== false)) {
 
-				$ch = curl_init($article["link"]);
+                $ch = curl_init($article["link"]);
 
-				curl_setopt($ch, CURLOPT_TIMEOUT, 5);
-				curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-				curl_setopt($ch, CURLOPT_HEADER, true);
-				curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-				curl_setopt($ch, CURLOPT_NOBODY, true);
-				curl_setopt($ch, CURLOPT_USERAGENT, SELF_USER_AGENT);
+                curl_setopt($ch, CURLOPT_TIMEOUT, 5);
+                curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+                curl_setopt($ch, CURLOPT_HEADER, true);
+                curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+                curl_setopt($ch, CURLOPT_NOBODY, true);
+                curl_setopt($ch, CURLOPT_USERAGENT, SELF_USER_AGENT);
 
-				if (defined('_CURL_HTTP_PROXY')) {
-					curl_setopt($ch, CURLOPT_PROXY, _CURL_HTTP_PROXY);
-				}
+                if (defined('_CURL_HTTP_PROXY')) {
+                    curl_setopt($ch, CURLOPT_PROXY, _CURL_HTTP_PROXY);
+                }
 
-				@curl_exec($ch);
+                @curl_exec($ch);
 
-				$real_url = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
+                $real_url = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
 
-				curl_close($ch);
+                curl_close($ch);
 
-				if ($real_url) {
-					/* remove the rest of it */
+                if ($real_url) {
+                    /* remove the rest of it */
 
-					$query = parse_url($real_url, PHP_URL_QUERY);
+                    $query = parse_url($real_url, PHP_URL_QUERY);
 
-					if ($query && strpos($query, "utm_source") !== false) {
-						$args = array();
-						parse_str($query, $args);
+                    if ($query && strpos($query, "utm_source") !== false) {
+                        $args = array();
+                        parse_str($query, $args);
 
-						foreach (array("utm_source", "utm_medium", "utm_campaign") as $param) {
-							if (isset($args[$param])) unset($args[$param]);
-						}
+                        foreach (array("utm_source", "utm_medium", "utm_campaign") as $param) {
+                            if (isset($args[$param])) unset($args[$param]);
+                        }
 
-						$new_query = http_build_query($args);
+                        $new_query = http_build_query($args);
 
-						if ($new_query != $query) {
-							$real_url = str_replace("?$query", "?$new_query", $real_url);
-						}
-					}
+                        if ($new_query != $query) {
+                            $real_url = str_replace("?$query", "?$new_query", $real_url);
+                        }
+                    }
 
-					$real_url = preg_replace("/\?$/", "", $real_url);
+                    $real_url = preg_replace("/\?$/", "", $real_url);
 
-					$article["plugin_data"] = "unburn,$owner_uid:" . $article["plugin_data"];
-					$article["link"] = $real_url;
-				}
-		}
+                    $article["plugin_data"] = "unburn,$owner_uid:" . $article["plugin_data"];
+                    $article["link"] = $real_url;
+                }
+        }
 
-		return $article;
-	}
+        return $article;
+    }
 
-	public function api_version() {
-		return 2;
-	}
+    public function api_version() {
+        return 2;
+    }
 
 }

Braces +6 added lines, -3 removed lines

@@ -21,8 +21,9 @@ 
 	public function hook_article_filter($article) {
 		$owner_uid = $article["owner_uid"];
 
-		if (defined('NO_CURL') || !function_exists("curl_init") || ini_get("open_basedir"))
-			return $article;
+		if (defined('NO_CURL') || !function_exists("curl_init") || ini_get("open_basedir")) {
+					return $article;
+		}
 
 		if ((strpos($article["link"], "feedproxy.google.com") !== false ||
 		  		strpos($article["link"], "/~r/") !== false ||
@@ -57,7 +58,9 @@ 
 						parse_str($query, $args);
 
 						foreach (array("utm_source", "utm_medium", "utm_campaign") as $param) {
-							if (isset($args[$param])) unset($args[$param]);
+							if (isset($args[$param])) {
+							    unset($args[$param]);
+							}
 						}
 
 						$new_query = http_build_query($args);

plugins/af_redditimgur/init.php

Indentation +371 added lines, -371 removed lines

@@ -1,42 +1,42 @@ 
 <?php
 class Af_RedditImgur extends Plugin {
 
-	/* @var PluginHost $host */
-	private $host;
+    /* @var PluginHost $host */
+    private $host;
 
-	public function about() {
-		return array(1.0,
-			"Inline images (and other content) in Reddit RSS feeds",
-			"fox");
-	}
+    public function about() {
+        return array(1.0,
+            "Inline images (and other content) in Reddit RSS feeds",
+            "fox");
+    }
 
-	public function flags() {
-		return array("needs_curl" => true);
-	}
+    public function flags() {
+        return array("needs_curl" => true);
+    }
 
-	public function init($host) {
-		$this->host = $host;
+    public 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_ARTICLE_FILTER, $this);
+        $host->add_hook($host::HOOK_PREFS_TAB, $this);
+    }
 
-	public function hook_prefs_tab($args) {
-		if ($args != "prefFeeds") return;
+    public function hook_prefs_tab($args) {
+        if ($args != "prefFeeds") return;
 
-		print "<div dojoType=\"dijit.layout.AccordionPane\"
+        print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>extension</i> ".__('Reddit content settings (af_redditimgur)')."\">";
 
-		$enable_readability = $this->host->get($this, "enable_readability");
-		$enable_content_dupcheck = $this->host->get($this, "enable_content_dupcheck");
+        $enable_readability = $this->host->get($this, "enable_readability");
+        $enable_content_dupcheck = $this->host->get($this, "enable_content_dupcheck");
 
-		if (version_compare(PHP_VERSION, '5.6.0', '<')) {
-			print_error("Readability requires PHP version 5.6.");
-		}
+        if (version_compare(PHP_VERSION, '5.6.0', '<')) {
+            print_error("Readability requires PHP version 5.6.");
+        }
 
-		print "<form dojoType='dijit.form.Form'>";
+        print "<form dojoType='dijit.form.Form'>";
 
-		print "<script type='dojo/method' event='onSubmit' args='evt'>
+        print "<script type='dojo/method' event='onSubmit' args='evt'>
 			evt.preventDefault();
 			if (this.validate()) {
 				console.log(dojo.objectToQuery(this.getValues()));
@@ -50,235 +50,235 @@ 
 			}
 			</script>";
 
-		print_hidden("op", "pluginhandler");
-		print_hidden("method", "save");
-		print_hidden("plugin", "af_redditimgur");
+        print_hidden("op", "pluginhandler");
+        print_hidden("method", "save");
+        print_hidden("plugin", "af_redditimgur");
 
-		print "<fieldset class='narrow'>";
-		print "<label class='checkbox'>";
-		print_checkbox("enable_readability", $enable_readability);
-		print " " . __("Extract missing content using Readability (requires af_readability)") . "</label>";
-		print "</fieldset>";
+        print "<fieldset class='narrow'>";
+        print "<label class='checkbox'>";
+        print_checkbox("enable_readability", $enable_readability);
+        print " " . __("Extract missing content using Readability (requires af_readability)") . "</label>";
+        print "</fieldset>";
 
-		print "<fieldset class='narrow'>";
-		print "<label class='checkbox'>";
-		print_checkbox("enable_content_dupcheck", $enable_content_dupcheck);
-		print " " . __("Enable additional duplicate checking") . "</label>";
-		print "</fieldset>";
+        print "<fieldset class='narrow'>";
+        print "<label class='checkbox'>";
+        print_checkbox("enable_content_dupcheck", $enable_content_dupcheck);
+        print " " . __("Enable additional duplicate checking") . "</label>";
+        print "</fieldset>";
 
-		print_button("submit", __("Save"), 'class="alt-primary"');
-		print "</form>";
+        print_button("submit", __("Save"), 'class="alt-primary"');
+        print "</form>";
 
-		print "</div>";
-	}
+        print "</div>";
+    }
 
-	public function save() {
-		$enable_readability = checkbox_to_sql_bool($_POST["enable_readability"]);
-		$enable_content_dupcheck = checkbox_to_sql_bool($_POST["enable_content_dupcheck"]);
+    public function save() {
+        $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);
+        $this->host->set($this, "enable_readability", $enable_readability, false);
+        $this->host->set($this, "enable_content_dupcheck", $enable_content_dupcheck);
 
-		echo __("Configuration saved");
-	}
+        echo __("Configuration saved");
+    }
 
-	/**
-	 * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-	 */
-	private function inline_stuff($article, &$doc, $xpath) {
+    /**
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    private function inline_stuff($article, &$doc, $xpath) {
 
-		$entries = $xpath->query('(//a[@href]|//img[@src])');
-		$img_entries = $xpath->query("(//img[@src])");
+        $entries = $xpath->query('(//a[@href]|//img[@src])');
+        $img_entries = $xpath->query("(//img[@src])");
 
-		$found = false;
-		//$debug = 1;
+        $found = false;
+        //$debug = 1;
 
-		foreach ($entries as $entry) {
-			if ($entry->hasAttribute("href") && strpos($entry->getAttribute("href"), "reddit.com") === false) {
+        foreach ($entries as $entry) {
+            if ($entry->hasAttribute("href") && strpos($entry->getAttribute("href"), "reddit.com") === false) {
 
-				Debug::log("processing href: " . $entry->getAttribute("href"), Debug::$LOG_VERBOSE);
+                Debug::log("processing href: " . $entry->getAttribute("href"), Debug::$LOG_VERBOSE);
 
-				$matches = array();
+                $matches = array();
 
-				if (!$found && preg_match("/^https?:\/\/twitter.com\/(.*?)\/status\/(.*)/", $entry->getAttribute("href"), $matches)) {
-					Debug::log("handling as twitter: " . $matches[1] . " " . $matches[2], Debug::$LOG_VERBOSE);
+                if (!$found && preg_match("/^https?:\/\/twitter.com\/(.*?)\/status\/(.*)/", $entry->getAttribute("href"), $matches)) {
+                    Debug::log("handling as twitter: " . $matches[1] . " " . $matches[2], Debug::$LOG_VERBOSE);
 
-					$oembed_result = fetch_file_contents("https://publish.twitter.com/oembed?url=" . urlencode($entry->getAttribute("href")));
+                    $oembed_result = fetch_file_contents("https://publish.twitter.com/oembed?url=" . urlencode($entry->getAttribute("href")));
 
-					if ($oembed_result) {
-						$oembed_result = json_decode($oembed_result, true);
+                    if ($oembed_result) {
+                        $oembed_result = json_decode($oembed_result, true);
 
-						if ($oembed_result && isset($oembed_result["html"])) {
+                        if ($oembed_result && isset($oembed_result["html"])) {
 
-							$tmp = new DOMDocument();
-							if ($tmp->loadHTML('<?xml encoding="utf-8" ?>' . $oembed_result["html"])) {
-								$p = $doc->createElement("p");
+                            $tmp = new DOMDocument();
+                            if ($tmp->loadHTML('<?xml encoding="utf-8" ?>' . $oembed_result["html"])) {
+                                $p = $doc->createElement("p");
 
-								$p->appendChild($doc->importNode(
-									$tmp->getElementsByTagName("blockquote")->item(0), true));
+                                $p->appendChild($doc->importNode(
+                                    $tmp->getElementsByTagName("blockquote")->item(0), true));
 
-								$br = $doc->createElement('br');
-								$entry->parentNode->insertBefore($p, $entry);
-								$entry->parentNode->insertBefore($br, $entry);
+                                $br = $doc->createElement('br');
+                                $entry->parentNode->insertBefore($p, $entry);
+                                $entry->parentNode->insertBefore($br, $entry);
 
-								$found = 1;
-							}
-						}
-					}
-				}
+                                $found = 1;
+                            }
+                        }
+                    }
+                }
 
-				if (!$found && preg_match("/\.gfycat.com\/([a-z]+)?(\.[a-z]+)$/i", $entry->getAttribute("href"), $matches)) {
-					$entry->setAttribute("href", "http://www.gfycat.com/".$matches[1]);
-				}
+                if (!$found && preg_match("/\.gfycat.com\/([a-z]+)?(\.[a-z]+)$/i", $entry->getAttribute("href"), $matches)) {
+                    $entry->setAttribute("href", "http://www.gfycat.com/".$matches[1]);
+                }
 
-				if (!$found && preg_match("/https?:\/\/(www\.)?gfycat.com\/([a-z]+)$/i", $entry->getAttribute("href"), $matches)) {
+                if (!$found && preg_match("/https?:\/\/(www\.)?gfycat.com\/([a-z]+)$/i", $entry->getAttribute("href"), $matches)) {
 
-					Debug::log("Handling as Gfycat", Debug::$LOG_VERBOSE);
+                    Debug::log("Handling as Gfycat", Debug::$LOG_VERBOSE);
 
-					$source_stream = 'https://giant.gfycat.com/' . $matches[2] . '.mp4';
-					$poster_url = 'https://thumbs.gfycat.com/' . $matches[2] . '-mobile.jpg';
+                    $source_stream = 'https://giant.gfycat.com/' . $matches[2] . '.mp4';
+                    $poster_url = 'https://thumbs.gfycat.com/' . $matches[2] . '-mobile.jpg';
 
-					$content_type = $this->get_content_type($source_stream);
+                    $content_type = $this->get_content_type($source_stream);
 
-					if (strpos($content_type, "video/") !== false) {
-						$this->handle_as_video($doc, $entry, $source_stream, $poster_url);
-						$found = 1;
-					}
-				}
+                    if (strpos($content_type, "video/") !== false) {
+                        $this->handle_as_video($doc, $entry, $source_stream, $poster_url);
+                        $found = 1;
+                    }
+                }
 
-				if (!$found && preg_match("/https?:\/\/v\.redd\.it\/(.*)$/i", $entry->getAttribute("href"), $matches)) {
+                if (!$found && preg_match("/https?:\/\/v\.redd\.it\/(.*)$/i", $entry->getAttribute("href"), $matches)) {
 
-					Debug::log("Handling as reddit inline video", Debug::$LOG_VERBOSE);
+                    Debug::log("Handling as reddit inline video", Debug::$LOG_VERBOSE);
 
-					$img = $img_entries->item(0);
+                    $img = $img_entries->item(0);
 
-					if ($img) {
-						$poster_url = $img->getAttribute("src");
-					} else {
-						$poster_url = false;
-					}
+                    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::log("Resolved ".$matches[0]." to ".$source_article_url, Debug::$LOG_VERBOSE);
-
-					$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;
-									}
-								}
-							}
-						}
-					}
+                    // Get original article URL from v.redd.it redirects
+                    $source_article_url = $this->get_location($matches[0]);
+                    Debug::log("Resolved ".$matches[0]." to ".$source_article_url, Debug::$LOG_VERBOSE);
+
+                    $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";
-					}
+                    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;
-				}
+                    $this->handle_as_video($doc, $entry, $source_stream, $poster_url);
+                    $found = 1;
+                }
 
-				if (!$found && preg_match("/https?:\/\/(www\.)?streamable.com\//i", $entry->getAttribute("href"))) {
+                if (!$found && preg_match("/https?:\/\/(www\.)?streamable.com\//i", $entry->getAttribute("href"))) {
 
-					Debug::log("Handling as Streamable", Debug::$LOG_VERBOSE);
+                    Debug::log("Handling as Streamable", Debug::$LOG_VERBOSE);
 
-					$tmp = fetch_file_contents($entry->getAttribute("href"));
+                    $tmp = fetch_file_contents($entry->getAttribute("href"));
 
-					if ($tmp) {
-						$tmpdoc = new DOMDocument();
+                    if ($tmp) {
+                        $tmpdoc = new DOMDocument();
 
-						if (@$tmpdoc->loadHTML($tmp)) {
-							$tmpxpath = new DOMXPath($tmpdoc);
+                        if (@$tmpdoc->loadHTML($tmp)) {
+                            $tmpxpath = new DOMXPath($tmpdoc);
 
-							$source_node = $tmpxpath->query("//video[contains(@class,'video-player-tag')]//source[contains(@src, '.mp4')]")->item(0);
-							$poster_node = $tmpxpath->query("//video[contains(@class,'video-player-tag') and @poster]")->item(0);
+                            $source_node = $tmpxpath->query("//video[contains(@class,'video-player-tag')]//source[contains(@src, '.mp4')]")->item(0);
+                            $poster_node = $tmpxpath->query("//video[contains(@class,'video-player-tag') and @poster]")->item(0);
 
-							if ($source_node && $poster_node) {
-								$source_stream = $source_node->getAttribute("src");
-								$poster_url = $poster_node->getAttribute("poster");
+                            if ($source_node && $poster_node) {
+                                $source_stream = $source_node->getAttribute("src");
+                                $poster_url = $poster_node->getAttribute("poster");
 
-								$this->handle_as_video($doc, $entry, $source_stream, $poster_url);
-								$found = 1;
-							}
-						}
-					}
-				}
+                                $this->handle_as_video($doc, $entry, $source_stream, $poster_url);
+                                $found = 1;
+                            }
+                        }
+                    }
+                }
 
-				// imgur .gif -> .gifv
-				if (!$found && preg_match("/i\.imgur\.com\/(.*?)\.gif$/i", $entry->getAttribute("href"))) {
-					Debug::log("Handling as imgur gif (->gifv)", Debug::$LOG_VERBOSE);
+                // imgur .gif -> .gifv
+                if (!$found && preg_match("/i\.imgur\.com\/(.*?)\.gif$/i", $entry->getAttribute("href"))) {
+                    Debug::log("Handling as imgur gif (->gifv)", Debug::$LOG_VERBOSE);
 
-					$entry->setAttribute("href",
-						str_replace(".gif", ".gifv", $entry->getAttribute("href")));
-				}
+                    $entry->setAttribute("href",
+                        str_replace(".gif", ".gifv", $entry->getAttribute("href")));
+                }
 
-				if (!$found && preg_match("/\.(gifv|mp4)$/i", $entry->getAttribute("href"))) {
-					Debug::log("Handling as imgur gifv", Debug::$LOG_VERBOSE);
+                if (!$found && preg_match("/\.(gifv|mp4)$/i", $entry->getAttribute("href"))) {
+                    Debug::log("Handling as imgur gifv", Debug::$LOG_VERBOSE);
 
-					$source_stream = str_replace(".gifv", ".mp4", $entry->getAttribute("href"));
+                    $source_stream = str_replace(".gifv", ".mp4", $entry->getAttribute("href"));
 
-					if (strpos($source_stream, "imgur.com") !== false)
-						$poster_url = str_replace(".mp4", "h.jpg", $source_stream);
+                    if (strpos($source_stream, "imgur.com") !== false)
+                        $poster_url = str_replace(".mp4", "h.jpg", $source_stream);
 
-					$this->handle_as_video($doc, $entry, $source_stream, $poster_url);
+                    $this->handle_as_video($doc, $entry, $source_stream, $poster_url);
 
-					$found = true;
-				}
+                    $found = true;
+                }
 
-				$matches = array();
-				if (!$found && preg_match("/youtube\.com\/v\/([\w-]+)/", $entry->getAttribute("href"), $matches) ||
-					preg_match("/youtube\.com\/.*?[\&\?]v=([\w-]+)/", $entry->getAttribute("href"), $matches) ||
-					preg_match("/youtube\.com\/watch\?v=([\w-]+)/", $entry->getAttribute("href"), $matches) ||
-					preg_match("/\/\/youtu.be\/([\w-]+)/", $entry->getAttribute("href"), $matches)) {
+                $matches = array();
+                if (!$found && preg_match("/youtube\.com\/v\/([\w-]+)/", $entry->getAttribute("href"), $matches) ||
+                    preg_match("/youtube\.com\/.*?[\&\?]v=([\w-]+)/", $entry->getAttribute("href"), $matches) ||
+                    preg_match("/youtube\.com\/watch\?v=([\w-]+)/", $entry->getAttribute("href"), $matches) ||
+                    preg_match("/\/\/youtu.be\/([\w-]+)/", $entry->getAttribute("href"), $matches)) {
 
-					$vid_id = $matches[1];
+                    $vid_id = $matches[1];
 
-					Debug::log("Handling as youtube: $vid_id", Debug::$LOG_VERBOSE);
+                    Debug::log("Handling as youtube: $vid_id", Debug::$LOG_VERBOSE);
 
-					$iframe = $doc->createElement("iframe");
-					$iframe->setAttribute("class", "youtube-player");
-					$iframe->setAttribute("type", "text/html");
-					$iframe->setAttribute("width", "640");
-					$iframe->setAttribute("height", "385");
-					$iframe->setAttribute("src", "https://www.youtube.com/embed/$vid_id");
-					$iframe->setAttribute("allowfullscreen", "1");
-					$iframe->setAttribute("frameborder", "0");
+                    $iframe = $doc->createElement("iframe");
+                    $iframe->setAttribute("class", "youtube-player");
+                    $iframe->setAttribute("type", "text/html");
+                    $iframe->setAttribute("width", "640");
+                    $iframe->setAttribute("height", "385");
+                    $iframe->setAttribute("src", "https://www.youtube.com/embed/$vid_id");
+                    $iframe->setAttribute("allowfullscreen", "1");
+                    $iframe->setAttribute("frameborder", "0");
 
-					$br = $doc->createElement('br');
-					$entry->parentNode->insertBefore($iframe, $entry);
-					$entry->parentNode->insertBefore($br, $entry);
+                    $br = $doc->createElement('br');
+                    $entry->parentNode->insertBefore($iframe, $entry);
+                    $entry->parentNode->insertBefore($br, $entry);
 
-					$found = true;
-				}
+                    $found = true;
+                }
 
-				if (!$found && preg_match("/\.(jpg|jpeg|gif|png)(\?[0-9][0-9]*)?$/i", $entry->getAttribute("href")) ||
-					mb_strpos($entry->getAttribute("href"), "i.reddituploads.com") !== false ||
-					mb_strpos($this->get_content_type($entry->getAttribute("href")), "image/") !== false) {
+                if (!$found && preg_match("/\.(jpg|jpeg|gif|png)(\?[0-9][0-9]*)?$/i", $entry->getAttribute("href")) ||
+                    mb_strpos($entry->getAttribute("href"), "i.reddituploads.com") !== false ||
+                    mb_strpos($this->get_content_type($entry->getAttribute("href")), "image/") !== false) {
 
-					Debug::log("Handling as a picture", Debug::$LOG_VERBOSE);
+                    Debug::log("Handling as a picture", Debug::$LOG_VERBOSE);
 
-					$img = $doc->createElement('img');
-					$img->setAttribute("src", $entry->getAttribute("href"));
+                    $img = $doc->createElement('img');
+                    $img->setAttribute("src", $entry->getAttribute("href"));
 
-					$br = $doc->createElement('br');
-					$entry->parentNode->insertBefore($img, $entry);
-					$entry->parentNode->insertBefore($br, $entry);
+                    $br = $doc->createElement('br');
+                    $entry->parentNode->insertBefore($img, $entry);
+                    $entry->parentNode->insertBefore($br, $entry);
 
-					$found = true;
-				}
+                    $found = true;
+                }
 
                 // imgur via link rel="image_src" href="..."
                 if (!$found && preg_match("/imgur/", $entry->getAttribute("href"))) {
@@ -311,109 +311,109 @@ 
                     }
                 }
 
-				// wtf is this even
-				if (!$found && preg_match("/^https?:\/\/gyazo\.com\/([^\.\/]+$)/", $entry->getAttribute("href"), $matches)) {
-					$img_id = $matches[1];
+                // wtf is this even
+                if (!$found && preg_match("/^https?:\/\/gyazo\.com\/([^\.\/]+$)/", $entry->getAttribute("href"), $matches)) {
+                    $img_id = $matches[1];
 
-					Debug::log("handling as gyazo: $img_id", Debug::$LOG_VERBOSE);
+                    Debug::log("handling as gyazo: $img_id", Debug::$LOG_VERBOSE);
 
-					$img = $doc->createElement('img');
-					$img->setAttribute("src", "https://i.gyazo.com/$img_id.jpg");
+                    $img = $doc->createElement('img');
+                    $img->setAttribute("src", "https://i.gyazo.com/$img_id.jpg");
 
-					$br = $doc->createElement('br');
-					$entry->parentNode->insertBefore($img, $entry);
-					$entry->parentNode->insertBefore($br, $entry);
+                    $br = $doc->createElement('br');
+                    $entry->parentNode->insertBefore($img, $entry);
+                    $entry->parentNode->insertBefore($br, $entry);
 
-					$found = true;
-				}
+                    $found = true;
+                }
 
-				// let's try meta properties
-				if (!$found) {
-					Debug::log("looking for meta og:image", Debug::$LOG_VERBOSE);
+                // let's try meta properties
+                if (!$found) {
+                    Debug::log("looking for meta og:image", Debug::$LOG_VERBOSE);
 
-					$content = fetch_file_contents(["url" => $entry->getAttribute("href"),
-						"http_accept" => "text/*"]);
+                    $content = fetch_file_contents(["url" => $entry->getAttribute("href"),
+                        "http_accept" => "text/*"]);
 
-					if ($content) {
-						$cdoc = new DOMDocument();
+                    if ($content) {
+                        $cdoc = new DOMDocument();
 
-						if (@$cdoc->loadHTML($content)) {
-							$cxpath = new DOMXPath($cdoc);
+                        if (@$cdoc->loadHTML($content)) {
+                            $cxpath = new DOMXPath($cdoc);
 
-							$og_image = $cxpath->query("//meta[@property='og:image']")->item(0);
-							$og_video = $cxpath->query("//meta[@property='og:video']")->item(0);
+                            $og_image = $cxpath->query("//meta[@property='og:image']")->item(0);
+                            $og_video = $cxpath->query("//meta[@property='og:video']")->item(0);
 
-							if ($og_video) {
+                            if ($og_video) {
 
-								$source_stream = $og_video->getAttribute("content");
+                                $source_stream = $og_video->getAttribute("content");
 
-								if ($source_stream) {
+                                if ($source_stream) {
 
-									if ($og_image) {
-										$poster_url = $og_image->getAttribute("content");
-									} else {
-										$poster_url = false;
-									}
+                                    if ($og_image) {
+                                        $poster_url = $og_image->getAttribute("content");
+                                    } else {
+                                        $poster_url = false;
+                                    }
 
-									$this->handle_as_video($doc, $entry, $source_stream, $poster_url);
-									$found = true;
-								}
+                                    $this->handle_as_video($doc, $entry, $source_stream, $poster_url);
+                                    $found = true;
+                                }
 
-							} else if ($og_image) {
+                            } else if ($og_image) {
 
-								$og_src = $og_image->getAttribute("content");
+                                $og_src = $og_image->getAttribute("content");
 
-								if ($og_src) {
-									$img = $doc->createElement('img');
-									$img->setAttribute("src", $og_src);
+                                if ($og_src) {
+                                    $img = $doc->createElement('img');
+                                    $img->setAttribute("src", $og_src);
 
-									$br = $doc->createElement('br');
-									$entry->parentNode->insertBefore($img, $entry);
-									$entry->parentNode->insertBefore($br, $entry);
+                                    $br = $doc->createElement('br');
+                                    $entry->parentNode->insertBefore($img, $entry);
+                                    $entry->parentNode->insertBefore($br, $entry);
 
-									$found = true;
-								}
-							}
-						}
-					}
-				}
+                                    $found = true;
+                                }
+                            }
+                        }
+                    }
+                }
 
-			}
+            }
 
-			// remove tiny thumbnails
-			if ($entry->hasAttribute("src")) {
-				if ($entry->parentNode && $entry->parentNode->parentNode) {
-					$entry->parentNode->parentNode->removeChild($entry->parentNode);
-				}
-			}
-		}
+            // remove tiny thumbnails
+            if ($entry->hasAttribute("src")) {
+                if ($entry->parentNode && $entry->parentNode->parentNode) {
+                    $entry->parentNode->parentNode->removeChild($entry->parentNode);
+                }
+            }
+        }
 
-		return $found;
-	}
+        return $found;
+    }
 
-	public function hook_article_filter($article) {
+    public function hook_article_filter($article) {
 
-		if (strpos($article["link"], "reddit.com/r/") !== false) {
-			$doc = new DOMDocument();
-			@$doc->loadHTML($article["content"]);
-			$xpath = new DOMXPath($doc);
+        if (strpos($article["link"], "reddit.com/r/") !== false) {
+            $doc = new DOMDocument();
+            @$doc->loadHTML($article["content"]);
+            $xpath = new DOMXPath($doc);
 
-			$content_link = $xpath->query("(//a[contains(., '[link]')])")->item(0);
+            $content_link = $xpath->query("(//a[contains(., '[link]')])")->item(0);
 
-			if ($this->host->get($this, "enable_content_dupcheck")) {
+            if ($this->host->get($this, "enable_content_dupcheck")) {
 
-				if ($content_link) {
-					$content_href = $content_link->getAttribute("href");
-					$entry_guid = $article["guid_hashed"];
-					$owner_uid = $article["owner_uid"];
+                if ($content_link) {
+                    $content_href = $content_link->getAttribute("href");
+                    $entry_guid = $article["guid_hashed"];
+                    $owner_uid = $article["owner_uid"];
 
-					if (DB_TYPE == "pgsql") {
-						$interval_qpart = "date_entered < NOW() - INTERVAL '1 day'";
-					} else {
-						$interval_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 DAY)";
-					}
+                    if (DB_TYPE == "pgsql") {
+                        $interval_qpart = "date_entered < NOW() - INTERVAL '1 day'";
+                    } else {
+                        $interval_qpart = "date_entered < DATE_SUB(NOW(), INTERVAL 1 DAY)";
+                    }
 
-					$sth = $this->pdo->prepare("SELECT COUNT(id) AS cid
+                    $sth = $this->pdo->prepare("SELECT COUNT(id) AS cid
 						FROM ttrss_entries, ttrss_user_entries WHERE
 							ref_id = id AND
 							$interval_qpart AND
@@ -421,149 +421,149 @@ 
 							owner_uid = ? AND
 							content LIKE ?");
 
-					$sth->execute([$entry_guid, $owner_uid, "%href=\"$content_href\">[link]%"]);
+                    $sth->execute([$entry_guid, $owner_uid, "%href=\"$content_href\">[link]%"]);
 
-					if ($row = $sth->fetch()) {
-						$num_found = $row['cid'];
+                    if ($row = $sth->fetch()) {
+                        $num_found = $row['cid'];
 
-						if ($num_found > 0) $article["force_catchup"] = true;
-					}
-				}
-			}
+                        if ($num_found > 0) $article["force_catchup"] = true;
+                    }
+                }
+            }
 
-			$found = $this->inline_stuff($article, $doc, $xpath);
+            $found = $this->inline_stuff($article, $doc, $xpath);
 
-			$node = $doc->getElementsByTagName('body')->item(0);
+            $node = $doc->getElementsByTagName('body')->item(0);
 
-			if ($node && $found) {
-				$article["content"] = $doc->saveHTML($node);
-			} else if ($content_link) {
-				$article = $this->readability($article, $content_link->getAttribute("href"), $doc, $xpath);
-			}
-		}
+            if ($node && $found) {
+                $article["content"] = $doc->saveHTML($node);
+            } else if ($content_link) {
+                $article = $this->readability($article, $content_link->getAttribute("href"), $doc, $xpath);
+            }
+        }
 
-		return $article;
-	}
+        return $article;
+    }
 
-	public function api_version() {
-		return 2;
-	}
+    public function api_version() {
+        return 2;
+    }
 
-	private function handle_as_video($doc, $entry, $source_stream, $poster_url = false) {
+    private function handle_as_video($doc, $entry, $source_stream, $poster_url = false) {
 
-		Debug::log("handle_as_video: $source_stream", Debug::$LOG_VERBOSE);
+        Debug::log("handle_as_video: $source_stream", Debug::$LOG_VERBOSE);
 
-		$video = $doc->createElement('video');
-		$video->setAttribute("autoplay", "1");
-		$video->setAttribute("controls", "1");
-		$video->setAttribute("loop", "1");
+        $video = $doc->createElement('video');
+        $video->setAttribute("autoplay", "1");
+        $video->setAttribute("controls", "1");
+        $video->setAttribute("loop", "1");
 
-		if ($poster_url) $video->setAttribute("poster", $poster_url);
+        if ($poster_url) $video->setAttribute("poster", $poster_url);
 
-		$source = $doc->createElement('source');
-		$source->setAttribute("src", $source_stream);
-		$source->setAttribute("type", "video/mp4");
+        $source = $doc->createElement('source');
+        $source->setAttribute("src", $source_stream);
+        $source->setAttribute("type", "video/mp4");
 
-		$video->appendChild($source);
+        $video->appendChild($source);
 
-		$br = $doc->createElement('br');
-		$entry->parentNode->insertBefore($video, $entry);
-		$entry->parentNode->insertBefore($br, $entry);
+        $br = $doc->createElement('br');
+        $entry->parentNode->insertBefore($video, $entry);
+        $entry->parentNode->insertBefore($br, $entry);
 
-		$img = $doc->createElement('img');
-		$img->setAttribute("src",
-			"data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs%3D");
+        $img = $doc->createElement('img');
+        $img->setAttribute("src",
+            "data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs%3D");
 
-		$entry->parentNode->insertBefore($img, $entry);
-	}
+        $entry->parentNode->insertBefore($img, $entry);
+    }
 
-	public function testurl() {
-		$url = htmlspecialchars($_REQUEST["url"]);
+    public function testurl() {
+        $url = htmlspecialchars($_REQUEST["url"]);
 
-		header("Content-type: text/plain");
+        header("Content-type: text/plain");
 
-		print "URL: $url\n";
+        print "URL: $url\n";
 
-		$doc = new DOMDocument();
-		@$doc->loadHTML("<html><body><a href=\"$url\">[link]</a></body>");
-		$xpath = new DOMXPath($doc);
+        $doc = new DOMDocument();
+        @$doc->loadHTML("<html><body><a href=\"$url\">[link]</a></body>");
+        $xpath = new DOMXPath($doc);
 
-		$found = $this->inline_stuff([], $doc, $xpath);
+        $found = $this->inline_stuff([], $doc, $xpath);
 
-		print "Inline result: $found\n";
+        print "Inline result: $found\n";
 
-		if (!$found) {
-			print "\nReadability result:\n";
+        if (!$found) {
+            print "\nReadability result:\n";
 
-			$article = $this->readability([], $url, $doc, $xpath);
+            $article = $this->readability([], $url, $doc, $xpath);
 
-			print_r($article);
-		} else {
-			print "\nResulting HTML:\n";
+            print_r($article);
+        } else {
+            print "\nResulting HTML:\n";
 
-			print $doc->saveHTML();
-		}
-	}
+            print $doc->saveHTML();
+        }
+    }
 
-	private function get_header($url, $useragent = SELF_USER_AGENT, $header) {
-		$ret = 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);
-			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("open_basedir"));
-			curl_setopt($ch, CURLOPT_USERAGENT, $useragent);
+        if (function_exists("curl_init") && !defined("NO_CURL")) {
+            $ch = curl_init($url);
+            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("open_basedir"));
+            curl_setopt($ch, CURLOPT_USERAGENT, $useragent);
 
-			@curl_exec($ch);
-			$ret = curl_getinfo($ch, $header);
-		}
+            @curl_exec($ch);
+            $ret = curl_getinfo($ch, $header);
+        }
 
-		return $ret;
-	}
+        return $ret;
+    }
 
-	private function get_content_type($url, $useragent = SELF_USER_AGENT) {
-		return $this->get_header($url, $useragent, CURLINFO_CONTENT_TYPE);
-	}
+    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);
-	}
+    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) {
+    /**
+     * @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") &&
-			mb_strlen(strip_tags($article["content"])) <= 150) {
+        if (!defined('NO_CURL') && function_exists("curl_init") && $this->host->get($this, "enable_readability") &&
+            mb_strlen(strip_tags($article["content"])) <= 150) {
 
-			// do not try to embed posts linking back to other reddit posts
-			// readability.php requires PHP 5.6
-			if ($url &&	strpos($url, "reddit.com") === false && version_compare(PHP_VERSION, '5.6.0', '>=')) {
+            // do not try to embed posts linking back to other reddit posts
+            // readability.php requires PHP 5.6
+            if ($url &&	strpos($url, "reddit.com") === false && version_compare(PHP_VERSION, '5.6.0', '>=')) {
 
-				/* link may lead to a huge video file or whatever, we need to check content type before trying to
+                /* link may lead to a huge video file or whatever, we need to check content type before trying to
 				parse it which p much requires curl */
 
-				$useragent_compat = "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)";
-				$content_type = $this->get_content_type($url, $useragent_compat);
+                $useragent_compat = "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)";
+                $content_type = $this->get_content_type($url, $useragent_compat);
 
-				if ($content_type && strpos($content_type, "text/html") !== false) {
+                if ($content_type && strpos($content_type, "text/html") !== false) {
 
-					foreach ($this->host->get_hooks(PluginHost::HOOK_GET_FULL_TEXT) as $p) {
-						$extracted_content = $p->hook_get_full_text($url);
+                    foreach ($this->host->get_hooks(PluginHost::HOOK_GET_FULL_TEXT) as $p) {
+                        $extracted_content = $p->hook_get_full_text($url);
 
-						if ($extracted_content) {
-							$article["content"] = $extracted_content;
-							break;
-						}
-					}
-				}
-			}
-		}
+                        if ($extracted_content) {
+                            $article["content"] = $extracted_content;
+                            break;
+                        }
+                    }
+                }
+            }
+        }
 
-		return $article;
-	}
+        return $article;
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -57,13 +57,13 @@ 
 		print "<fieldset class='narrow'>";
 		print "<label class='checkbox'>";
 		print_checkbox("enable_readability", $enable_readability);
-		print " " . __("Extract missing content using Readability (requires af_readability)") . "</label>";
+		print " ".__("Extract missing content using Readability (requires af_readability)")."</label>";
 		print "</fieldset>";
 
 		print "<fieldset class='narrow'>";
 		print "<label class='checkbox'>";
 		print_checkbox("enable_content_dupcheck", $enable_content_dupcheck);
-		print " " . __("Enable additional duplicate checking") . "</label>";
+		print " ".__("Enable additional duplicate checking")."</label>";
 		print "</fieldset>";
 
 		print_button("submit", __("Save"), 'class="alt-primary"');
@@ -96,14 +96,14 @@ 
 		foreach ($entries as $entry) {
 			if ($entry->hasAttribute("href") && strpos($entry->getAttribute("href"), "reddit.com") === false) {
 
-				Debug::log("processing href: " . $entry->getAttribute("href"), Debug::$LOG_VERBOSE);
+				Debug::log("processing href: ".$entry->getAttribute("href"), Debug::$LOG_VERBOSE);
 
 				$matches = array();
 
 				if (!$found && preg_match("/^https?:\/\/twitter.com\/(.*?)\/status\/(.*)/", $entry->getAttribute("href"), $matches)) {
-					Debug::log("handling as twitter: " . $matches[1] . " " . $matches[2], Debug::$LOG_VERBOSE);
+					Debug::log("handling as twitter: ".$matches[1]." ".$matches[2], Debug::$LOG_VERBOSE);
 
-					$oembed_result = fetch_file_contents("https://publish.twitter.com/oembed?url=" . urlencode($entry->getAttribute("href")));
+					$oembed_result = fetch_file_contents("https://publish.twitter.com/oembed?url=".urlencode($entry->getAttribute("href")));
 
 					if ($oembed_result) {
 						$oembed_result = json_decode($oembed_result, true);
@@ -111,7 +111,7 @@ 
 						if ($oembed_result && isset($oembed_result["html"])) {
 
 							$tmp = new DOMDocument();
-							if ($tmp->loadHTML('<?xml encoding="utf-8" ?>' . $oembed_result["html"])) {
+							if ($tmp->loadHTML('<?xml encoding="utf-8" ?>'.$oembed_result["html"])) {
 								$p = $doc->createElement("p");
 
 								$p->appendChild($doc->importNode(
@@ -135,8 +135,8 @@ 
 
 					Debug::log("Handling as Gfycat", Debug::$LOG_VERBOSE);
 
-					$source_stream = 'https://giant.gfycat.com/' . $matches[2] . '.mp4';
-					$poster_url = 'https://thumbs.gfycat.com/' . $matches[2] . '-mobile.jpg';
+					$source_stream = 'https://giant.gfycat.com/'.$matches[2].'.mp4';
+					$poster_url = 'https://thumbs.gfycat.com/'.$matches[2].'-mobile.jpg';
 
 					$content_type = $this->get_content_type($source_stream);
 
@@ -184,7 +184,7 @@ 
 					}
 
 					if (!$source_stream) {
-						$source_stream = "https://v.redd.it/" . $matches[1] . "/DASH_600_K";
+						$source_stream = "https://v.redd.it/".$matches[1]."/DASH_600_K";
 					}
 
 					$this->handle_as_video($doc, $entry, $source_stream, $poster_url);
@@ -542,7 +542,7 @@ 
 
 			// do not try to embed posts linking back to other reddit posts
 			// readability.php requires PHP 5.6
-			if ($url &&	strpos($url, "reddit.com") === false && version_compare(PHP_VERSION, '5.6.0', '>=')) {
+			if ($url && strpos($url, "reddit.com") === false && version_compare(PHP_VERSION, '5.6.0', '>=')) {
 
 				/* link may lead to a huge video file or whatever, we need to check content type before trying to
 				parse it which p much requires curl */

Braces +13 added lines, -7 removed lines

@@ -22,7 +22,9 @@ 
 	}
 
 	public function hook_prefs_tab($args) {
-		if ($args != "prefFeeds") return;
+		if ($args != "prefFeeds") {
+		    return;
+		}
 
 		print "<div dojoType=\"dijit.layout.AccordionPane\"
 			title=\"<i class='material-icons'>extension</i> ".__('Reddit content settings (af_redditimgur)')."\">";
@@ -173,8 +175,7 @@ 
 									if ($child["data"]["url"] == $matches[0]) {
 										try {
 											$source_stream = $child["data"]["media"]["reddit_video"]["fallback_url"];
-										}
-										catch (Exception $e) {
+										} catch (Exception $e) {
 										}
 										break 2;
 									}
@@ -230,8 +231,9 @@ 
 
 					$source_stream = str_replace(".gifv", ".mp4", $entry->getAttribute("href"));
 
-					if (strpos($source_stream, "imgur.com") !== false)
-						$poster_url = str_replace(".mp4", "h.jpg", $source_stream);
+					if (strpos($source_stream, "imgur.com") !== false) {
+											$poster_url = str_replace(".mp4", "h.jpg", $source_stream);
+					}
 
 					$this->handle_as_video($doc, $entry, $source_stream, $poster_url);
 
@@ -426,7 +428,9 @@ 
 					if ($row = $sth->fetch()) {
 						$num_found = $row['cid'];
 
-						if ($num_found > 0) $article["force_catchup"] = true;
+						if ($num_found > 0) {
+						    $article["force_catchup"] = true;
+						}
 					}
 				}
 			}
@@ -458,7 +462,9 @@ 
 		$video->setAttribute("controls", "1");
 		$video->setAttribute("loop", "1");
 
-		if ($poster_url) $video->setAttribute("poster", $poster_url);
+		if ($poster_url) {
+		    $video->setAttribute("poster", $poster_url);
+		}
 
 		$source = $doc->createElement('source');
 		$source->setAttribute("src", $source_stream);