codysnider / tt-rss

plugins/af_readability/vendor/andreskrey/Readability/Nodes/NodeTrait.php

Switch Indentation +30 added lines, -30 removed lines

@@ -121,36 +121,36 @@
             $contentScore = 0;
 
             switch ($this->nodeName) {
-                case 'div':
-                    $contentScore += 5;
-                    break;
-
-                case 'pre':
-                case 'td':
-                case 'blockquote':
-                    $contentScore += 3;
-                    break;
-
-                case 'address':
-                case 'ol':
-                case 'ul':
-                case 'dl':
-                case 'dd':
-                case 'dt':
-                case 'li':
-                case 'form':
-                    $contentScore -= 3;
-                    break;
-
-                case 'h1':
-                case 'h2':
-                case 'h3':
-                case 'h4':
-                case 'h5':
-                case 'h6':
-                case 'th':
-                    $contentScore -= 5;
-                    break;
+            case 'div':
+                $contentScore += 5;
+                break;
+
+            case 'pre':
+            case 'td':
+            case 'blockquote':
+                $contentScore += 3;
+                break;
+
+            case 'address':
+            case 'ol':
+            case 'ul':
+            case 'dl':
+            case 'dd':
+            case 'dt':
+            case 'li':
+            case 'form':
+                $contentScore -= 3;
+                break;
+
+            case 'h1':
+            case 'h2':
+            case 'h3':
+            case 'h4':
+            case 'h5':
+            case 'h6':
+            case 'th':
+                $contentScore -= 5;
+                break;
             }
 
             $this->contentScore = $contentScore + ($weightClasses ? $this->getClassWeight() : 0);

Spacing +4 added lines, -4 removed lines

@@ -328,7 +328,7 @@ 
         $ret = iterator_to_array($this->childNodes);
         if ($filterEmptyDOMText) {
             // Array values is used to discard the key order. Needs to be 0 to whatever without skipping any number
-            $ret = array_values(array_filter($ret, function ($node) {
+            $ret = array_values(array_filter($ret, function($node) {
                 return $node->nodeName !== '#text' || mb_strlen(trim($node->nodeValue));
             }));
         }
@@ -427,7 +427,7 @@ 
         }
 
         // And there should be no text nodes with real content
-        return array_reduce(iterator_to_array($children), function ($carry, $child) {
+        return array_reduce(iterator_to_array($children), function($carry, $child) {
             if (!$carry === false) {
                 return false;
             }
@@ -480,7 +480,7 @@ 
                  * are dealing with (And at this point we know they are empty or are just whitespace, because of the
                  * mb_strlen in this chain of checks).
                  */
-                + count(array_filter(iterator_to_array($this->childNodes), function ($child) {
+                + count(array_filter(iterator_to_array($this->childNodes), function($child) {
                     return $child instanceof DOMText;
                 }))
 
@@ -498,7 +498,7 @@ 
         return $this->nodeType === XML_TEXT_NODE || in_array($this->nodeName, $this->phrasing_elems) !== false ||
             (!is_null($this->childNodes) &&
                 ($this->nodeName === 'a' || $this->nodeName === 'del' || $this->nodeName === 'ins') &&
-                array_reduce(iterator_to_array($this->childNodes), function ($carry, $node) {
+                array_reduce(iterator_to_array($this->childNodes), function($carry, $node) {
                     return $node->isPhrasingContent() && $carry;
                 }, true)
             );

plugins/af_readability/vendor/andreskrey/Readability/Readability.php

Spacing +17 added lines, -17 removed lines

@@ -194,7 +194,7 @@ 
                     $this->attempts[] = ['articleContent' => $result, 'textLength' => $length];
 
                     // No luck after removing flags, just return the longest text we found during the different loops
-                    usort($this->attempts, function ($a, $b) {
+                    usort($this->attempts, function($a, $b) {
                         return $a['textLength'] < $b['textLength'];
                     });
 
@@ -273,7 +273,7 @@ 
         }
 
         // Prepend the XML tag to avoid having issues with special characters. Should be harmless.
-        $dom->loadHTML('<?xml encoding="UTF-8">' . $html);
+        $dom->loadHTML('<?xml encoding="UTF-8">'.$html);
         $dom->encoding = 'UTF-8';
 
         $this->removeScripts($dom);
@@ -491,7 +491,7 @@ 
          * I can assure you it works properly if you let the code run.
          */
         if (preg_match('/ [\|\-\\\\\/>»] /i', $curTitle)) {
-            $titleHadHierarchicalSeparators = (bool)preg_match('/ [\\\\\/>»] /', $curTitle);
+            $titleHadHierarchicalSeparators = (bool) preg_match('/ [\\\\\/>»] /', $curTitle);
             $curTitle = preg_replace('/(.*)[\|\-\\\\\/>»] .*/i', '$1', $originalTitle);
 
             $this->logger->info(sprintf('[Metadata] Found hierarchical separators in title, new title is: \'%s\'', $curTitle));
@@ -507,7 +507,7 @@ 
             // could assume it's the full title.
             $match = false;
             for ($i = 1; $i <= 2; $i++) {
-                foreach ($this->dom->getElementsByTagName('h' . $i) as $hTag) {
+                foreach ($this->dom->getElementsByTagName('h'.$i) as $hTag) {
                     // Trim texts to avoid having false negatives when the title is surrounded by spaces or tabs
                     if (trim($hTag->nodeValue) === trim($curTitle)) {
                         $match = true;
@@ -579,17 +579,17 @@ 
 
         // Scheme-rooted relative URI.
         if (substr($uri, 0, 2) === '//') {
-            return $scheme . '://' . substr($uri, 2);
+            return $scheme.'://'.substr($uri, 2);
         }
 
         // Prepath-rooted relative URI.
         if (substr($uri, 0, 1) === '/') {
-            return $prePath . $uri;
+            return $prePath.$uri;
         }
 
         // Dotslash relative URI.
         if (strpos($uri, './') === 0) {
-            return $pathBase . substr($uri, 2);
+            return $pathBase.substr($uri, 2);
         }
         // Ignore hash URIs:
         if (substr($uri, 0, 1) === '#') {
@@ -598,7 +598,7 @@ 
 
         // Standard relative URI; add entire path. pathBase already includes a
         // trailing "/".
-        return $pathBase . $uri;
+        return $pathBase.$uri;
     }
 
     /**
@@ -614,17 +614,17 @@ 
         if ($this->dom->baseURI !== null) {
             if (substr($this->dom->baseURI, 0, 1) === '/') {
                 // URLs starting with '/' override completely the URL defined in the link
-                $pathBase = parse_url($url, PHP_URL_SCHEME) . '://' . parse_url($url, PHP_URL_HOST) . $this->dom->baseURI;
+                $pathBase = parse_url($url, PHP_URL_SCHEME).'://'.parse_url($url, PHP_URL_HOST).$this->dom->baseURI;
             } else {
                 // Otherwise just prepend the base to the actual path
-                $pathBase = parse_url($url, PHP_URL_SCHEME) . '://' . parse_url($url, PHP_URL_HOST) . dirname(parse_url($url, PHP_URL_PATH)) . '/' . rtrim($this->dom->baseURI, '/') . '/';
+                $pathBase = parse_url($url, PHP_URL_SCHEME).'://'.parse_url($url, PHP_URL_HOST).dirname(parse_url($url, PHP_URL_PATH)).'/'.rtrim($this->dom->baseURI, '/').'/';
             }
         } else {
-            $pathBase = parse_url($url, PHP_URL_SCHEME) . '://' . parse_url($url, PHP_URL_HOST) . dirname(parse_url($url, PHP_URL_PATH)) . '/';
+            $pathBase = parse_url($url, PHP_URL_SCHEME).'://'.parse_url($url, PHP_URL_HOST).dirname(parse_url($url, PHP_URL_PATH)).'/';
         }
 
         $scheme = parse_url($pathBase, PHP_URL_SCHEME);
-        $prePath = $scheme . '://' . parse_url($pathBase, PHP_URL_HOST);
+        $prePath = $scheme.'://'.parse_url($pathBase, PHP_URL_HOST);
 
         return [$pathBase, $scheme, $prePath];
     }
@@ -658,7 +658,7 @@ 
                 continue;
             }
 
-            $matchString = $node->getAttribute('class') . ' ' . $node->getAttribute('id');
+            $matchString = $node->getAttribute('class').' '.$node->getAttribute('id');
 
             if (!$node->isProbablyVisible()) {
                 $this->logger->debug(sprintf('[Get Nodes] Removing hidden node... Match string was: \'%s\'', $matchString));
@@ -1049,7 +1049,7 @@ 
                 while ($parentOfTopCandidate->nodeName !== 'body' && $parentOfTopCandidate->nodeType === XML_ELEMENT_NODE) {
                     $listsContainingThisAncestor = 0;
                     for ($ancestorIndex = 0; $ancestorIndex < count($alternativeCandidateAncestors) && $listsContainingThisAncestor < $MINIMUM_TOPCANDIDATES; $ancestorIndex++) {
-                        $listsContainingThisAncestor += (int)in_array($parentOfTopCandidate, $alternativeCandidateAncestors[$ancestorIndex]);
+                        $listsContainingThisAncestor += (int) in_array($parentOfTopCandidate, $alternativeCandidateAncestors[$ancestorIndex]);
                     }
                     if ($listsContainingThisAncestor >= $MINIMUM_TOPCANDIDATES) {
                         $topCandidate = $parentOfTopCandidate;
@@ -1285,7 +1285,7 @@ 
                 $row = $tbody->getFirstElementChild();
                 if ($row->hasSingleTagInsideElement('td')) {
                     $cell = $row->getFirstElementChild();
-                    $cell = NodeUtility::setNodeTag($cell, (array_reduce(iterator_to_array($cell->childNodes), function ($carry, $node) {
+                    $cell = NodeUtility::setNodeTag($cell, (array_reduce(iterator_to_array($cell->childNodes), function($carry, $node) {
                         return $node->isPhrasingContent() && $carry;
                     }, true)) ? 'p' : 'div');
                     $table->parentNode->replaceChild($cell, $table);
@@ -1465,7 +1465,7 @@ 
             $node = $DOMNodeList->item($length - 1 - $i);
 
             // First check if we're in a data table, in which case don't remove us.
-            if ($node->hasAncestorTag('table', -1, function ($node) {
+            if ($node->hasAncestorTag('table', -1, function($node) {
                 return $node->isReadabilityDataTable();
             })) {
                 continue;
@@ -1577,7 +1577,7 @@ 
     public function _cleanHeaders(DOMDocument $article)
     {
         for ($headerIndex = 1; $headerIndex < 3; $headerIndex++) {
-            $headers = $article->getElementsByTagName('h' . $headerIndex);
+            $headers = $article->getElementsByTagName('h'.$headerIndex);
             /** @var $header DOMElement */
             foreach ($headers as $header) {
                 $weight = 0;

plugins/af_redditimgur/init.php

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 */

Upper-Lower-Casing +9 added lines, -9 removed lines

@@ -94,7 +94,7 @@ 
 		//$debug = 1;
 
 		foreach ($entries as $entry) {
-			if ($entry->hasAttribute("href") && strpos($entry->getAttribute("href"), "reddit.com") === FALSE) {
+			if ($entry->hasAttribute("href") && strpos($entry->getAttribute("href"), "reddit.com") === false) {
 
 				Debug::log("processing href: " . $entry->getAttribute("href"), Debug::$LOG_VERBOSE);
 
@@ -115,7 +115,7 @@ 
 								$p = $doc->createElement("p");
 
 								$p->appendChild($doc->importNode(
-									$tmp->getElementsByTagName("blockquote")->item(0), TRUE));
+									$tmp->getElementsByTagName("blockquote")->item(0), true));
 
 								$br = $doc->createElement('br');
 								$entry->parentNode->insertBefore($p, $entry);
@@ -140,7 +140,7 @@ 
 
 					$content_type = $this->get_content_type($source_stream);
 
-					if (strpos($content_type, "video/") !== FALSE) {
+					if (strpos($content_type, "video/") !== false) {
 						$this->handle_as_video($doc, $entry, $source_stream, $poster_url);
 						$found = 1;
 					}
@@ -230,7 +230,7 @@ 
 
 					$source_stream = str_replace(".gifv", ".mp4", $entry->getAttribute("href"));
 
-					if (strpos($source_stream, "imgur.com") !== FALSE)
+					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);
@@ -265,8 +265,8 @@ 
 				}
 
 				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) {
+					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);
 
@@ -393,7 +393,7 @@ 
 
 	public function hook_article_filter($article) {
 
-		if (strpos($article["link"], "reddit.com/r/") !== FALSE) {
+		if (strpos($article["link"], "reddit.com/r/") !== false) {
 			$doc = new DOMDocument();
 			@$doc->loadHTML($article["content"]);
 			$xpath = new DOMXPath($doc);
@@ -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 */
@@ -550,7 +550,7 @@ 
 				$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);

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;
+    }
 }

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);

plugins/af_comics/filters/af_comics_whomp.php

Braces +3 added lines, -2 removed lines

@@ -14,8 +14,9 @@
 
 			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();
 

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 	}
 
 	public function process(&$article) {
-		if (strpos($article["guid"], "whompcomic.com") !== FALSE) {
+		if (strpos($article["guid"], "whompcomic.com") !== false) {
 
 			$res = fetch_file_contents($article["link"], false, false, false,
 				 false, false, 0,

Indentation +23 added lines, -23 removed lines

@@ -1,36 +1,36 @@
 <?php
 class Af_Comics_Whomp extends Af_ComicFilter {
 
-	public function supported() {
-		return array("Whomp!");
-	}
+    public function supported() {
+        return array("Whomp!");
+    }
 
-	public function process(&$article) {
-		if (strpos($article["guid"], "whompcomic.com") !== FALSE) {
+    public function process(&$article) {
+        if (strpos($article["guid"], "whompcomic.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)");
 
-			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);
-				$basenode = $xpath->query('//img[@id="cc-comic"]')->item(0);
+            if (@$doc->loadHTML($res)) {
+                $xpath = new DOMXPath($doc);
+                $basenode = $xpath->query('//img[@id="cc-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_darklegacy.php

Braces +3 added lines, -2 removed lines

@@ -15,8 +15,9 @@
 
 				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();
 

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 
 	public function process(&$article) {
 
-		if (strpos($article["guid"], "darklegacycomics.com") !== FALSE) {
+		if (strpos($article["guid"], "darklegacycomics.com") !== false) {
 
 				$res = fetch_file_contents($article["link"], false, false, false,
 					 false, false, 0,

Indentation +23 added lines, -23 removed lines

@@ -1,38 +1,38 @@
 <?php
 class Af_Comics_DarkLegacy extends Af_ComicFilter {
 
-	public function supported() {
-		return array("Dark Legacy Comics");
-	}
+    public function supported() {
+        return array("Dark Legacy Comics");
+    }
 
-	public function process(&$article) {
+    public function process(&$article) {
 
-		if (strpos($article["guid"], "darklegacycomics.com") !== FALSE) {
+        if (strpos($article["guid"], "darklegacycomics.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)");
 
-				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);
-					$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) {
+                    if ($basenode) {
 
-						$article["content"] = $doc->saveHTML($basenode);
-					}
-				}
+                        $article["content"] = $doc->saveHTML($basenode);
+                    }
+                }
 
-			 return true;
-		}
+                return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 }

plugins/af_comics/filters/af_comics_pa.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 						$i->parentNode->removeChild($i);
 					}
 
-					if ($basenode){
+					if ($basenode) {
 						$article["content"] = $doc->saveHTML($basenode);
 					}
 				}

Braces +3 added lines, -2 removed lines

@@ -46,8 +46,9 @@
 
 					$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) {

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
 	}
 
 	public function process(&$article) {
-		if (strpos($article["link"], "penny-arcade.com") !== FALSE && strpos($article["title"], "Comic:") !== FALSE) {
+		if (strpos($article["link"], "penny-arcade.com") !== false && strpos($article["title"], "Comic:") !== false) {
 
 				$doc = new DOMDocument();
 
@@ -22,7 +22,7 @@ 
 			return true;
 		}
 
-		if (strpos($article["link"], "penny-arcade.com") !== FALSE && strpos($article["title"], "News Post:") !== FALSE) {
+		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"]))) {

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_cad.php

Braces +3 added lines, -2 removed lines

@@ -17,8 +17,9 @@
 					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);

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -6,8 +6,8 @@
 	}
 
 	public function process(&$article) {
-		if (strpos($article["link"], "cad-comic.com") !== FALSE) {
-			if (strpos($article["title"], "News:") === FALSE) {
+		if (strpos($article["link"], "cad-comic.com") !== false) {
+			if (strpos($article["title"], "News:") === false) {
 
 				global $fetch_last_error_content;
 

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_dilbert.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
 
 					foreach ($matches as $tag) {
 						// Only strings starting with a number sign are considered tags
-						if ( substr($tag->textContent, 0, 1) == '#' ) {
+						if (substr($tag->textContent, 0, 1) == '#') {
 							$tags[] = mb_strtolower(substr($tag->textContent, 1), 'utf-8');
 						}
 					}
@@ -54,7 +54,7 @@ 
 
 					// Add comic title to article type if not empty (mostly Sunday strips)
 					if ($comic_title) {
-						$article["title"] = $article["title"] . " - " . $comic_title;
+						$article["title"] = $article["title"]." - ".$comic_title;
 					}
 
 					if (!empty($tags)) {

Braces +3 added lines, -2 removed lines

@@ -15,8 +15,9 @@
 
 				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();
 

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -7,8 +7,8 @@
 	}
 
 	public function process(&$article) {
-		if (strpos($article["link"], "dilbert.com") !== FALSE ||
-			strpos($article["link"], "/DilbertDailyStrip") !== FALSE) {
+		if (strpos($article["link"], "dilbert.com") !== false ||
+			strpos($article["link"], "/DilbertDailyStrip") !== false) {
 
 				$res = fetch_file_contents($article["link"], false, false, false,
 					 false, false, 0,

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/cache_starred_images/init.php

Braces +15 added lines, -10 removed lines

@@ -17,11 +17,13 @@ 
 		$this->host = $host;
 		$this->cache = new DiskCache("starred-images");
 
-		if ($this->cache->makeDir())
-			chmod($this->cache->getDir(), 0777);
+		if ($this->cache->makeDir()) {
+					chmod($this->cache->getDir(), 0777);
+		}
 
-		if (!$this->cache->exists(".no-auto-expiry"))
-			$this->cache->touch(".no-auto-expiry");
+		if (!$this->cache->exists(".no-auto-expiry")) {
+					$this->cache->touch(".no-auto-expiry");
+		}
 
 		if ($this->cache->isWritable()) {
 			$host->add_hook($host::HOOK_HOUSE_KEEPING, $this);
@@ -141,8 +143,10 @@ 
 
 			$data = fetch_file_contents(["url" => $url, "max_size" => MAX_CACHE_FILE_SIZE]);
 
-			if ($data)
-				return $this->cache->put($local_filename, $data);;
+			if ($data) {
+							return $this->cache->put($local_filename, $data);
+			}
+			;
 
 		} else {
 			//Debug::log("cache_images: local file exists for $url", Debug::$LOG_VERBOSE);
@@ -167,10 +171,11 @@ 
 
 		Debug::log("status: $status_filename", Debug::$LOG_VERBOSE);
 
-        if ($this->cache->exists($status_filename))
-            $status = json_decode($this->cache->get($status_filename), true);
-        else
-            $status = [];
+        if ($this->cache->exists($status_filename)) {
+                    $status = json_decode($this->cache->get($status_filename), true);
+        } else {
+                    $status = [];
+        }
 
         $status["attempt"] += 1;
 

Spacing +11 added lines, -11 removed lines

@@ -35,7 +35,7 @@ 
 	public function hook_house_keeping() {
 		/* since HOOK_UPDATE_TASK is not available to user plugins, this hook is a next best thing */
 
-		Debug::log("caching media of starred articles for user " . $this->host->get_owner_uid() . "...");
+		Debug::log("caching media of starred articles for user ".$this->host->get_owner_uid()."...");
 
 		$sth = $this->pdo->prepare("SELECT content, ttrss_entries.title,
        		ttrss_user_entries.owner_uid, link, site_url, ttrss_entries.id, plugin_data
@@ -53,13 +53,13 @@ 
 			$usth = $this->pdo->prepare("UPDATE ttrss_entries SET plugin_data = ? WHERE id = ?");
 
 			while ($line = $sth->fetch()) {
-				Debug::log("processing article " . $line["title"], Debug::$LOG_VERBOSE);
+				Debug::log("processing article ".$line["title"], Debug::$LOG_VERBOSE);
 
 				if ($line["site_url"]) {
 					$success = $this->cache_article_images($line["content"], $line["site_url"], $line["owner_uid"], $line["id"]);
 
 					if ($success) {
-						$plugin_data = "starred_cache_images,${line['owner_uid']}:" . $line["plugin_data"];
+						$plugin_data = "starred_cache_images,${line['owner_uid']}:".$line["plugin_data"];
 
 						$usth->execute([$plugin_data, $line['id']]);
 					}
@@ -69,9 +69,9 @@ 
 
 		/* actual housekeeping */
 
-		Debug::log("expiring " . $this->cache->getDir() . "...");
+		Debug::log("expiring ".$this->cache->getDir()."...");
 
-		$files = glob($this->cache->getDir() . "/*.{png,mp4,status}", GLOB_BRACE);
+		$files = glob($this->cache->getDir()."/*.{png,mp4,status}", GLOB_BRACE);
 
 		$last_article_id = 0;
 		$article_exists = 1;
@@ -95,7 +95,7 @@ 
 	}
 
 	public function hook_enclosure_entry($enc, $article_id) {
-		$local_filename = $article_id . "-" . sha1($enc["content_url"]);
+		$local_filename = $article_id."-".sha1($enc["content_url"]);
 
 		if ($this->cache->exists($local_filename)) {
 			$enc["content_url"] = $this->cache->getUrl($local_filename);
@@ -114,7 +114,7 @@ 
 				if ($entry->hasAttribute('src')) {
 					$src = rewrite_relative_url($site_url, $entry->getAttribute('src'));
 
-					$local_filename = $article_id . "-" . sha1($src);
+					$local_filename = $article_id."-".sha1($src);
 
 					if ($this->cache->exists($local_filename)) {
 						$entry->setAttribute("src", $this->cache->getUrl($local_filename));
@@ -128,7 +128,7 @@ 
 	}
 
 	private function cache_url($article_id, $url) {
-		$local_filename = $article_id . "-" . sha1($url);
+		$local_filename = $article_id."-".sha1($url);
 
 		if (!$this->cache->exists($local_filename)) {
 			Debug::log("cache_images: downloading: $url to $local_filename", Debug::$LOG_VERBOSE);
@@ -136,7 +136,7 @@ 
 			$data = fetch_file_contents(["url" => $url, "max_size" => MAX_CACHE_FILE_SIZE]);
 
 			if ($data)
-				return $this->cache->put($local_filename, $data);;
+				return $this->cache->put($local_filename, $data); ;
 
 		} else {
 			//Debug::log("cache_images: local file exists for $url", Debug::$LOG_VERBOSE);
@@ -148,7 +148,7 @@ 
 	}
 
 	private function cache_article_images($content, $site_url, $owner_uid, $article_id) {
-		$status_filename = $article_id . "-" . sha1($site_url) . ".status";
+		$status_filename = $article_id."-".sha1($site_url).".status";
 
 		/* housekeeping might run as a separate user, in this case status/media might not be writable */
 		if (!$this->cache->isWritable($status_filename)) {
@@ -181,7 +181,7 @@ 
 		$has_images = false;
 		$success = false;
 
-        if ($doc->loadHTML('<?xml encoding="UTF-8">' . $content)) {
+        if ($doc->loadHTML('<?xml encoding="UTF-8">'.$content)) {
 			$xpath = new DOMXPath($doc);
 			$entries = $xpath->query('(//img[@src])|(//video/source[@src])');
 

Indentation +133 added lines, -133 removed lines

@@ -1,43 +1,43 @@ 
 <?php
 class Cache_Starred_Images extends Plugin {
 
-	/* @var PluginHost $host */
-	private $host;
-	/* @var DiskCache $cache */
-	private $cache;
+    /* @var PluginHost $host */
+    private $host;
+    /* @var DiskCache $cache */
+    private $cache;
     private $max_cache_attempts = 5; // per-article
 
-	public function about() {
-		return array(1.0,
-			"Automatically cache media files in Starred articles",
-			"fox");
-	}
+    public function about() {
+        return array(1.0,
+            "Automatically cache media files in Starred articles",
+            "fox");
+    }
 
-	public function init($host) {
-		$this->host = $host;
-		$this->cache = new DiskCache("starred-images");
+    public function init($host) {
+        $this->host = $host;
+        $this->cache = new DiskCache("starred-images");
 
-		if ($this->cache->makeDir())
-			chmod($this->cache->getDir(), 0777);
+        if ($this->cache->makeDir())
+            chmod($this->cache->getDir(), 0777);
 
-		if (!$this->cache->exists(".no-auto-expiry"))
-			$this->cache->touch(".no-auto-expiry");
+        if (!$this->cache->exists(".no-auto-expiry"))
+            $this->cache->touch(".no-auto-expiry");
 
-		if ($this->cache->isWritable()) {
-			$host->add_hook($host::HOOK_HOUSE_KEEPING, $this);
-			$host->add_hook($host::HOOK_ENCLOSURE_ENTRY, $this);
-			$host->add_hook($host::HOOK_SANITIZE, $this);
-		} else {
-			user_error("Starred cache directory ".$this->cache->getDir()." is not writable.", E_USER_WARNING);
-		}
-	}
+        if ($this->cache->isWritable()) {
+            $host->add_hook($host::HOOK_HOUSE_KEEPING, $this);
+            $host->add_hook($host::HOOK_ENCLOSURE_ENTRY, $this);
+            $host->add_hook($host::HOOK_SANITIZE, $this);
+        } else {
+            user_error("Starred cache directory ".$this->cache->getDir()." is not writable.", E_USER_WARNING);
+        }
+    }
 
-	public function hook_house_keeping() {
-		/* since HOOK_UPDATE_TASK is not available to user plugins, this hook is a next best thing */
+    public function hook_house_keeping() {
+        /* since HOOK_UPDATE_TASK is not available to user plugins, this hook is a next best thing */
 
-		Debug::log("caching media of starred articles for user " . $this->host->get_owner_uid() . "...");
+        Debug::log("caching media of starred articles for user " . $this->host->get_owner_uid() . "...");
 
-		$sth = $this->pdo->prepare("SELECT content, ttrss_entries.title,
+        $sth = $this->pdo->prepare("SELECT content, ttrss_entries.title,
        		ttrss_user_entries.owner_uid, link, site_url, ttrss_entries.id, plugin_data
 			FROM ttrss_entries, ttrss_user_entries LEFT JOIN ttrss_feeds ON
 				(ttrss_user_entries.feed_id = ttrss_feeds.id)
@@ -48,115 +48,115 @@ 
 				plugin_data NOT LIKE '%starred_cache_images%'
 			ORDER BY ".sql_random_function()." LIMIT 100");
 
-		if ($sth->execute([$this->host->get_owner_uid()])) {
+        if ($sth->execute([$this->host->get_owner_uid()])) {
 
-			$usth = $this->pdo->prepare("UPDATE ttrss_entries SET plugin_data = ? WHERE id = ?");
+            $usth = $this->pdo->prepare("UPDATE ttrss_entries SET plugin_data = ? WHERE id = ?");
 
-			while ($line = $sth->fetch()) {
-				Debug::log("processing article " . $line["title"], Debug::$LOG_VERBOSE);
+            while ($line = $sth->fetch()) {
+                Debug::log("processing article " . $line["title"], Debug::$LOG_VERBOSE);
 
-				if ($line["site_url"]) {
-					$success = $this->cache_article_images($line["content"], $line["site_url"], $line["owner_uid"], $line["id"]);
+                if ($line["site_url"]) {
+                    $success = $this->cache_article_images($line["content"], $line["site_url"], $line["owner_uid"], $line["id"]);
 
-					if ($success) {
-						$plugin_data = "starred_cache_images,${line['owner_uid']}:" . $line["plugin_data"];
+                    if ($success) {
+                        $plugin_data = "starred_cache_images,${line['owner_uid']}:" . $line["plugin_data"];
 
-						$usth->execute([$plugin_data, $line['id']]);
-					}
-				}
-			}
-		}
+                        $usth->execute([$plugin_data, $line['id']]);
+                    }
+                }
+            }
+        }
 
-		/* actual housekeeping */
+        /* actual housekeeping */
 
-		Debug::log("expiring " . $this->cache->getDir() . "...");
+        Debug::log("expiring " . $this->cache->getDir() . "...");
 
-		$files = glob($this->cache->getDir() . "/*.{png,mp4,status}", GLOB_BRACE);
+        $files = glob($this->cache->getDir() . "/*.{png,mp4,status}", GLOB_BRACE);
 
-		$last_article_id = 0;
-		$article_exists = 1;
+        $last_article_id = 0;
+        $article_exists = 1;
 
-		foreach ($files as $file) {
-			list ($article_id, $hash) = explode("-", basename($file));
+        foreach ($files as $file) {
+            list ($article_id, $hash) = explode("-", basename($file));
 
-			if ($article_id != $last_article_id) {
-				$last_article_id = $article_id;
+            if ($article_id != $last_article_id) {
+                $last_article_id = $article_id;
 
-				$sth = $this->pdo->prepare("SELECT id FROM ttrss_entries WHERE id = ?");
-				$sth->execute([$article_id]);
+                $sth = $this->pdo->prepare("SELECT id FROM ttrss_entries WHERE id = ?");
+                $sth->execute([$article_id]);
 
-				$article_exists = $sth->fetch();
-			}
+                $article_exists = $sth->fetch();
+            }
 
-			if (!$article_exists) {
-				unlink($file);
-			}
-		}
-	}
+            if (!$article_exists) {
+                unlink($file);
+            }
+        }
+    }
 
-	public function hook_enclosure_entry($enc, $article_id) {
-		$local_filename = $article_id . "-" . sha1($enc["content_url"]);
+    public function hook_enclosure_entry($enc, $article_id) {
+        $local_filename = $article_id . "-" . sha1($enc["content_url"]);
 
-		if ($this->cache->exists($local_filename)) {
-			$enc["content_url"] = $this->cache->getUrl($local_filename);
-		}
+        if ($this->cache->exists($local_filename)) {
+            $enc["content_url"] = $this->cache->getUrl($local_filename);
+        }
 
-		return $enc;
-	}
+        return $enc;
+    }
 
-	public function hook_sanitize($doc, $site_url, $allowed_elements, $disallowed_attributes, $article_id) {
-		$xpath = new DOMXpath($doc);
+    public function hook_sanitize($doc, $site_url, $allowed_elements, $disallowed_attributes, $article_id) {
+        $xpath = new DOMXpath($doc);
 
-		if ($article_id) {
-			$entries = $xpath->query('(//img[@src])|(//video/source[@src])');
+        if ($article_id) {
+            $entries = $xpath->query('(//img[@src])|(//video/source[@src])');
 
-			foreach ($entries as $entry) {
-				if ($entry->hasAttribute('src')) {
-					$src = rewrite_relative_url($site_url, $entry->getAttribute('src'));
+            foreach ($entries as $entry) {
+                if ($entry->hasAttribute('src')) {
+                    $src = rewrite_relative_url($site_url, $entry->getAttribute('src'));
 
-					$local_filename = $article_id . "-" . sha1($src);
+                    $local_filename = $article_id . "-" . sha1($src);
 
-					if ($this->cache->exists($local_filename)) {
-						$entry->setAttribute("src", $this->cache->getUrl($local_filename));
-						$entry->removeAttribute("srcset");
-					}
-				}
-			}
-		}
+                    if ($this->cache->exists($local_filename)) {
+                        $entry->setAttribute("src", $this->cache->getUrl($local_filename));
+                        $entry->removeAttribute("srcset");
+                    }
+                }
+            }
+        }
 
-		return $doc;
-	}
+        return $doc;
+    }
 
-	private function cache_url($article_id, $url) {
-		$local_filename = $article_id . "-" . sha1($url);
+    private function cache_url($article_id, $url) {
+        $local_filename = $article_id . "-" . sha1($url);
 
-		if (!$this->cache->exists($local_filename)) {
-			Debug::log("cache_images: downloading: $url to $local_filename", Debug::$LOG_VERBOSE);
+        if (!$this->cache->exists($local_filename)) {
+            Debug::log("cache_images: downloading: $url to $local_filename", Debug::$LOG_VERBOSE);
 
-			$data = fetch_file_contents(["url" => $url, "max_size" => MAX_CACHE_FILE_SIZE]);
+            $data = fetch_file_contents(["url" => $url, "max_size" => MAX_CACHE_FILE_SIZE]);
 
-			if ($data)
-				return $this->cache->put($local_filename, $data);;
+            if ($data)
+                return $this->cache->put($local_filename, $data);;
 
-		} else {
-			//Debug::log("cache_images: local file exists for $url", Debug::$LOG_VERBOSE);
+        } else {
+            //Debug::log("cache_images: local file exists for $url", Debug::$LOG_VERBOSE);
 
-			return true;
-		}
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	private function cache_article_images($content, $site_url, $owner_uid, $article_id) {
-		$status_filename = $article_id . "-" . sha1($site_url) . ".status";
+    private function cache_article_images($content, $site_url, $owner_uid, $article_id) {
+        $status_filename = $article_id . "-" . sha1($site_url) . ".status";
 
-		/* housekeeping might run as a separate user, in this case status/media might not be writable */
-		if (!$this->cache->isWritable($status_filename)) {
-			Debug::log("status not writable: $status_filename", Debug::$LOG_VERBOSE);
-			return false;
-		}
+        /* housekeeping might run as a separate user, in this case status/media might not be writable */
+        if (!$this->cache->isWritable($status_filename)) {
+            Debug::log("status not writable: $status_filename", Debug::$LOG_VERBOSE);
+            return false;
+        }
 
-		Debug::log("status: $status_filename", Debug::$LOG_VERBOSE);
+        Debug::log("status: $status_filename", Debug::$LOG_VERBOSE);
 
         if ($this->cache->exists($status_filename))
             $status = json_decode($this->cache->get($status_filename), true);
@@ -176,49 +176,49 @@ 
             return false;
         }
 
-		$doc = new DOMDocument();
+        $doc = new DOMDocument();
 
-		$has_images = false;
-		$success = false;
+        $has_images = false;
+        $success = false;
 
         if ($doc->loadHTML('<?xml encoding="UTF-8">' . $content)) {
-			$xpath = new DOMXPath($doc);
-			$entries = $xpath->query('(//img[@src])|(//video/source[@src])');
+            $xpath = new DOMXPath($doc);
+            $entries = $xpath->query('(//img[@src])|(//video/source[@src])');
 
-			foreach ($entries as $entry) {
+            foreach ($entries as $entry) {
 
-				if ($entry->hasAttribute('src') && strpos($entry->getAttribute('src'), "data:") !== 0) {
+                if ($entry->hasAttribute('src') && strpos($entry->getAttribute('src'), "data:") !== 0) {
 
-					$has_images = true;
+                    $has_images = true;
 
-					$src = rewrite_relative_url($site_url, $entry->getAttribute('src'));
+                    $src = rewrite_relative_url($site_url, $entry->getAttribute('src'));
 
-					if ($this->cache_url($article_id, $src)) {
-						$success = true;
-					}
-				}
-			}
-		}
+                    if ($this->cache_url($article_id, $src)) {
+                        $success = true;
+                    }
+                }
+            }
+        }
 
-		$esth = $this->pdo->prepare("SELECT content_url FROM ttrss_enclosures WHERE post_id = ? AND
+        $esth = $this->pdo->prepare("SELECT content_url FROM ttrss_enclosures WHERE post_id = ? AND
 			(content_type LIKE '%image%' OR content_type LIKE '%video%')");
 
         if ($esth->execute([$article_id])) {
-        	while ($enc = $esth->fetch()) {
+            while ($enc = $esth->fetch()) {
 
-        		$has_images = true;
-        		$url = rewrite_relative_url($site_url, $enc["content_url"]);
+                $has_images = true;
+                $url = rewrite_relative_url($site_url, $enc["content_url"]);
 
-				if ($this->cache_url($article_id, $url)) {
-					$success = true;
-				}
-			}
-		}
+                if ($this->cache_url($article_id, $url)) {
+                    $success = true;
+                }
+            }
+        }
 
-		return $success || !$has_images;
-	}
+        return $success || !$has_images;
+    }
 
-	public function api_version() {
-		return 2;
-	}
+    public function api_version() {
+        return 2;
+    }
 }