codysnider / tt-rss

include/autoload.php

Spacing +2 added lines, -2 removed lines

@@ -15,9 +15,9 @@
 		// 3. plugin classes are loaded by PluginHandler from plugins.local/ and plugins/ (TODO: use generic autoloader?)
 
 		if ($namespace && $class_name) {
-			$class_file = "$root_dir/vendor/$namespace/" . str_replace('\\', '/', $class_name) . ".php";
+			$class_file = "$root_dir/vendor/$namespace/".str_replace('\\', '/', $class_name).".php";
 		} else {
-			$class_file = "$root_dir/classes/" . str_replace("_", "/", strtolower($class)) . ".php";
+			$class_file = "$root_dir/classes/".str_replace("_", "/", strtolower($class)).".php";
 		}
 
 		if (file_exists($class_file))

Braces +6 added lines, -4 removed lines

@@ -5,8 +5,9 @@ 
 		$namespace = '';
 		$class_name = $class;
 
-		if (strpos($class, '\\') !== FALSE)
-			list ($namespace, $class_name) = explode('\\', $class, 2);
+		if (strpos($class, '\\') !== FALSE) {
+					list ($namespace, $class_name) = explode('\\', $class, 2);
+		}
 
 		$root_dir = dirname(__DIR__); // we're in tt-rss/include
 
@@ -20,7 +21,8 @@ 
 			$class_file = "$root_dir/classes/" . str_replace("_", "/", strtolower($class)) . ".php";
 		}
 
-		if (file_exists($class_file))
-			include $class_file;
+		if (file_exists($class_file)) {
+					include $class_file;
+		}
 
 	});

include/sanity_config.php

Spacing +1 added lines, -1 removed lines

@@ -1,3 +1,3 @@
 <?php # This file has been generated at:  Thu Nov 22 22:14:43 MSK 2018
 define('GENERATED_CONFIG_CHECK', 26);
-$required_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'SINGLE_USER_MODE', 'SIMPLE_UPDATE_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'SPHINX_SERVER', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'CHECK_FOR_UPDATES', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'LOG_DESTINATION', 'CONFIG_VERSION'); ?>
+$required_defines = array('DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'SINGLE_USER_MODE', 'SIMPLE_UPDATE_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'SPHINX_SERVER', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'CHECK_FOR_UPDATES', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'LOG_DESTINATION', 'CONFIG_VERSION'); ?>

include/controls.php

Spacing +13 added lines, -13 removed lines

@@ -76,7 +76,7 @@ 
 
 	$pdo = DB::pdo();
 
-	print_r(in_array("CAT:6",$default_ids));
+	print_r(in_array("CAT:6", $default_ids));
 
 	if (!$root_id) {
 		print "<select multiple=\true\" id=\"$id\" name=\"$id\" $attributes>";
@@ -102,7 +102,7 @@ 
 		while ($line = $sth->fetch()) {
 
 			for ($i = 0; $i < $nest_level; $i++)
-				$line["title"] = " - " . $line["title"];
+				$line["title"] = " - ".$line["title"];
 
 			$is_selected = in_array("CAT:".$line["id"], $default_ids) ? "selected=\"1\"" : "";
 
@@ -111,7 +111,7 @@ 
 
 			if ($line["num_children"] > 0)
 				print_feed_multi_select($id, $default_ids, $attributes,
-					$include_all_feeds, $line["id"], $nest_level+1);
+					$include_all_feeds, $line["id"], $nest_level + 1);
 
 			$f_sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
 					WHERE cat_id = ? AND owner_uid = ? ORDER BY title");
@@ -121,10 +121,10 @@ 
 			while ($fline = $f_sth->fetch()) {
 				$is_selected = (in_array($fline["id"], $default_ids)) ? "selected=\"1\"" : "";
 
-				$fline["title"] = " + " . $fline["title"];
+				$fline["title"] = " + ".$fline["title"];
 
 				for ($i = 0; $i < $nest_level; $i++)
-					$fline["title"] = " - " . $fline["title"];
+					$fline["title"] = " - ".$fline["title"];
 
 				printf("<option $is_selected value='%d'>%s</option>",
 					$fline["id"], htmlspecialchars($fline["title"]));
@@ -144,10 +144,10 @@ 
 			while ($fline = $f_sth->fetch()) {
 				$is_selected = in_array($fline["id"], $default_ids) ? "selected=\"1\"" : "";
 
-				$fline["title"] = " + " . $fline["title"];
+				$fline["title"] = " + ".$fline["title"];
 
 				for ($i = 0; $i < $nest_level; $i++)
-					$fline["title"] = " - " . $fline["title"];
+					$fline["title"] = " - ".$fline["title"];
 
 				printf("<option $is_selected value='%d'>%s</option>",
 					$fline["id"], htmlspecialchars($fline["title"]));
@@ -204,7 +204,7 @@ 
 		}
 
 		for ($i = 0; $i < $nest_level; $i++)
-			$line["title"] = " - " . $line["title"];
+			$line["title"] = " - ".$line["title"];
 
 		if ($line["title"])
 			printf("<option $is_selected value='%d'>%s</option>",
@@ -212,7 +212,7 @@ 
 
 		if ($line["num_children"] > 0)
 			print_feed_cat_select($id, $default_id, $attributes,
-				$include_all_cats, $line["id"], $nest_level+1);
+				$include_all_cats, $line["id"], $nest_level + 1);
 	}
 
 	if (!$root_id) {
@@ -245,7 +245,7 @@ 
 	$query = "";
 
 	if (!(strpos($filename, "?") === FALSE)) {
-		$query = substr($filename, strpos($filename, "?")+1);
+		$query = substr($filename, strpos($filename, "?") + 1);
 		$filename = substr($filename, 0, strpos($filename, "?"));
 	}
 
@@ -300,7 +300,7 @@ 
 		}
 
 		if ($entry) $entry .= "<a target=\"_blank\" rel=\"noopener noreferrer\"
-				href=\"$url\">" . basename($url) . "</a>";
+				href=\"$url\">".basename($url)."</a>";
 
 		$entry .= "</div>";
 
@@ -319,7 +319,7 @@ 
 			WHERE owner_uid = ? ORDER BY caption");
 	$sth->execute([$_SESSION['uid']]);
 
-	print "<select default=\"$value\" name=\"" . htmlspecialchars($name) .
+	print "<select default=\"$value\" name=\"".htmlspecialchars($name).
 		"\" $attributes>";
 
 	while ($line = $sth->fetch()) {
@@ -327,7 +327,7 @@ 
 		$issel = ($line["caption"] == $value) ? "selected=\"1\"" : "";
 
 		print "<option value=\"".htmlspecialchars($line["caption"])."\"
-				$issel>" . htmlspecialchars($line["caption"]) . "</option>";
+				$issel>".htmlspecialchars($line["caption"])."</option>";
 
 	}
 

Braces +54 added lines, -32 removed lines

@@ -1,14 +1,17 @@ 
 <?php
 
 function print_select($id, $default, $values, $attributes = "", $name = "") {
-	if (!$name) $name = $id;
+	if (!$name) {
+		$name = $id;
+	}
 
 	print "<select name=\"$name\" id=\"$id\" $attributes>";
 	foreach ($values as $v) {
-		if ($v == $default)
-			$sel = "selected=\"1\"";
-		else
-			$sel = "";
+		if ($v == $default) {
+					$sel = "selected=\"1\"";
+		} else {
+					$sel = "";
+		}
 
 		$v = trim($v);
 
@@ -18,14 +21,17 @@ 
 }
 
 function print_select_hash($id, $default, $values, $attributes = "", $name = "") {
-	if (!$name) $name = $id;
+	if (!$name) {
+		$name = $id;
+	}
 
 	print "<select name=\"$name\" id='$id' $attributes>";
 	foreach (array_keys($values) as $v) {
-		if ($v == $default)
-			$sel = 'selected="selected"';
-		else
-			$sel = "";
+		if ($v == $default) {
+					$sel = 'selected="selected"';
+		} else {
+					$sel = "";
+		}
 
 		$v = trim($v);
 
@@ -53,10 +59,11 @@ 
 function print_radio($id, $default, $true_is, $values, $attributes = "") {
 	foreach ($values as $v) {
 
-		if ($v == $default)
-			$sel = "checked";
-		else
-			$sel = "";
+		if ($v == $default) {
+					$sel = "checked";
+		} else {
+					$sel = "";
+		}
 
 		if ($v == $true_is) {
 			$sel .= " value=\"1\"";
@@ -88,7 +95,9 @@ 
 
 	if (get_pref('ENABLE_FEED_CATS')) {
 
-		if (!$root_id) $root_id = null;
+		if (!$root_id) {
+			$root_id = null;
+		}
 
 		$sth = $pdo->prepare("SELECT id,title,
 				(SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE
@@ -101,17 +110,19 @@ 
 
 		while ($line = $sth->fetch()) {
 
-			for ($i = 0; $i < $nest_level; $i++)
-				$line["title"] = " - " . $line["title"];
+			for ($i = 0; $i < $nest_level; $i++) {
+							$line["title"] = " - " . $line["title"];
+			}
 
 			$is_selected = in_array("CAT:".$line["id"], $default_ids) ? "selected=\"1\"" : "";
 
 			printf("<option $is_selected value='CAT:%d'>%s</option>",
 				$line["id"], htmlspecialchars($line["title"]));
 
-			if ($line["num_children"] > 0)
-				print_feed_multi_select($id, $default_ids, $attributes,
+			if ($line["num_children"] > 0) {
+							print_feed_multi_select($id, $default_ids, $attributes,
 					$include_all_feeds, $line["id"], $nest_level+1);
+			}
 
 			$f_sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
 					WHERE cat_id = ? AND owner_uid = ? ORDER BY title");
@@ -123,8 +134,9 @@ 
 
 				$fline["title"] = " + " . $fline["title"];
 
-				for ($i = 0; $i < $nest_level; $i++)
-					$fline["title"] = " - " . $fline["title"];
+				for ($i = 0; $i < $nest_level; $i++) {
+									$fline["title"] = " - " . $fline["title"];
+				}
 
 				printf("<option $is_selected value='%d'>%s</option>",
 					$fline["id"], htmlspecialchars($fline["title"]));
@@ -146,8 +158,9 @@ 
 
 				$fline["title"] = " + " . $fline["title"];
 
-				for ($i = 0; $i < $nest_level; $i++)
-					$fline["title"] = " - " . $fline["title"];
+				for ($i = 0; $i < $nest_level; $i++) {
+									$fline["title"] = " - " . $fline["title"];
+				}
 
 				printf("<option $is_selected value='%d'>%s</option>",
 					$fline["id"], htmlspecialchars($fline["title"]));
@@ -182,7 +195,9 @@ 
 
 	$pdo = DB::pdo();
 
-	if (!$root_id) $root_id = null;
+	if (!$root_id) {
+		$root_id = null;
+	}
 
 	$sth = $pdo->prepare("SELECT id,title,
 				(SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE
@@ -203,16 +218,19 @@ 
 			$is_selected = "";
 		}
 
-		for ($i = 0; $i < $nest_level; $i++)
-			$line["title"] = " - " . $line["title"];
+		for ($i = 0; $i < $nest_level; $i++) {
+					$line["title"] = " - " . $line["title"];
+		}
 
-		if ($line["title"])
-			printf("<option $is_selected value='%d'>%s</option>",
+		if ($line["title"]) {
+					printf("<option $is_selected value='%d'>%s</option>",
 				$line["id"], htmlspecialchars($line["title"]));
+		}
 
-		if ($line["num_children"] > 0)
-			print_feed_cat_select($id, $default_id, $attributes,
+		if ($line["num_children"] > 0) {
+					print_feed_cat_select($id, $default_id, $attributes,
 				$include_all_cats, $line["id"], $nest_level+1);
+		}
 	}
 
 	if (!$root_id) {
@@ -251,7 +269,9 @@ 
 
 	$timestamp = filemtime($filename);
 
-	if ($query) $timestamp .= "&$query";
+	if ($query) {
+		$timestamp .= "&$query";
+	}
 
 	return "<script type=\"text/javascript\" charset=\"utf-8\" src=\"$filename?$timestamp\"></script>\n";
 }
@@ -299,8 +319,10 @@ 
 
 		}
 
-		if ($entry) $entry .= "<a target=\"_blank\" rel=\"noopener noreferrer\"
+		if ($entry) {
+			$entry .= "<a target=\"_blank\" rel=\"noopener noreferrer\"
 				href=\"$url\">" . basename($url) . "</a>";
+		}
 
 		$entry .= "</div>";
 

include/errorhandler.php

Spacing +3 added lines, -3 removed lines

@@ -13,12 +13,12 @@ 
 						if (!is_object($a)) {
 							array_push($fmt_args, $a);
 						} else {
-							array_push($fmt_args, "[" . get_class($a) . "]");
+							array_push($fmt_args, "[".get_class($a)."]");
 						}
 					}
 				}
 
-				$filename = str_replace(dirname(__DIR__) . "/", "", $e["file"]);
+				$filename = str_replace(dirname(__DIR__)."/", "", $e["file"]);
 
 				$rv .= sprintf("%d. %s(%s): %s(%s)\n",
 					$idx, $filename, $e["line"], $e["function"], implode(", ", $fmt_args));
@@ -52,7 +52,7 @@ 
 		$errno = $error["type"];
 		$file = $error["file"];
 		$line = $error["line"];
-		$errstr  = $error["message"];
+		$errstr = $error["message"];
 
 		if (!$errno) return false;
 

Braces +16 added lines, -8 removed lines

@@ -32,16 +32,19 @@ 
 }
 
 function ttrss_error_handler($errno, $errstr, $file, $line, $context) {
-	if (error_reporting() == 0 || !$errno) return false;
+	if (error_reporting() == 0 || !$errno) {
+		return false;
+	}
 
 	$file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
 
 	$context = format_backtrace(debug_backtrace());
 	$errstr = truncate_middle($errstr, 16384, " (...) ");
 
-	if (class_exists("Logger"))
-		return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
-}
+	if (class_exists("Logger")) {
+			return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
+	}
+	}
 
 function ttrss_fatal_handler() {
 	global $last_query;
@@ -54,16 +57,21 @@ 
 		$line = $error["line"];
 		$errstr  = $error["message"];
 
-		if (!$errno) return false;
+		if (!$errno) {
+			return false;
+		}
 
 		$context = format_backtrace(debug_backtrace());
 
 		$file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
 
-		if ($last_query) $errstr .= " [Last query: $last_query]";
+		if ($last_query) {
+			$errstr .= " [Last query: $last_query]";
+		}
 
-		if (class_exists("Logger"))
-			return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
+		if (class_exists("Logger")) {
+					return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
+		}
 	}
 
 	return false;

prefs.php

Indentation +3 added lines, -3 removed lines

@@ -153,9 +153,9 @@
                 title="<i class='material-icons'>info_outline</i> <?php echo __('System') ?>"></div>
         <?php } ?>
         <?php
-            PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TABS,
-                "hook_prefs_tabs", false);
-        ?>
+			PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TABS,
+				"hook_prefs_tabs", false);
+		?>
         </div>
     <div id="footer" dojoType="dijit.layout.ContentPane" region="bottom">
         <a class="text-muted" target="_blank" href="http://tt-rss.org/">

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 		header("Location: install/");
 	}
 
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+	set_include_path(dirname(__FILE__)."/include".PATH_SEPARATOR.
 		get_include_path());
 
 	if (!file_exists("config.php")) {

Braces +3 added lines, -1 removed lines

@@ -19,7 +19,9 @@
 	require_once "config.php";
 	require_once "db-prefs.php";
 
-	if (!init_plugins()) return;
+	if (!init_plugins()) {
+		return;
+	}
 
 	login_sequence();
 

plugins/nsfw/init.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 	}
 
 	function get_js() {
-		return file_get_contents(dirname(__FILE__) . "/init.js");
+		return file_get_contents(dirname(__FILE__)."/init.js");
 	}
 
 	function hook_render_article($article) {

Braces +3 added lines, -1 removed lines

@@ -47,7 +47,9 @@
 	}
 
 	function hook_prefs_tab($args) {
-		if ($args != "prefPrefs") return;
+		if ($args != "prefPrefs") {
+			return;
+		}
 
 		print "<div dojoType=\"dijit.layout.AccordionPane\" 
 			title=\"<i class='material-icons'>extension</i> ".__("NSFW Plugin")."\">";

plugins/af_unburn/init.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 
 					$real_url = preg_replace("/\?$/", "", $real_url);
 
-					$article["plugin_data"] = "unburn,$owner_uid:" . $article["plugin_data"];
+					$article["plugin_data"] = "unburn,$owner_uid:".$article["plugin_data"];
 					$article["link"] = $real_url;
 				}
 		}

Braces +6 added lines, -3 removed lines

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

plugins/bookmarklets/init.php

Indentation +5 added lines, -5 removed lines

@@ -3,21 +3,21 @@
   private $host;
 
   function about() {
-    return array(1.0,
+	return array(1.0,
 		 "Easy feed subscription and web page sharing using bookmarklets",
 		 "fox",
-	     false,
+		 false,
 		 "https://git.tt-rss.org/fox/tt-rss/wiki/ShareAnything");
   }
 
   function init($host) {
-    $this->host = $host;
+	$this->host = $host;
 
-    $host->add_hook($host::HOOK_PREFS_TAB, $this);
+	$host->add_hook($host::HOOK_PREFS_TAB, $this);
   }
 
   function hook_prefs_tab($args) {
-    if ($args == "prefFeeds") {
+	if ($args == "prefFeeds") {
 
 		print "<div dojoType=\"dijit.layout.AccordionPane\" 
 			title=\"<i class='material-icons'>bookmark</i> ".__('Bookmarklets')."\">";

Spacing +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
 		print "<div dojoType=\"dijit.layout.AccordionPane\" 
 			title=\"<i class='material-icons'>bookmark</i> ".__('Bookmarklets')."\">";
 
-		print "<h3>" . __("Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it.") . "</h3>";
+		print "<h3>".__("Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it.")."</h3>";
 
 		$bm_subscribe_url = str_replace('%s', '', Pref_Feeds::subscribe_to_feed_url());
 
@@ -31,14 +31,14 @@ 
 		$bm_url = htmlspecialchars("javascript:{if(confirm('$confirm_str'.replace('%s',window.location.href)))window.location.href='$bm_subscribe_url'+window.location.href}");
 
 		print "<p><label class='dijitButton'>";
-		print "<a href=\"$bm_url\">" . __('Subscribe in Tiny Tiny RSS'). "</a>";
+		print "<a href=\"$bm_url\">".__('Subscribe in Tiny Tiny RSS')."</a>";
 		print "</label></p>";
 
-		print "<h3>" . __("Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS") . "</h3>";
+		print "<h3>".__("Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS")."</h3>";
 
 		print "<label class='dijitButton'>";
 		$bm_url = htmlspecialchars("javascript:(function(){var d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='".get_self_url_prefix()."/public.php?op=sharepopup',l=d.location,e=encodeURIComponent,g=f+'&title='+((e(s))?e(s):e(document.title))+'&url='+e(l.href);function a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=500,height=250')){l.href=g;}}a();})()");
-		print "<a href=\"$bm_url\">" . __('Share with Tiny Tiny RSS'). "</a>";
+		print "<a href=\"$bm_url\">".__('Share with Tiny Tiny RSS')."</a>";
 		print "</label>";
 
 		print "<button dojoType='dijit.form.Button' class='alt-info' onclick='window.open(\"https://tt-rss.org/wiki/ShareAnything\")'>

plugins/af_psql_trgm/init.php

Spacing +12 added lines, -12 removed lines

@@ -41,7 +41,7 @@ 
 	}
 
 	function get_js() {
-		return file_get_contents(__DIR__ . "/init.js");
+		return file_get_contents(__DIR__."/init.js");
 	}
 
 	function showrelated() {
@@ -98,7 +98,7 @@ 
 
 				print "</div>";
 
-				print "<div style='text-align : right' class='text-muted'>" . smart_date_time(strtotime($line["updated"])) . "</div>";
+				print "<div style='text-align : right' class='text-muted'>".smart_date_time(strtotime($line["updated"]))."</div>";
 
 				print "</li>";
 			}
@@ -163,24 +163,24 @@ 
 			print_hidden("method", "save");
 			print_hidden("plugin", "af_psql_trgm");
 
-			print "<h2>" . __("Global settings") . "</h2>";
+			print "<h2>".__("Global settings")."</h2>";
 
 			print_notice("Enable for specific feeds in the feed editor.");
 
 			print "<fieldset>";
 
-			print "<label>" . __("Minimum similarity:") . "</label> ";
+			print "<label>".__("Minimum similarity:")."</label> ";
 			print "<input dojoType=\"dijit.form.NumberSpinner\"
 				placeholder=\"0.75\" id='psql_trgm_similarity'
 				required=\"1\" name=\"similarity\" value=\"$similarity\">";
 
-			print "<div dojoType='dijit.Tooltip' connectId='psql_trgm_similarity' position='below'>" .
-				__("PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking.") .
+			print "<div dojoType='dijit.Tooltip' connectId='psql_trgm_similarity' position='below'>".
+				__("PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking.").
 				"</div>";
 
 			print "</fieldset><fieldset>";
 
-			print "<label>" . __("Minimum title length:") . "</label> ";
+			print "<label>".__("Minimum title length:")."</label> ";
 			print "<input dojoType=\"dijit.form.NumberSpinner\"
 				placeholder=\"32\"
 				required=\"1\" name=\"min_title_length\" value=\"$min_title_length\">";
@@ -189,7 +189,7 @@ 
 
 			print "<label class='checkbox'>";
 			print_checkbox("enable_globally", $enable_globally);
-			print " " . __("Enable for all feeds:");
+			print " ".__("Enable for all feeds:");
 			print "</label>";
 
 			print "</fieldset>";
@@ -204,14 +204,14 @@ 
 			$this->host->set($this, "enabled_feeds", $enabled_feeds);
 
 			if (count($enabled_feeds) > 0) {
-				print "<h3>" . __("Currently enabled for (click to edit):") . "</h3>";
+				print "<h3>".__("Currently enabled for (click to edit):")."</h3>";
 
 				print "<ul class=\"panel panel-scrollable list list-unstyled\">";
 				foreach ($enabled_feeds as $f) {
-					print "<li>" .
+					print "<li>".
 						"<i class='material-icons'>rss_feed</i> <a href='#'
-							onclick='CommonDialogs.editFeed($f)'>" .
-						Feeds::getFeedTitle($f) . "</a></li>";
+							onclick='CommonDialogs.editFeed($f)'>".
+						Feeds::getFeedTitle($f)."</a></li>";
 				}
 				print "</ul>";
 			}

Braces +42 added lines, -14 removed lines

@@ -15,10 +15,16 @@ 
 		$min_title_length = (int) $_POST["min_title_length"];
 		$enable_globally = checkbox_to_sql_bool($_POST["enable_globally"]);
 
-		if ($similarity < 0) $similarity = 0;
-		if ($similarity > 1) $similarity = 1;
+		if ($similarity < 0) {
+			$similarity = 0;
+		}
+		if ($similarity > 1) {
+			$similarity = 1;
+		}
 
-		if ($min_title_length < 0) $min_title_length = 0;
+		if ($min_title_length < 0) {
+			$min_title_length = 0;
+		}
 
 		$similarity = sprintf("%.2f", $similarity);
 
@@ -121,7 +127,9 @@ 
 	}
 
 	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> ".__('Mark similar articles as read')."\">";
@@ -140,8 +148,12 @@ 
 			$min_title_length = $this->host->get($this, "min_title_length");
 			$enable_globally = $this->host->get($this, "enable_globally");
 
-			if (!$similarity) $similarity = '0.75';
-			if (!$min_title_length) $min_title_length = '32';
+			if (!$similarity) {
+				$similarity = '0.75';
+			}
+			if (!$min_title_length) {
+				$min_title_length = '32';
+			}
 
 			print "<form dojoType=\"dijit.form.Form\">";
 
@@ -198,7 +210,9 @@ 
 			print "</form>";
 
 			$enabled_feeds = $this->host->get($this, "enabled_feeds");
-			if (!array($enabled_feeds)) $enabled_feeds = array();
+			if (!array($enabled_feeds)) {
+				$enabled_feeds = array();
+			}
 
 			$enabled_feeds = $this->filter_unknown_feeds($enabled_feeds);
 			$this->host->set($this, "enabled_feeds", $enabled_feeds);
@@ -225,7 +239,9 @@ 
 		print "<section>";
 
 		$enabled_feeds = $this->host->get($this, "enabled_feeds");
-		if (!array($enabled_feeds)) $enabled_feeds = array();
+		if (!array($enabled_feeds)) {
+			$enabled_feeds = array();
+		}
 
 		$key = array_search($feed_id, $enabled_feeds);
 		$checked = $key !== FALSE ? "checked" : "";
@@ -242,7 +258,9 @@ 
 
 	function hook_prefs_save_feed($feed_id) {
 		$enabled_feeds = $this->host->get($this, "enabled_feeds");
-		if (!is_array($enabled_feeds)) $enabled_feeds = array();
+		if (!is_array($enabled_feeds)) {
+			$enabled_feeds = array();
+		}
 
 		$enable = checkbox_to_sql_bool($_POST["trgm_similarity_enabled"]);
 		$key = array_search($feed_id, $enabled_feeds);
@@ -262,24 +280,34 @@ 
 
 	function hook_article_filter($article) {
 
-		if (DB_TYPE != "pgsql") return $article;
+		if (DB_TYPE != "pgsql") {
+			return $article;
+		}
 
 		$res = $this->pdo->query("select 'similarity'::regproc");
-		if (!$res->fetch()) return $article;
+		if (!$res->fetch()) {
+			return $article;
+		}
 
 		$enable_globally = $this->host->get($this, "enable_globally");
 
 		if (!$enable_globally) {
 			$enabled_feeds = $this->host->get($this, "enabled_feeds");
 			$key = array_search($article["feed"]["id"], $enabled_feeds);
-			if ($key === FALSE) return $article;
+			if ($key === FALSE) {
+				return $article;
+			}
 		}
 
 		$similarity = (float) $this->host->get($this, "similarity");
-		if ($similarity < 0.01) return $article;
+		if ($similarity < 0.01) {
+			return $article;
+		}
 
 		$min_title_length = (int) $this->host->get($this, "min_title_length");
-		if (mb_strlen($article["title"]) < $min_title_length) return $article;
+		if (mb_strlen($article["title"]) < $min_title_length) {
+			return $article;
+		}
 
 		$owner_uid = $article["owner_uid"];
 		$entry_guid = $article["guid_hashed"];