codysnider / tt-rss

include/controls.php

Braces +24 added lines, -15 removed lines

@@ -110,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");
@@ -132,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"]));
@@ -155,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"]));
@@ -214,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) {
@@ -312,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/functions.php

Spacing +48 added lines, -49 removed lines

@@ -203,7 +203,7 @@ 
 	if (!is_array($options)) {
 
 		// falling back on compatibility shim
-		$option_names = [ "url", "type", "login", "pass", "post_query", "timeout", "last_modified", "useragent" ];
+		$option_names = ["url", "type", "login", "pass", "post_query", "timeout", "last_modified", "useragent"];
 		$tmp = [];
 
 		for ($i = 0; $i < func_num_args(); $i++) {
@@ -230,13 +230,13 @@ 
 	$url = str_replace(' ', '%20', $url);
 
 	if (strpos($url, "//") === 0)
-		$url = 'http:' . $url;
+		$url = 'http:'.$url;
 
 	$url_host = parse_url($url, PHP_URL_HOST);
 	$fetch_domain_hits[$url_host] += 1;
 
 	if ($fetch_domain_hits[$url_host] > MAX_FETCH_REQUESTS_PER_HOST) {
-		user_error("Exceeded fetch request quota for $url_host: " . $fetch_domain_hits[$url_host], E_USER_WARNING);
+		user_error("Exceeded fetch request quota for $url_host: ".$fetch_domain_hits[$url_host], E_USER_WARNING);
 		#return false;
 	}
 
@@ -252,7 +252,7 @@ 
 			array_push($curl_http_headers, "If-Modified-Since: $last_modified");
 
 		if ($http_accept)
-			array_push($curl_http_headers, "Accept: " . $http_accept);
+			array_push($curl_http_headers, "Accept: ".$http_accept);
 
 		if (count($curl_http_headers) > 0)
 			curl_setopt($ch, CURLOPT_HTTPHEADER, $curl_http_headers);
@@ -265,11 +265,10 @@ 
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 		curl_setopt($ch, CURLOPT_HEADER, true);
 		curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
-		curl_setopt($ch, CURLOPT_USERAGENT, $useragent ? $useragent :
-			SELF_USER_AGENT);
+		curl_setopt($ch, CURLOPT_USERAGENT, $useragent ? $useragent : SELF_USER_AGENT);
 		curl_setopt($ch, CURLOPT_ENCODING, "");
 
-		if  ($http_referrer)
+		if ($http_referrer)
 			curl_setopt($ch, CURLOPT_REFERER, $http_referrer);
 
 		if ($max_size) {
@@ -278,7 +277,7 @@ 
 
 			// holy shit closures in php
 			// download & upload are *expected* sizes respectively, could be zero
-			curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function($curl_handle, $download_size, $downloaded, $upload_size, $uploaded) use( &$max_size) {
+			curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function($curl_handle, $download_size, $downloaded, $upload_size, $uploaded) use(&$max_size) {
 				Debug::log("[curl progressfunction] $downloaded $max_size", Debug::$LOG_EXTENDED);
 
 				return ($downloaded > $max_size) ? 1 : 0; // if max size is set, abort when exceeding it
@@ -338,7 +337,7 @@ 
 		if ($http_code != 200 || $type && strpos($fetch_last_content_type, "$type") === false) {
 
 			if (curl_errno($ch) != 0) {
-				$fetch_last_error .=  "; " . curl_errno($ch) . " " . curl_error($ch);
+				$fetch_last_error .= "; ".curl_errno($ch)." ".curl_error($ch);
 			}
 
 			$fetch_last_error_content = $contents;
@@ -347,7 +346,7 @@ 
 		}
 
 		if (!$contents) {
-			$fetch_last_error = curl_errno($ch) . " " . curl_error($ch);
+			$fetch_last_error = curl_errno($ch)." ".curl_error($ch);
 			curl_close($ch);
 			return false;
 		}
@@ -367,7 +366,7 @@ 
 
 		$fetch_curl_used = false;
 
-		if ($login && $pass){
+		if ($login && $pass) {
 			$url_parts = array();
 
 			preg_match("/(^[^:]*):\/\/(.*)/", $url, $url_parts);
@@ -375,7 +374,7 @@ 
 			$pass = urlencode($pass);
 
 			if ($url_parts[1] && $url_parts[2]) {
-				$url = $url_parts[1] . "://$login:$pass@" . $url_parts[2];
+				$url = $url_parts[1]."://$login:$pass@".$url_parts[2];
 			}
 		}
 
@@ -443,7 +442,7 @@ 
 			$error = error_get_last();
 
 			if ($error['message'] != $old_error['message']) {
-				$fetch_last_error .= "; " . $error["message"];
+				$fetch_last_error .= "; ".$error["message"];
 			}
 
 			$fetch_last_error_content = $data;
@@ -518,15 +517,15 @@ 
 
 function get_ssl_certificate_id() {
 	if ($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"]) {
-		return sha1($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"] .
-			$_SERVER["REDIRECT_SSL_CLIENT_V_START"] .
-			$_SERVER["REDIRECT_SSL_CLIENT_V_END"] .
+		return sha1($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"].
+			$_SERVER["REDIRECT_SSL_CLIENT_V_START"].
+			$_SERVER["REDIRECT_SSL_CLIENT_V_END"].
 			$_SERVER["REDIRECT_SSL_CLIENT_S_DN"]);
 	}
 	if ($_SERVER["SSL_CLIENT_M_SERIAL"]) {
-		return sha1($_SERVER["SSL_CLIENT_M_SERIAL"] .
-			$_SERVER["SSL_CLIENT_V_START"] .
-			$_SERVER["SSL_CLIENT_V_END"] .
+		return sha1($_SERVER["SSL_CLIENT_M_SERIAL"].
+			$_SERVER["SSL_CLIENT_V_START"].
+			$_SERVER["SSL_CLIENT_V_END"].
 			$_SERVER["SSL_CLIENT_S_DN"]);
 	}
 	return "";
@@ -661,7 +660,7 @@ 
 function logout_user() {
 	@session_destroy();
 	if (isset($_COOKIE[session_name()])) {
-	   setcookie(session_name(), '', time()-42000, '/');
+	   setcookie(session_name(), '', time() - 42000, '/');
 	}
 	session_commit();
 }
@@ -745,7 +744,7 @@ 
 
 function truncate_string($str, $max_len, $suffix = '&hellip;') {
 	if (mb_strlen($str, "utf-8") > $max_len) {
-		return mb_substr($str, 0, $max_len, "utf-8") . $suffix;
+		return mb_substr($str, 0, $max_len, "utf-8").$suffix;
 	} else {
 		return $str;
 	}
@@ -755,7 +754,7 @@ 
 	$startString = mb_substr($original, 0, $position, "UTF-8");
 	$endString = mb_substr($original, $position + $length, mb_strlen($original), "UTF-8");
 
-	$out = $startString . $replacement . $endString;
+	$out = $startString.$replacement.$endString;
 
 	return $out;
 }
@@ -893,9 +892,9 @@ 
 }
 
 function file_is_locked($filename) {
-	if (file_exists(LOCK_DIRECTORY . "/$filename")) {
+	if (file_exists(LOCK_DIRECTORY."/$filename")) {
 		if (function_exists('flock')) {
-			$fp = @fopen(LOCK_DIRECTORY . "/$filename", "r");
+			$fp = @fopen(LOCK_DIRECTORY."/$filename", "r");
 			if ($fp) {
 				if (flock($fp, LOCK_EX | LOCK_NB)) {
 					flock($fp, LOCK_UN);
@@ -916,11 +915,11 @@ 
 
 
 function make_lockfile($filename) {
-	$fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
+	$fp = fopen(LOCK_DIRECTORY."/$filename", "w");
 
 	if ($fp && flock($fp, LOCK_EX | LOCK_NB)) {
 		$stat_h = fstat($fp);
-		$stat_f = stat(LOCK_DIRECTORY . "/$filename");
+		$stat_f = stat(LOCK_DIRECTORY."/$filename");
 
 		if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
 			if ($stat_h["ino"] != $stat_f["ino"] ||
@@ -931,7 +930,7 @@ 
 		}
 
 		if (function_exists('posix_getpid')) {
-			fwrite($fp, posix_getpid() . "\n");
+			fwrite($fp, posix_getpid()."\n");
 		}
 		return $fp;
 	} else {
@@ -940,10 +939,10 @@ 
 }
 
 function make_stampfile($filename) {
-	$fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
+	$fp = fopen(LOCK_DIRECTORY."/$filename", "w");
 
 	if (flock($fp, LOCK_EX | LOCK_NB)) {
-		fwrite($fp, time() . "\n");
+		fwrite($fp, time()."\n");
 		flock($fp, LOCK_UN);
 		fclose($fp);
 		return true;
@@ -993,7 +992,7 @@ 
 	$params["is_default_pw"] = Pref_Prefs::isdefaultpassword();
 	$params["label_base_index"] = (int) LABEL_BASE_INDEX;
 
-	$theme = get_pref( "USER_CSS_THEME", false, false);
+	$theme = get_pref("USER_CSS_THEME", false, false);
 	$params["theme"] = theme_exists($theme) ? $theme : "";
 
 	$params["plugins"] = implode(", ", PluginHost::getInstance()->get_plugin_names());
@@ -1217,13 +1216,13 @@ 
 		}
 	}
 
-	if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock")) {
+	if (file_exists(LOCK_DIRECTORY."/update_daemon.lock")) {
 
 		$data['daemon_is_running'] = (int) file_is_locked("update_daemon.lock");
 
 		if (time() - $_SESSION["daemon_stamp_check"] > 30) {
 
-			$stamp = (int) @file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
+			$stamp = (int) @file_get_contents(LOCK_DIRECTORY."/update_daemon.stamp");
 
 			if ($stamp) {
 				$stamp_delta = time() - $stamp;
@@ -1266,7 +1265,7 @@ 
 	$res = trim($str); if (!$res) return '';
 
 	$doc = new DOMDocument();
-	$doc->loadHTML('<?xml encoding="UTF-8">' . $res);
+	$doc->loadHTML('<?xml encoding="UTF-8">'.$res);
 	$xpath = new DOMXPath($doc);
 
 	$rewrite_base_url = $site_url ? $site_url : get_self_url_prefix();
@@ -1365,7 +1364,7 @@ 
 		'ol', 'p', 'picture', 'pre', 'q', 'ruby', 'rp', 'rt', 's', 'samp', 'section',
 		'small', 'source', 'span', 'strike', 'strong', 'sub', 'summary',
 		'sup', 'table', 'tbody', 'td', 'tfoot', 'th', 'thead', 'time',
-		'tr', 'track', 'tt', 'u', 'ul', 'var', 'wbr', 'video', 'xml:namespace' );
+		'tr', 'track', 'tt', 'u', 'ul', 'var', 'wbr', 'video', 'xml:namespace');
 
 	if ($_SESSION['hasSandbox']) $allowed_elements[] = 'iframe';
 
@@ -1500,8 +1499,8 @@ 
 
 // this returns SELF_URL_PATH sans ending slash
 function get_self_url_prefix() {
-	if (strrpos(SELF_URL_PATH, "/") === strlen(SELF_URL_PATH)-1) {
-		return substr(SELF_URL_PATH, 0, strlen(SELF_URL_PATH)-1);
+	if (strrpos(SELF_URL_PATH, "/") === strlen(SELF_URL_PATH) - 1) {
+		return substr(SELF_URL_PATH, 0, strlen(SELF_URL_PATH) - 1);
 	} else {
 		return SELF_URL_PATH;
 	}
@@ -1510,11 +1509,11 @@ 
 /* TODO: This needs to use bcrypt */
 function encrypt_password($pass, $salt = '', $mode2 = false) {
 	if ($salt && $mode2) {
-		return "MODE2:" . hash('sha256', $salt . $pass);
+		return "MODE2:".hash('sha256', $salt.$pass);
 	} else if ($salt) {
-		return "SHA1X:" . sha1("$salt:$pass");
+		return "SHA1X:".sha1("$salt:$pass");
 	} else {
-		return "SHA1:" . sha1($pass);
+		return "SHA1:".sha1($pass);
 	}
 }
 
@@ -1525,7 +1524,7 @@ 
 }
 
 function build_url($parts) {
-	return $parts['scheme'] . "://" . $parts['host'] . $parts['path'];
+	return $parts['scheme']."://".$parts['host'].$parts['path'];
 }
 
 function cleanup_url_path($path) {
@@ -1569,7 +1568,7 @@ 
 			$dir = dirname($parts['path']);
 			$dir !== '/' && $dir .= '/';
 		}
-		$parts['path'] = $dir . $rel_url;
+		$parts['path'] = $dir.$rel_url;
 		$parts['path'] = cleanup_url_path($parts['path']);
 
 		return build_url($parts);
@@ -1656,12 +1655,12 @@ 
 
 		for ($i = 0; $i < $l10n->total; $i++) {
 			$orig = $l10n->get_original_string($i);
-			if(strpos($orig, "\000") !== FALSE) { // Plural forms
+			if (strpos($orig, "\000") !== FALSE) { // Plural forms
 				$key = explode(chr(0), $orig);
 				print T_js_decl($key[0], _ngettext($key[0], $key[1], 1)); // Singular
 				print T_js_decl($key[1], _ngettext($key[0], $key[1], 2)); // Plural
 			} else {
-				$translation = _dgettext($domain,$orig);
+				$translation = _dgettext($domain, $orig);
 				print T_js_decl($orig, $translation);
 			}
 		}
@@ -1717,7 +1716,7 @@ 
 	if (file_exists($filename)) {
 		$ext = pathinfo($filename, PATHINFO_EXTENSION);
 
-		return "data:image/$ext;base64," . base64_encode(file_get_contents($filename));
+		return "data:image/$ext;base64,".base64_encode(file_get_contents($filename));
 	} else {
 		return "";
 	}
@@ -1754,7 +1753,7 @@ 
 
 		header("Content-type: $mimetype");
 
-		$stamp = gmdate("D, d M Y H:i:s", filemtime($filename)) . " GMT";
+		$stamp = gmdate("D, d M Y H:i:s", filemtime($filename))." GMT";
 		header("Last-Modified: $stamp", true);
 
 		return readfile($filename);
@@ -1764,7 +1763,7 @@ 
 }
 
 function arr_qmarks($arr) {
-	return str_repeat('?,', count($arr) - 1) . '?';
+	return str_repeat('?,', count($arr) - 1).'?';
 }
 
 function get_scripts_timestamp() {
@@ -1799,7 +1798,7 @@ 
 	} else if (PHP_OS === "Darwin") {
 		$ttrss_version = "UNKNOWN (Unsupported, Darwin)";
 	} else if (file_exists("$root_dir/version_static.txt")) {
-		$ttrss_version = trim(file_get_contents("$root_dir/version_static.txt")) . " (Unsupported)";
+		$ttrss_version = trim(file_get_contents("$root_dir/version_static.txt"))." (Unsupported)";
 	} else if (is_dir("$root_dir/.git")) {
 		$rc = 0;
 		$output = [];
@@ -1817,10 +1816,10 @@ 
 				$git_commit = $commit;
 				$git_timestamp = $timestamp;
 
-				$ttrss_version = strftime("%y.%m", $timestamp) . "-$commit";
+				$ttrss_version = strftime("%y.%m", $timestamp)."-$commit";
 			}
 		} else {
-			user_error("Unable to determine version (using $root_dir): " . implode("\n", $output), E_USER_WARNING);
+			user_error("Unable to determine version (using $root_dir): ".implode("\n", $output), E_USER_WARNING);
 		}
 	}
 

Braces +125 added lines, -64 removed lines

@@ -197,8 +197,9 @@ 
 	$fetch_last_modified = "";
 	$fetch_effective_url = "";
 
-	if (!is_array($fetch_domain_hits))
-		$fetch_domain_hits = [];
+	if (!is_array($fetch_domain_hits)) {
+			$fetch_domain_hits = [];
+	}
 
 	if (!is_array($options)) {
 
@@ -229,8 +230,9 @@ 
 	$url = ltrim($url, ' ');
 	$url = str_replace(' ', '%20', $url);
 
-	if (strpos($url, "//") === 0)
-		$url = 'http:' . $url;
+	if (strpos($url, "//") === 0) {
+			$url = 'http:' . $url;
+	}
 
 	$url_host = parse_url($url, PHP_URL_HOST);
 	$fetch_domain_hits[$url_host] += 1;
@@ -248,14 +250,17 @@ 
 
 		$curl_http_headers = [];
 
-		if ($last_modified && !$post_query)
-			array_push($curl_http_headers, "If-Modified-Since: $last_modified");
+		if ($last_modified && !$post_query) {
+					array_push($curl_http_headers, "If-Modified-Since: $last_modified");
+		}
 
-		if ($http_accept)
-			array_push($curl_http_headers, "Accept: " . $http_accept);
+		if ($http_accept) {
+					array_push($curl_http_headers, "Accept: " . $http_accept);
+		}
 
-		if (count($curl_http_headers) > 0)
-			curl_setopt($ch, CURLOPT_HTTPHEADER, $curl_http_headers);
+		if (count($curl_http_headers) > 0) {
+					curl_setopt($ch, CURLOPT_HTTPHEADER, $curl_http_headers);
+		}
 
 		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout ? $timeout : FILE_FETCH_CONNECT_TIMEOUT);
 		curl_setopt($ch, CURLOPT_TIMEOUT, $timeout ? $timeout : FILE_FETCH_TIMEOUT);
@@ -269,8 +274,9 @@ 
 			SELF_USER_AGENT);
 		curl_setopt($ch, CURLOPT_ENCODING, "");
 
-		if  ($http_referrer)
-			curl_setopt($ch, CURLOPT_REFERER, $http_referrer);
+		if  ($http_referrer) {
+					curl_setopt($ch, CURLOPT_REFERER, $http_referrer);
+		}
 
 		if ($max_size) {
 			curl_setopt($ch, CURLOPT_NOPROGRESS, false);
@@ -299,8 +305,9 @@ 
 			curl_setopt($ch, CURLOPT_POSTFIELDS, $post_query);
 		}
 
-		if ($login && $pass)
-			curl_setopt($ch, CURLOPT_USERPWD, "$login:$pass");
+		if ($login && $pass) {
+					curl_setopt($ch, CURLOPT_USERPWD, "$login:$pass");
+		}
 
 		$ret = @curl_exec($ch);
 
@@ -359,7 +366,9 @@ 
 		if ($is_gzipped) {
 			$tmp = @gzdecode($contents);
 
-			if ($tmp) $contents = $tmp;
+			if ($tmp) {
+				$contents = $tmp;
+			}
 		}
 
 		return $contents;
@@ -392,14 +401,17 @@ 
 					'protocol_version'=> 1.1)
 			  );
 
-		if (!$post_query && $last_modified)
-			array_push($context_options['http']['header'], "If-Modified-Since: $last_modified");
+		if (!$post_query && $last_modified) {
+					array_push($context_options['http']['header'], "If-Modified-Since: $last_modified");
+		}
 
-		if ($http_accept)
-			array_push($context_options['http']['header'], "Accept: $http_accept");
+		if ($http_accept) {
+					array_push($context_options['http']['header'], "Accept: $http_accept");
+		}
 
-		if ($http_referrer)
-			array_push($context_options['http']['header'], "Referer: $http_referrer");
+		if ($http_referrer) {
+					array_push($context_options['http']['header'], "Referer: $http_referrer");
+		}
 
 		if (defined('_HTTP_PROXY')) {
 			$context_options['http']['request_fulluri'] = true;
@@ -456,7 +468,9 @@ 
 		if ($is_gzipped) {
 			$tmp = @gzdecode($data);
 
-			if ($tmp) $data = $tmp;
+			if ($tmp) {
+				$data = $tmp;
+			}
 		}
 
 		return $data;
@@ -466,7 +480,9 @@ 
 
 function initialize_user_prefs($uid, $profile = false) {
 
-	if (get_schema_version() < 63) $profile_qpart = "";
+	if (get_schema_version() < 63) {
+		$profile_qpart = "";
+	}
 
 	$pdo = DB::pdo();
 	$in_nested_tr = false;
@@ -479,7 +495,9 @@ 
 
 	$sth = $pdo->query("SELECT pref_name,def_value FROM ttrss_prefs");
 
-	if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null;
+	if (!is_numeric($profile) || !$profile || get_schema_version() < 63) {
+		$profile = null;
+	}
 
 	$u_sth = $pdo->prepare("SELECT pref_name
         FROM ttrss_user_prefs WHERE owner_uid = :uid AND
@@ -512,7 +530,9 @@ 
 		}
 	}
 
-	if (!$in_nested_tr) $pdo->commit();
+	if (!$in_nested_tr) {
+		$pdo->commit();
+	}
 
 }
 
@@ -672,7 +692,9 @@ 
 
 function load_user_plugins($owner_uid, $pluginhost = false) {
 
-	if (!$pluginhost) $pluginhost = PluginHost::getInstance();
+	if (!$pluginhost) {
+		$pluginhost = PluginHost::getInstance();
+	}
 
 	if ($owner_uid && SCHEMA_VERSION >= 100) {
 		$plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
@@ -694,7 +716,9 @@ 
 		startup_gettext();
 		load_user_plugins($_SESSION["uid"]);
 	} else {
-		if (!validate_session()) $_SESSION["uid"] = false;
+		if (!validate_session()) {
+			$_SESSION["uid"] = false;
+		}
 
 		if (!$_SESSION["uid"]) {
 
@@ -789,13 +813,19 @@ 
 function make_local_datetime($timestamp, $long, $owner_uid = false,
 				$no_smart_dt = false, $eta_min = false) {
 
-	if (!$owner_uid) $owner_uid = $_SESSION['uid'];
-	if (!$timestamp) $timestamp = '1970-01-01 0:00';
+	if (!$owner_uid) {
+		$owner_uid = $_SESSION['uid'];
+	}
+	if (!$timestamp) {
+		$timestamp = '1970-01-01 0:00';
+	}
 
 	global $utc_tz;
 	global $user_tz;
 
-	if (!$utc_tz) $utc_tz = new DateTimeZone('UTC');
+	if (!$utc_tz) {
+		$utc_tz = new DateTimeZone('UTC');
+	}
 
 	$timestamp = substr($timestamp, 0, 19);
 
@@ -807,7 +837,9 @@ 
 	if ($user_tz_string != 'Automatic') {
 
 		try {
-			if (!$user_tz) $user_tz = new DateTimeZone($user_tz_string);
+			if (!$user_tz) {
+				$user_tz = new DateTimeZone($user_tz_string);
+			}
 		} catch (Exception $e) {
 			$user_tz = $utc_tz;
 		}
@@ -823,26 +855,30 @@ 
 		return smart_date_time($user_timestamp,
 			$tz_offset, $owner_uid, $eta_min);
 	} else {
-		if ($long)
-			$format = get_pref('LONG_DATE_FORMAT', $owner_uid);
-		else
-			$format = get_pref('SHORT_DATE_FORMAT', $owner_uid);
+		if ($long) {
+					$format = get_pref('LONG_DATE_FORMAT', $owner_uid);
+		} else {
+					$format = get_pref('SHORT_DATE_FORMAT', $owner_uid);
+		}
 
 		return date($format, $user_timestamp);
 	}
 }
 
 function smart_date_time($timestamp, $tz_offset = 0, $owner_uid = false, $eta_min = false) {
-	if (!$owner_uid) $owner_uid = $_SESSION['uid'];
+	if (!$owner_uid) {
+		$owner_uid = $_SESSION['uid'];
+	}
 
 	if ($eta_min && time() + $tz_offset - $timestamp < 3600) {
 		return T_sprintf("%d min", date("i", time() + $tz_offset - $timestamp));
 	} else if (date("Y.m.d", $timestamp) == date("Y.m.d", time() + $tz_offset)) {
 		$format = get_pref('SHORT_DATE_FORMAT', $owner_uid);
-		if (strpos((strtolower($format)), "a") === false)
-			return date("G:i", $timestamp);
-		else
-			return date("g:i a", $timestamp);
+		if (strpos((strtolower($format)), "a") === false) {
+					return date("G:i", $timestamp);
+		} else {
+					return date("g:i a", $timestamp);
+		}
 	} else if (date("Y", $timestamp) == date("Y", time() + $tz_offset)) {
 		$format = get_pref('SHORT_DATE_FORMAT', $owner_uid);
 		return date($format, $timestamp);
@@ -1252,8 +1288,9 @@ 
 
 	if ($src) {
 		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_IFRAME_WHITELISTED) as $plugin) {
-			if ($plugin->hook_iframe_whitelisted($src))
-				return true;
+			if ($plugin->hook_iframe_whitelisted($src)) {
+							return true;
+			}
 		}
 	}
 
@@ -1261,9 +1298,13 @@ 
 }
 
 function sanitize($str, $force_remove_images = false, $owner = false, $site_url = false, $highlight_words = false, $article_id = false) {
-	if (!$owner) $owner = $_SESSION["uid"];
+	if (!$owner) {
+		$owner = $_SESSION["uid"];
+	}
 
-	$res = trim($str); if (!$res) return '';
+	$res = trim($str); if (!$res) {
+		return '';
+	}
 
 	$doc = new DOMDocument();
 	$doc->loadHTML('<?xml encoding="UTF-8">' . $res);
@@ -1325,13 +1366,15 @@ 
 
 			if ($entry->nodeName == 'source') {
 
-				if ($entry->parentNode && $entry->parentNode->parentNode)
-					$entry->parentNode->parentNode->replaceChild($p, $entry->parentNode);
+				if ($entry->parentNode && $entry->parentNode->parentNode) {
+									$entry->parentNode->parentNode->replaceChild($p, $entry->parentNode);
+				}
 
 			} else if ($entry->nodeName == 'img') {
 
-				if ($entry->parentNode)
-					$entry->parentNode->replaceChild($p, $entry);
+				if ($entry->parentNode) {
+									$entry->parentNode->replaceChild($p, $entry);
+				}
 
 			}
 		}
@@ -1367,7 +1410,9 @@ 
 		'sup', 'table', 'tbody', 'td', 'tfoot', 'th', 'thead', 'time',
 		'tr', 'track', 'tt', 'u', 'ul', 'var', 'wbr', 'video', 'xml:namespace' );
 
-	if ($_SESSION['hasSandbox']) $allowed_elements[] = 'iframe';
+	if ($_SESSION['hasSandbox']) {
+		$allowed_elements[] = 'iframe';
+	}
 
 	$disallowed_attributes = array('id', 'style', 'class');
 
@@ -1407,7 +1452,9 @@ 
 					$text = mb_substr($text, $pos + mb_strlen($word));
 				}
 
-				if (!empty($text)) $fragment->appendChild(new DomText($text));
+				if (!empty($text)) {
+					$fragment->appendChild(new DomText($text));
+				}
 
 				$child->parentNode->replaceChild($fragment, $child);
 			}
@@ -1598,8 +1645,9 @@ 
 	} else {
 		$output = "";
 
-		for ($i = 0; $i < $length; $i++)
-			$output .= chr(mt_rand(0, 255));
+		for ($i = 0; $i < $length; $i++) {
+					$output .= chr(mt_rand(0, 255));
+		}
 
 		return $output;
 	}
@@ -1669,15 +1717,20 @@ 
 }
 
 function get_theme_path($theme) {
-	if ($theme == "default.php")
-		return "css/default.css";
+	if ($theme == "default.php") {
+			return "css/default.css";
+	}
 
 	$check = "themes/$theme";
-	if (file_exists($check)) return $check;
+	if (file_exists($check)) {
+		return $check;
+	}
 
 	$check = "themes.local/$theme";
-	if (file_exists($check)) return $check;
-}
+	if (file_exists($check)) {
+		return $check;
+	}
+	}
 
 function theme_exists($theme) {
 	return file_exists("themes/$theme") || file_exists("themes.local/$theme");
@@ -1733,7 +1786,9 @@ 
 function send_local_file($filename) {
 	if (file_exists($filename)) {
 
-		if (is_writable($filename)) touch($filename);
+		if (is_writable($filename)) {
+			touch($filename);
+		}
 
 		$tmppluginhost = new PluginHost();
 
@@ -1741,7 +1796,9 @@ 
 		$tmppluginhost->load_data();
 
 		foreach ($tmppluginhost->get_hooks(PluginHost::HOOK_SEND_LOCAL_FILE) as $plugin) {
-			if ($plugin->hook_send_local_file($filename)) return true;
+			if ($plugin->hook_send_local_file($filename)) {
+				return true;
+			}
 		}
 
 		$mimetype = mime_content_type($filename);
@@ -1749,8 +1806,9 @@ 
 		// this is hardly ideal but 1) only media is cached in images/ and 2) seemingly only mp4
 		// video files are detected as octet-stream by mime_content_type()
 
-		if ($mimetype == "application/octet-stream")
-			$mimetype = "video/mp4";
+		if ($mimetype == "application/octet-stream") {
+					$mimetype = "video/mp4";
+		}
 
 		header("Content-type: $mimetype");
 
@@ -1773,7 +1831,9 @@ 
 
 	foreach ($files as $file) {
 		$file_ts = filemtime($file);
-		if ($file_ts > $ts) $ts = $file_ts;
+		if ($file_ts > $ts) {
+			$ts = $file_ts;
+		}
 	}
 
 	return $ts;
@@ -1786,8 +1846,9 @@ 
 function get_version(&$git_commit = false, &$git_timestamp = false) {
 	global $ttrss_version;
 
-	if (isset($ttrss_version))
-		return $ttrss_version;
+	if (isset($ttrss_version)) {
+			return $ttrss_version;
+	}
 
 	$ttrss_version = "UNKNOWN (Unsupported)";
 

include/sessions.php

Spacing +6 added lines, -6 removed lines

@@ -78,11 +78,11 @@ 
 	return true;
 }
 
-function ttrss_open () {
+function ttrss_open() {
 	return true;
 }
 
-function ttrss_read ($id){
+function ttrss_read($id) {
 	global $session_expire;
 
 	$sth = Db::pdo()->prepare("SELECT data FROM ttrss_sessions WHERE id=?");
@@ -101,7 +101,7 @@ 
 	}
 }
 
-function ttrss_write ($id, $data) {
+function ttrss_write($id, $data) {
 	global $session_expire;
 
 	$data = base64_encode($data);
@@ -121,7 +121,7 @@ 
 	return true;
 }
 
-function ttrss_close () {
+function ttrss_close() {
 	return true;
 }
 
@@ -132,8 +132,8 @@ 
 	return true;
 }
 
-function ttrss_gc () {
-	Db::pdo()->query("DELETE FROM ttrss_sessions WHERE expire < " . time());
+function ttrss_gc() {
+	Db::pdo()->query("DELETE FROM ttrss_sessions WHERE expire < ".time());
 
 	return true;
 }

Braces +3 added lines, -1 removed lines

@@ -35,7 +35,9 @@
 }
 
 function validate_session() {
-	if (SINGLE_USER_MODE) return true;
+	if (SINGLE_USER_MODE) {
+		return true;
+	}
 
 	if (isset($_SESSION["ref_schema_version"]) && $_SESSION["ref_schema_version"] != session_get_schema_version()) {
 		$_SESSION["login_error_msg"] =

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/Nodes/DOM/DOMNodeList.php

Switch Indentation +4 added lines, -4 removed lines

@@ -32,10 +32,10 @@
 	public function __get($name)
 	{
 		switch ($name) {
-			case 'length':
-				return $this->length;
-			default:
-				trigger_error(sprintf('Undefined property: %s::%s', static::class, $name));
+		case 'length':
+			return $this->length;
+		default:
+			trigger_error(sprintf('Undefined property: %s::%s', static::class, $name));
 		}
 	}
 

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

Spacing +1 added lines, -1 removed lines

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

plugins/cache_starred_images/init.php

Indentation +16 added lines, -16 removed lines

@@ -162,31 +162,31 @@
 
 		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])');
 

plugins/mail/init.php

Braces +3 added lines, -2 removed lines

@@ -124,8 +124,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"]));
 			$tnote = strip_tags($line["note"]);