codysnider / tt-rss

plugins/af_comics/filters/af_comics_tfd.php

Indentation +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 
 	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)");

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

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

@@ -16,8 +16,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

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
 
 	function about() {
 		return array(1.0,
@@ -167,30 +167,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])');
 
@@ -212,11 +212,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

@@ -38,7 +38,7 @@ 
 	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
@@ -56,13 +56,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']]);
 					}
@@ -72,9 +72,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;
@@ -98,7 +98,7 @@ 
 	}
 
 	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);
@@ -120,7 +120,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));
@@ -134,7 +134,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);
@@ -142,7 +142,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);
@@ -157,7 +157,7 @@ 
 	 * @SuppressWarnings(PHPMD.UnusedFormalParameter)
 	 */
 	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)) {
@@ -190,7 +190,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])');
 

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;
 

plugins/mailto/init.php

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
 	}
 
 	function get_js() {
-		return file_get_contents(dirname(__FILE__) . "/init.js");
+		return file_get_contents(dirname(__FILE__)."/init.js");
 	}
 
 	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"]));

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

plugins/toggle_sidebar/init.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 	}
 
 	function get_js() {
-		return file_get_contents(__DIR__ . "/init.js");
+		return file_get_contents(__DIR__."/init.js");
 	}
 
 	function hook_main_toolbar_button() {

plugins/note/init.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 	}
 
 	function get_js() {
-		return file_get_contents(dirname(__FILE__) . "/note.js");
+		return file_get_contents(dirname(__FILE__)."/note.js");
 	}
 
 

plugins/af_fsckportal/init.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 
 			$doc = new DOMDocument();
 
-			@$doc->loadHTML('<?xml encoding="UTF-8">' . $article["content"]);
+			@$doc->loadHTML('<?xml encoding="UTF-8">'.$article["content"]);
 
 			if ($doc) {
 				$xpath = new DOMXPath($doc);

plugins/af_zz_noautoplay/init.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 	}
 
 	function get_js() {
-		return file_get_contents(__DIR__ . "/init.js");
+		return file_get_contents(__DIR__."/init.js");
 	}
 
 	function api_version() {

classes/db.php

Switch Indentation +8 added lines, -8 removed lines

@@ -24,14 +24,14 @@
 		$er = error_reporting(E_ALL);
 
 		switch (DB_TYPE) {
-			case "mysql":
-				$this->adapter = new Db_Mysqli();
-				break;
-			case "pgsql":
-				$this->adapter = new Db_Pgsql();
-				break;
-			default:
-				die("Unknown DB_TYPE: " . DB_TYPE);
+		case "mysql":
+			$this->adapter = new Db_Mysqli();
+			break;
+		case "pgsql":
+			$this->adapter = new Db_Pgsql();
+			break;
+		default:
+			die("Unknown DB_TYPE: " . DB_TYPE);
 		}
 
 		if (!$this->adapter) {

Spacing +9 added lines, -9 removed lines

@@ -19,7 +19,7 @@ 
 
 	private function legacy_connect() {
 
-		user_error("Legacy connect requested to " . DB_TYPE, E_USER_NOTICE);
+		user_error("Legacy connect requested to ".DB_TYPE, E_USER_NOTICE);
 
 		$er = error_reporting(E_ALL);
 
@@ -31,18 +31,18 @@ 
 				$this->adapter = new Db_Pgsql();
 				break;
 			default:
-				die("Unknown DB_TYPE: " . DB_TYPE);
+				die("Unknown DB_TYPE: ".DB_TYPE);
 		}
 
 		if (!$this->adapter) {
-			print("Error initializing database adapter for " . DB_TYPE);
+			print("Error initializing database adapter for ".DB_TYPE);
 			exit(100);
 		}
 
 		$this->link = $this->adapter->connect(DB_HOST, DB_USER, DB_PASS, DB_NAME, defined('DB_PORT') ? DB_PORT : "");
 
 		if (!$this->link) {
-			print("Error connecting through adapter: " . $this->adapter->last_error());
+			print("Error connecting through adapter: ".$this->adapter->last_error());
 			exit(101);
 		}
 
@@ -53,15 +53,15 @@ 
 	// normal usage is Db::pdo()->prepare(...) etc
 	public function pdo_connect() {
 
-		$db_port = defined('DB_PORT') && DB_PORT ? ';port=' . DB_PORT : '';
-		$db_host = defined('DB_HOST') && DB_HOST ? ';host=' . DB_HOST : '';
+		$db_port = defined('DB_PORT') && DB_PORT ? ';port='.DB_PORT : '';
+		$db_host = defined('DB_HOST') && DB_HOST ? ';host='.DB_HOST : '';
 
 		try {
-			$pdo = new PDO(DB_TYPE . ':dbname=' . DB_NAME . $db_host . $db_port,
+			$pdo = new PDO(DB_TYPE.':dbname='.DB_NAME.$db_host.$db_port,
 				DB_USER,
 				DB_PASS);
 		} catch (Exception $e) {
-			print "<pre>Exception while creating PDO object:" . $e->getMessage() . "</pre>";
+			print "<pre>Exception while creating PDO object:".$e->getMessage()."</pre>";
 			exit(101);
 		}
 
@@ -78,7 +78,7 @@ 
 			$pdo->query("SET time_zone = '+0:0'");
 
 			if (defined('MYSQL_CHARSET') && MYSQL_CHARSET) {
-				$pdo->query("SET NAMES " . MYSQL_CHARSET);
+				$pdo->query("SET NAMES ".MYSQL_CHARSET);
 			}
 		}
 

Braces +9 added lines, -6 removed lines

@@ -86,15 +86,17 @@ 
 	}
 
 	public static function instance() {
-		if (self::$instance == null)
-			self::$instance = new self();
+		if (self::$instance == null) {
+					self::$instance = new self();
+		}
 
 		return self::$instance;
 	}
 
 	public static function get() {
-		if (self::$instance == null)
-			self::$instance = new self();
+		if (self::$instance == null) {
+					self::$instance = new self();
+		}
 
 		if (!self::$instance->adapter) {
 			self::$instance->legacy_connect();
@@ -104,8 +106,9 @@ 
 	}
 
 	public static function pdo() {
-		if (self::$instance == null)
-			self::$instance = new self();
+		if (self::$instance == null) {
+					self::$instance = new self();
+		}
 
 		if (!self::$instance->pdo) {
 			self::$instance->pdo = self::$instance->pdo_connect();