codysnider / tt-rss

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

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

classes/diskcache.php

Spacing +6 added lines, -6 removed lines

@@ -3,7 +3,7 @@ 
 	private $dir;
 
 	public function __construct($dir) {
-		$this->dir = CACHE_DIR . "/" . clean_filename($dir);
+		$this->dir = CACHE_DIR."/".clean_filename($dir);
 	}
 
 	public function getDir() {
@@ -41,7 +41,7 @@ 
 	public function getFullPath($filename) {
 		$filename = clean_filename($filename);
 
-		return $this->dir . "/" . $filename;
+		return $this->dir."/".$filename;
 	}
 
 	public function put($filename, $data) {
@@ -73,7 +73,7 @@ 
 	}
 
 	public function getUrl($filename) {
-		return get_self_url_prefix() . "/public.php?op=cached_url&file=" . basename($this->dir) . "/" . $filename;
+		return get_self_url_prefix()."/public.php?op=cached_url&file=".basename($this->dir)."/".$filename;
 	}
 
 	// check for locally cached (media) URLs and rewrite to local versions
@@ -85,7 +85,7 @@ 
 		if (!$res) return '';
 
 		$doc = new DOMDocument();
-		if ($doc->loadHTML('<?xml encoding="UTF-8">' . $res)) {
+		if ($doc->loadHTML('<?xml encoding="UTF-8">'.$res)) {
 			$xpath = new DOMXPath($doc);
 			$cache = new DiskCache("images");
 
@@ -126,7 +126,7 @@ 
 	}
 
 	static function expire() {
-		$dirs = array_filter(glob(CACHE_DIR . "/*"), "is_dir");
+		$dirs = array_filter(glob(CACHE_DIR."/*"), "is_dir");
 
 		foreach ($dirs as $cache_dir) {
 			$num_deleted = 0;
@@ -136,7 +136,7 @@ 
 
 				if ($files) {
 					foreach ($files as $file) {
-						if (time() - filemtime($file) > 86400*CACHE_MAX_DAYS) {
+						if (time() - filemtime($file) > 86400 * CACHE_MAX_DAYS) {
 							unlink($file);
 
 							++$num_deleted;

Braces +26 added lines, -20 removed lines

@@ -18,10 +18,11 @@ 
 
 	public function isWritable($filename = "") {
 		if ($filename) {
-			if (file_exists($this->getFullPath($filename)))
-				return is_writable($this->getFullPath($filename));
-			else
-				return is_writable($this->dir);
+			if (file_exists($this->getFullPath($filename))) {
+							return is_writable($this->getFullPath($filename));
+			} else {
+							return is_writable($this->dir);
+			}
 		} else {
 			return is_writable($this->dir);
 		}
@@ -32,10 +33,11 @@ 
 	}
 
 	public function getSize($filename) {
-		if ($this->exists($filename))
-			return filesize($this->getFullPath($filename));
-		else
-			return -1;
+		if ($this->exists($filename)) {
+					return filesize($this->getFullPath($filename));
+		} else {
+					return -1;
+		}
 	}
 
 	public function getFullPath($filename) {
@@ -53,17 +55,19 @@ 
 	}
 
 	public function get($filename) {
-		if ($this->exists($filename))
-			return file_get_contents($this->getFullPath($filename));
-		else
-			return null;
+		if ($this->exists($filename)) {
+					return file_get_contents($this->getFullPath($filename));
+		} else {
+					return null;
+		}
 	}
 
 	public function getMimeType($filename) {
-		if ($this->exists($filename))
-			return mime_content_type($this->getFullPath($filename));
-		else
-			return null;
+		if ($this->exists($filename)) {
+					return mime_content_type($this->getFullPath($filename));
+		} else {
+					return null;
+		}
 	}
 
 	public function send($filename) {
@@ -82,7 +86,9 @@ 
 	static public function rewriteUrls($str)
 	{
 		$res = trim($str);
-		if (!$res) return '';
+		if (!$res) {
+			return '';
+		}
 
 		$doc = new DOMDocument();
 		if ($doc->loadHTML('<?xml encoding="UTF-8">' . $res)) {
@@ -105,9 +111,9 @@ 
 
 						$src = $cache->getUrl(sha1($src));
 
-						if ($entry->hasAttribute('poster'))
-							$entry->setAttribute('poster', $src);
-						else {
+						if ($entry->hasAttribute('poster')) {
+													$entry->setAttribute('poster', $src);
+						} else {
 							$entry->setAttribute('src', $src);
 							$entry->removeAttribute("srcset");
 						}

classes/mailer.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 				return 0;
 		}
 
-		$headers = [ "From: $from_combined", "Content-Type: text/plain; charset=UTF-8" ];
+		$headers = ["From: $from_combined", "Content-Type: text/plain; charset=UTF-8"];
 
 		return mail($to_combined, $subject, $message, implode("\r\n", array_merge($headers, $additional_headers)));
 	}

Braces +9 added lines, -6 removed lines

@@ -19,8 +19,9 @@ 
 		$from_combined = $from_name ? "$from_name <$from_address>" : $from_address;
 		$to_combined = $to_name ? "$to_name <$to_address>" : $to_address;
 
-		if (defined('_LOG_SENT_MAIL') && _LOG_SENT_MAIL)
-			Logger::get()->log("Sending mail from $from_combined to $to_combined [$subject]: $message");
+		if (defined('_LOG_SENT_MAIL') && _LOG_SENT_MAIL) {
+					Logger::get()->log("Sending mail from $from_combined to $to_combined [$subject]: $message");
+		}
 
 		// HOOK_SEND_MAIL plugin instructions:
 		// 1. return 1 or true if mail is handled
@@ -31,11 +32,13 @@ 
 		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEND_MAIL) as $p) {
 			$rc = $p->hook_send_mail($this, $params);
 
-			if ($rc == 1)
-				return $rc;
+			if ($rc == 1) {
+							return $rc;
+			}
 
-			if ($rc == -1)
-				return 0;
+			if ($rc == -1) {
+							return 0;
+			}
 		}
 
 		$headers = [ "From: $from_combined", "Content-Type: text/plain; charset=UTF-8" ];

classes/pluginhost.php

Spacing +18 added lines, -18 removed lines

@@ -194,12 +194,12 @@ 
 					!is_dir(__DIR__."/../plugins.local/$class_file")) continue;
 
 			// try system plugin directory first
-			$file = __DIR__ . "/../plugins/$class_file/init.php";
-			$vendor_dir = __DIR__ . "/../plugins/$class_file/vendor";
+			$file = __DIR__."/../plugins/$class_file/init.php";
+			$vendor_dir = __DIR__."/../plugins/$class_file/vendor";
 
 			if (!file_exists($file)) {
-				$file = __DIR__ . "/../plugins.local/$class_file/init.php";
-				$vendor_dir = __DIR__ . "/../plugins.local/$class_file/vendor";
+				$file = __DIR__."/../plugins.local/$class_file/init.php";
+				$vendor_dir = __DIR__."/../plugins.local/$class_file/vendor";
 			}
 
 			if (!isset($this->plugins[$class])) {
@@ -217,7 +217,7 @@ 
 								list ($namespace, $class_name) = explode('\\', $class, 2);
 
 								if ($namespace && $class_name) {
-									$class_file = "$vendor_dir/$namespace/" . str_replace('\\', '/', $class_name) . ".php";
+									$class_file = "$vendor_dir/$namespace/".str_replace('\\', '/', $class_name).".php";
 
 									if (file_exists($class_file))
 										require_once $class_file;
@@ -231,12 +231,12 @@ 
 					$plugin_api = $plugin->api_version();
 
 					if ($plugin_api < PluginHost::API_VERSION) {
-						user_error("Plugin $class is not compatible with current API version (need: " . PluginHost::API_VERSION . ", got: $plugin_api)", E_USER_WARNING);
+						user_error("Plugin $class is not compatible with current API version (need: ".PluginHost::API_VERSION.", got: $plugin_api)", E_USER_WARNING);
 						continue;
 					}
 
-					if (file_exists(dirname($file) . "/locale")) {
-						_bindtextdomain($class, dirname($file) . "/locale");
+					if (file_exists(dirname($file)."/locale")) {
+						_bindtextdomain($class, dirname($file)."/locale");
 						_bind_textdomain_codeset($class, "UTF-8");
 					}
 
@@ -319,13 +319,13 @@ 
 	}
 
 	function del_command($command) {
-		$command = "-" . strtolower($command);
+		$command = "-".strtolower($command);
 
 		unset($this->commands[$command]);
 	}
 
 	function lookup_command($command) {
-		$command = "-" . strtolower($command);
+		$command = "-".strtolower($command);
 
 		if (is_array($this->commands[$command])) {
 			return $this->commands[$command]["class"];
@@ -348,7 +348,7 @@ 
 	}
 
 	function load_data() {
-		if ($this->owner_uid)  {
+		if ($this->owner_uid) {
 			$sth = $this->pdo->prepare("SELECT name, content FROM ttrss_plugin_storage
 				WHERE owner_uid = ?");
 			$sth->execute([$this->owner_uid]);
@@ -375,13 +375,13 @@ 
 			if ($sth->fetch()) {
 				$sth = $this->pdo->prepare("UPDATE ttrss_plugin_storage SET content = ?
 					WHERE owner_uid= ? AND name = ?");
-				$sth->execute([(string)$content, $this->owner_uid, $plugin]);
+				$sth->execute([(string) $content, $this->owner_uid, $plugin]);
 
 			} else {
 				$sth = $this->pdo->prepare("INSERT INTO ttrss_plugin_storage
 					(name,owner_uid,content) VALUES
 					(?, ?, ?)");
-				$sth->execute([$plugin, $this->owner_uid, (string)$content]);
+				$sth->execute([$plugin, $this->owner_uid, (string) $content]);
 			}
 
 			$this->pdo->commit();
@@ -495,8 +495,8 @@ 
 	}
 
 	// handled by classes/pluginhandler.php, requires valid session
-	function get_method_url($sender, $method, $params)  {
-		return get_self_url_prefix() . "/backend.php?" .
+	function get_method_url($sender, $method, $params) {
+		return get_self_url_prefix()."/backend.php?".
 			http_build_query(
 				array_merge(
 					[
@@ -508,9 +508,9 @@ 
 	}
 
 	// WARNING: endpoint in public.php, exposed to unauthenticated users
-	function get_public_method_url($sender, $method, $params)  {
+	function get_public_method_url($sender, $method, $params) {
 		if ($sender->is_public_method($method)) {
-			return get_self_url_prefix() . "/public.php?" .
+			return get_self_url_prefix()."/public.php?".
 				http_build_query(
 					array_merge(
 						[
@@ -520,7 +520,7 @@ 
 						],
 						$params));
 		} else {
-			user_error("get_public_method_url: requested method '$method' of '" . get_class($sender) . "' is private.");
+			user_error("get_public_method_url: requested method '$method' of '".get_class($sender)."' is private.");
 		}
 	}
 }

Braces +36 added lines, -17 removed lines

@@ -82,8 +82,9 @@ 
 	}
 
 	public static function getInstance() {
-		if (self::$instance == null)
-			self::$instance = new self();
+		if (self::$instance == null) {
+					self::$instance = new self();
+		}
 
 		return self::$instance;
 	}
@@ -191,7 +192,9 @@ 
 			$class_file = strtolower(clean_filename($class));
 
 			if (!is_dir(__DIR__."/../plugins/$class_file") &&
-					!is_dir(__DIR__."/../plugins.local/$class_file")) continue;
+					!is_dir(__DIR__."/../plugins.local/$class_file")) {
+				continue;
+			}
 
 			// try system plugin directory first
 			$file = __DIR__ . "/../plugins/$class_file/init.php";
@@ -203,7 +206,9 @@ 
 			}
 
 			if (!isset($this->plugins[$class])) {
-				if (file_exists($file)) require_once $file;
+				if (file_exists($file)) {
+					require_once $file;
+				}
 
 				if (class_exists($class) && is_subclass_of($class, "Plugin")) {
 
@@ -219,8 +224,9 @@ 
 								if ($namespace && $class_name) {
 									$class_file = "$vendor_dir/$namespace/" . str_replace('\\', '/', $class_name) . ".php";
 
-									if (file_exists($class_file))
-										require_once $class_file;
+									if (file_exists($class_file)) {
+																			require_once $class_file;
+									}
 								}
 							}
 						});
@@ -245,18 +251,24 @@ 
 					switch ($kind) {
 					case $this::KIND_SYSTEM:
 						if ($this->is_system($plugin)) {
-							if (!$skip_init) $plugin->init($this);
+							if (!$skip_init) {
+								$plugin->init($this);
+							}
 							$this->register_plugin($class, $plugin);
 						}
 						break;
 					case $this::KIND_USER:
 						if (!$this->is_system($plugin)) {
-							if (!$skip_init) $plugin->init($this);
+							if (!$skip_init) {
+								$plugin->init($this);
+							}
 							$this->register_plugin($class, $plugin);
 						}
 						break;
 					case $this::KIND_ALL:
-						if (!$skip_init) $plugin->init($this);
+						if (!$skip_init) {
+							$plugin->init($this);
+						}
 						$this->register_plugin($class, $plugin);
 						break;
 					}
@@ -367,8 +379,9 @@ 
 				owner_uid= ? AND name = ?");
 			$sth->execute([$this->owner_uid, $plugin]);
 
-			if (!isset($this->storage[$plugin]))
-				$this->storage[$plugin] = array();
+			if (!isset($this->storage[$plugin])) {
+							$this->storage[$plugin] = array();
+			}
 
 			$content = serialize($this->storage[$plugin]);
 
@@ -391,12 +404,15 @@ 
 	function set($sender, $name, $value, $sync = true) {
 		$idx = get_class($sender);
 
-		if (!isset($this->storage[$idx]))
-			$this->storage[$idx] = array();
+		if (!isset($this->storage[$idx])) {
+					$this->storage[$idx] = array();
+		}
 
 		$this->storage[$idx][$name] = $value;
 
-		if ($sync) $this->save_data(get_class($sender));
+		if ($sync) {
+			$this->save_data(get_class($sender));
+		}
 	}
 
 	function get($sender, $name, $default_value = false) {
@@ -433,7 +449,9 @@ 
 
 	// cat_id: only -1 is supported (Special)
 	function add_feed($cat_id, $title, $icon, $sender) {
-		if (!$this->feeds[$cat_id]) $this->feeds[$cat_id] = array();
+		if (!$this->feeds[$cat_id]) {
+			$this->feeds[$cat_id] = array();
+		}
 
 		$id = count($this->feeds[$cat_id]);
 
@@ -479,8 +497,9 @@ 
 	function add_filter_action($sender, $action_name, $action_desc) {
 		$sender_class = get_class($sender);
 
-		if (!isset($this->plugin_actions[$sender_class]))
-			$this->plugin_actions[$sender_class] = array();
+		if (!isset($this->plugin_actions[$sender_class])) {
+					$this->plugin_actions[$sender_class] = array();
+		}
 
 		array_push($this->plugin_actions[$sender_class],
 			array("action" => $action_name, "description" => $action_desc, "sender" => $sender));