codysnider / tt-rss

classes/pref/filters.php

Braces +28 added lines, -16 removed lines

@@ -99,12 +99,16 @@ 
 			}
 		}
 
-		if (count($scope_qparts) == 0) $scope_qparts = ["true"];
+		if (count($scope_qparts) == 0) {
+			$scope_qparts = ["true"];
+		}
 
 		$glue = $filter['match_any_rule'] ? " OR " : " AND ";
 		$scope_qpart = join($glue, $scope_qparts);
 
-		if (!$scope_qpart) $scope_qpart = "true";
+		if (!$scope_qpart) {
+			$scope_qpart = "true";
+		}
 
 		$rv = array();
 
@@ -209,10 +213,11 @@ 
 						$feed_id = (int)substr($feed_id, 4);
 						array_push($feeds_fmt, Feeds::getCategoryTitle($feed_id));
 					} else {
-						if ($feed_id)
-							array_push($feeds_fmt, Feeds::getFeedTitle((int)$feed_id));
-						else
-							array_push($feeds_fmt, __("All feeds"));
+						if ($feed_id) {
+													array_push($feeds_fmt, Feeds::getFeedTitle((int)$feed_id));
+						} else {
+													array_push($feeds_fmt, __("All feeds"));
+						}
 					}
 				}
 
@@ -540,10 +545,11 @@ 
 				$feed_id = (int)substr($feed_id, 4);
 				array_push($feeds_fmt, Feeds::getCategoryTitle($feed_id));
 			} else {
-				if ($feed_id)
-					array_push($feeds_fmt, Feeds::getFeedTitle((int)$feed_id));
-				else
-					array_push($feeds_fmt, __("All feeds"));
+				if ($feed_id) {
+									array_push($feeds_fmt, Feeds::getFeedTitle((int)$feed_id));
+				} else {
+									array_push($feeds_fmt, __("All feeds"));
+				}
 			}
 		}
 
@@ -582,8 +588,9 @@ 
 			$title = __($row["description"]);
 
 			if ($action["action_id"] == 4 || $action["action_id"] == 6 ||
-				$action["action_id"] == 7)
-				$title .= ": ".$action["action_param"];
+				$action["action_id"] == 7) {
+							$title .= ": ".$action["action_param"];
+			}
 
 			if ($action["action_id"] == 9) {
 				list ($pfclass, $pfaction) = explode(":", $action["action_param"]);
@@ -1168,11 +1175,16 @@ 
 				$num_actions -= 1;
 			}
 
-			if ($match_any_rule) $title .= " (".__("matches any rule").")";
-			if ($inverse) $title .= " (".__("inverse").")";
+			if ($match_any_rule) {
+				$title .= " (".__("matches any rule").")";
+			}
+			if ($inverse) {
+				$title .= " (".__("inverse").")";
+			}
 
-			if ($num_actions > 0)
-				$actions = sprintf(_ngettext("%s (+%d action)", "%s (+%d actions)", (int) $num_actions), $actions, $num_actions);
+			if ($num_actions > 0) {
+							$actions = sprintf(_ngettext("%s (+%d action)", "%s (+%d actions)", (int) $num_actions), $actions, $num_actions);
+			}
 
 			return [$title, $actions];
 		}

classes/logger/sql.php

Braces +3 added lines, -2 removed lines

@@ -24,8 +24,9 @@
 			];
 
 			foreach ($server_params as $n => $p) {
-				if (isset($_SERVER[$p]))
-					$context .= "\n$n: ".$_SERVER[$p];
+				if (isset($_SERVER[$p])) {
+									$context .= "\n$n: ".$_SERVER[$p];
+				}
 			}
 
 			// passed error message may contain invalid unicode characters, failing to insert an error here

classes/labels.php

Braces +6 added lines, -2 removed lines

@@ -176,12 +176,16 @@
 
 		}
 
-		if (!$tr_in_progress) $pdo->commit();
+		if (!$tr_in_progress) {
+			$pdo->commit();
+		}
 	}
 
 	public static function create($caption, $fg_color = '', $bg_color = '', $owner_uid = false) {
 
-		if (!$owner_uid) $owner_uid = $_SESSION['uid'];
+		if (!$owner_uid) {
+			$owner_uid = $_SESSION['uid'];
+		}
 
 		$pdo = Db::pdo();
 

classes/debug.php

Braces +6 added lines, -3 removed lines

@@ -36,7 +36,9 @@ 
 
 	public static function log($message, $level = 0) {
 
-		if (!Debug::$enabled || Debug::$loglevel < $level) return false;
+		if (!Debug::$enabled || Debug::$loglevel < $level) {
+			return false;
+		}
 
 		$ts = strftime("%H:%M:%S", time());
 		if (function_exists('posix_getpid')) {
@@ -73,8 +75,9 @@ 
 
 				fclose($fp);
 
-				if (Debug::$quiet)
-					return;
+				if (Debug::$quiet) {
+									return;
+				}
 
 			} else {
 				user_error("Unable to open debugging log file: " . Debug::$logfile, E_USER_WARNING);

classes/feeditem/common.php

Braces +3 added lines, -2 removed lines

@@ -186,8 +186,9 @@
 			$cat = clean(trim(mb_strtolower($srccat)));
 
 			// we don't support numeric tags
-			if (is_numeric($cat))
-				$cat = 't:'.$cat;
+			if (is_numeric($cat)) {
+							$cat = 't:'.$cat;
+			}
 
 			$cat = preg_replace('/[,\'\"]/', "", $cat);
 

include/colors.php

Braces +51 added lines, -31 removed lines

@@ -157,11 +157,12 @@ 
 
 	$color = strtolower($color);
 
-	if (isset($htmlcolors[$color]))
-		return $htmlcolors[$color];
-	else
-		return $color;
-}
+	if (isset($htmlcolors[$color])) {
+			return $htmlcolors[$color];
+	} else {
+			return $color;
+	}
+	}
 
 ### RGB >> HSL
 function _color_rgb2hsl($rgb) {
@@ -173,9 +174,15 @@ 
 	}
 	$h = 0;
 	if ($delta > 0) {
-		if ($max == $r && $max != $g) $h += ($g - $b) / $delta;
-		if ($max == $g && $max != $b) $h += (2 + ($b - $r) / $delta);
-		if ($max == $b && $max != $r) $h += (4 + ($r - $g) / $delta);
+		if ($max == $r && $max != $g) {
+			$h += ($g - $b) / $delta;
+		}
+		if ($max == $g && $max != $b) {
+			$h += (2 + ($b - $r) / $delta);
+		}
+		if ($max == $b && $max != $r) {
+			$h += (4 + ($r - $g) / $delta);
+		}
 		$h /= 6;
 	} return array($h, $s, $l);
 }
@@ -193,19 +200,26 @@ 
 ### Helper function for _color_hsl2rgb().
 function _color_hue2rgb($m1, $m2, $h) {
 	$h = ($h < 0) ? $h + 1 : (($h > 1) ? $h - 1 : $h);
-	if ($h * 6 < 1) return $m1 + ($m2 - $m1) * $h * 6;
-	if ($h * 2 < 1) return $m2;
-	if ($h * 3 < 2) return $m1 + ($m2 - $m1) * (0.66666 - $h) * 6;
+	if ($h * 6 < 1) {
+		return $m1 + ($m2 - $m1) * $h * 6;
+	}
+	if ($h * 2 < 1) {
+		return $m2;
+	}
+	if ($h * 3 < 2) {
+		return $m1 + ($m2 - $m1) * (0.66666 - $h) * 6;
+	}
 	return $m1;
 }
 
 ### Convert a hex color into an RGB triplet.
 function _color_unpack($hex, $normalize = false) {
 
-	if (strpos($hex, '#') !== 0)
-		$hex = _resolve_htmlcolor($hex);
-	else
-		$hex = substr($hex, 1);
+	if (strpos($hex, '#') !== 0) {
+			$hex = _resolve_htmlcolor($hex);
+	} else {
+			$hex = substr($hex, 1);
+	}
 
 	if (strlen($hex) == 4) {
 		$hex = $hex[1] . $hex[1] . $hex[2] . $hex[2] . $hex[3] . $hex[3];
@@ -248,12 +262,20 @@ 
 		$del_G = ((($var_Max - $var_G ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
 		$del_B = ((($var_Max - $var_B ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
 
-		if      ($var_R == $var_Max) $h = $del_B - $del_G;
-		else if ($var_G == $var_Max) $h = (1 / 3 ) + $del_R - $del_B;
-		else if ($var_B == $var_Max) $h = (2 / 3 ) + $del_G - $del_R;
+		if      ($var_R == $var_Max) {
+			$h = $del_B - $del_G;
+		} else if ($var_G == $var_Max) {
+			$h = (1 / 3 ) + $del_R - $del_B;
+		} else if ($var_B == $var_Max) {
+			$h = (2 / 3 ) + $del_G - $del_R;
+		}
 
-		if ($h < 0) $h++;
-		if ($h > 1) $h--;
+		if ($h < 0) {
+			$h++;
+		}
+		if ($h > 1) {
+			$h--;
+		}
 	}
 
 	return array($h, $s, $v);
@@ -273,12 +295,7 @@ 
 		$var_2 = $v * (1 - $s * ($var_H - $var_i ) );
 		$var_3 = $v * (1 - $s * (1 - ($var_H - $var_i ) ) );
 
-		if       ($var_i == 0) { $var_R = $v     ; $var_G = $var_3  ; $var_B = $var_1 ; }
-		else if  ($var_i == 1) { $var_R = $var_2 ; $var_G = $v      ; $var_B = $var_1 ; }
-		else if  ($var_i == 2) { $var_R = $var_1 ; $var_G = $v      ; $var_B = $var_3 ; }
-		else if  ($var_i == 3) { $var_R = $var_1 ; $var_G = $var_2  ; $var_B = $v     ; }
-		else if  ($var_i == 4) { $var_R = $var_3 ; $var_G = $var_1  ; $var_B = $v     ; }
-		else                   { $var_R = $v     ; $var_G = $var_1  ; $var_B = $var_2 ; }
+		if       ($var_i == 0) { $var_R = $v     ; $var_G = $var_3  ; $var_B = $var_1 ; } else if  ($var_i == 1) { $var_R = $var_2 ; $var_G = $v      ; $var_B = $var_1 ; } else if  ($var_i == 2) { $var_R = $var_1 ; $var_G = $v      ; $var_B = $var_3 ; } else if  ($var_i == 3) { $var_R = $var_1 ; $var_G = $var_2  ; $var_B = $v     ; } else if  ($var_i == 4) { $var_R = $var_3 ; $var_G = $var_1  ; $var_B = $v     ; } else                   { $var_R = $v     ; $var_G = $var_1  ; $var_B = $var_2 ; }
 
 		$r = $var_R * 255;
 		$g = $var_G * 255;
@@ -301,10 +318,11 @@ 
 			$ico = new floIcon();
 			@$ico->readICO($imageFile);
 
-			if(count($ico->images)==0)
-				return false;
-			else
-				$img = @$ico->images[count($ico->images)-1]->getImageResource();
+			if(count($ico->images)==0) {
+							return false;
+			} else {
+							$img = @$ico->images[count($ico->images)-1]->getImageResource();
+			}
 
 		} else {
 			return false;
@@ -314,7 +332,9 @@ 
 		$img = @imagecreatefromstring(file_get_contents($imageFile));
 	}
 
-	if (!$img) return false;
+	if (!$img) {
+		return false;
+	}
 
 	for($x = 0; $x < $size[0]; $x += $granularity) {
 		for($y = 0; $y < $size[1]; $y += $granularity) {

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

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

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"] =