codysnider / tt-rss

plugins/af_redditimgur/init.php

Indentation +21 added lines, -21 removed lines

@@ -280,36 +280,36 @@
 					$found = true;
 				}
 
-                // imgur via link rel="image_src" href="..."
-                if (!$found && preg_match("/imgur/", $entry->getAttribute("href"))) {
+				// imgur via link rel="image_src" href="..."
+				if (!$found && preg_match("/imgur/", $entry->getAttribute("href"))) {
 
-                    Debug::log("handling as imgur page/whatever", Debug::$LOG_VERBOSE);
+					Debug::log("handling as imgur page/whatever", 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);
 
-                            $rel_image = $cxpath->query("//link[@rel='image_src']")->item(0);
+							$rel_image = $cxpath->query("//link[@rel='image_src']")->item(0);
 
-                            if ($rel_image) {
+							if ($rel_image) {
 
-                                $img = $doc->createElement('img');
-                                $img->setAttribute("src", $rel_image->getAttribute("href"));
+								$img = $doc->createElement('img');
+								$img->setAttribute("src", $rel_image->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;
+							}
+						}
+					}
+				}
 
 				// wtf is this even
 				if (!$found && preg_match("/^https?:\/\/gyazo\.com\/([^\.\/]+$)/", $entry->getAttribute("href"), $matches)) {

Spacing +10 added lines, -10 removed lines

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

Braces +13 added lines, -7 removed lines

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

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

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

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

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

plugins/af_comics/filters/af_comics_tfd.php

Braces +3 added lines, -1 removed lines

@@ -12,7 +12,9 @@
 				false, false, 0,
 				"Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; WOW64; Trident/6.0)");
 
-			if (!$res) return $article;
+			if (!$res) {
+				return $article;
+			}
 
 			$doc = new DOMDocument();
 

Indentation +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 
 	public function process(&$article) {
 		if (strpos($article["link"], "toothpastefordinner.com") !== FALSE ||
-		    strpos($article["link"], "marriedtothesea.com") !== FALSE) {
+			strpos($article["link"], "marriedtothesea.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)");

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

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;
 

Indentation +20 added lines, -20 removed lines

@@ -5,7 +5,7 @@ 
 	private $host;
 	/* @var DiskCache $cache */
 	private $cache;
-    private $max_cache_attempts = 5; // per-article
+	private $max_cache_attempts = 5; // per-article
 
 	public function about() {
 		return array(1.0,
@@ -158,30 +158,30 @@ 
 
 		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;
+		$status["attempt"] += 1;
 
-        // only allow several download attempts for article
-        if ($status["attempt"] > $this->max_cache_attempts) {
-            Debug::log("too many attempts for $site_url", Debug::$LOG_VERBOSE);
-            return false;
-        }
+		// only allow several download attempts for article
+		if ($status["attempt"] > $this->max_cache_attempts) {
+			Debug::log("too many attempts for $site_url", Debug::$LOG_VERBOSE);
+			return false;
+		}
 
-        if (!$this->cache->put($status_filename, json_encode($status))) {
-            user_error("unable to write status file: $status_filename", E_USER_WARNING);
-            return false;
-        }
+		if (!$this->cache->put($status_filename, json_encode($status))) {
+			user_error("unable to write status file: $status_filename", E_USER_WARNING);
+			return false;
+		}
 
 		$doc = new DOMDocument();
 
 		$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])');
 
@@ -203,11 +203,11 @@ 
 		$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()) {
+		if ($esth->execute([$article_id])) {
+			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;

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

plugins/mailto/init.php

Braces +3 added lines, -2 removed lines

@@ -53,8 +53,9 @@
 
 		while ($line = $sth->fetch()) {
 
-			if (!$subject)
-				$subject = __("[Forwarded]") . " " . htmlspecialchars($line["title"]);
+			if (!$subject) {
+							$subject = __("[Forwarded]") . " " . htmlspecialchars($line["title"]);
+			}
 
 			$tpl->setVariable('ARTICLE_TITLE', strip_tags($line["title"]));
 			$tpl->setVariable('ARTICLE_URL', strip_tags($line["link"]));

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
 	}
 
 	public function get_js() {
-		return file_get_contents(dirname(__FILE__) . "/init.js");
+		return file_get_contents(dirname(__FILE__)."/init.js");
 	}
 
 	public function hook_article_button($line) {
@@ -46,7 +46,7 @@ 
 		$sth->execute(array_merge($ids, [$_SESSION['uid']]));
 
 		if (count($ids) > 1) {
-			$subject = __("[Forwarded]") . " " . __("Multiple articles");
+			$subject = __("[Forwarded]")." ".__("Multiple articles");
 		} else {
 			$subject = "";
 		}
@@ -54,7 +54,7 @@ 
 		while ($line = $sth->fetch()) {
 
 			if (!$subject)
-				$subject = __("[Forwarded]") . " " . htmlspecialchars($line["title"]);
+				$subject = __("[Forwarded]")." ".htmlspecialchars($line["title"]);
 
 			$tpl->setVariable('ARTICLE_TITLE', strip_tags($line["title"]));
 			$tpl->setVariable('ARTICLE_URL', strip_tags($line["link"]));