codysnider / tt-rss

register.php

Braces +12 added lines, -4 removed lines

@@ -18,7 +18,9 @@ 
 
 	$action = $_REQUEST["action"];
 
-	if (!init_plugins()) return;
+	if (!init_plugins()) {
+		return;
+	}
 
 	if ($_REQUEST["format"] == "feed") {
 		header("Content-Type: text/xml");
@@ -35,7 +37,9 @@ 
 			$num_users = db_fetch_result($result, 0, "cu");
 
 			$num_users = REG_MAX_USERS - $num_users;
-			if ($num_users < 0) $num_users = 0;
+			if ($num_users < 0) {
+				$num_users = 0;
+			}
 			$reg_suffix = "enabled";
 		} else {
 			$num_users = 0;
@@ -310,7 +314,9 @@ 
 						"subject" => "Registration information for Tiny Tiny RSS",
 						"message" => $reg_text]);
 
-					if (!$rc) print_error($mailer->error());
+					if (!$rc) {
+						print_error($mailer->error());
+					}
 
 					$reg_text = "Hi!\n".
 						"\n".
@@ -324,7 +330,9 @@ 
 						"subject" => "Registration notice for Tiny Tiny RSS",
 						"message" => $reg_text]);
 
-					if (!$rc) print_error($mailer->error());
+					if (!$rc) {
+						print_error($mailer->error());
+					}
 
 					print_notice(__("Account created successfully."));
 

api/index.php

Braces +6 added lines, -2 removed lines

@@ -37,7 +37,9 @@ 
 		// fallback on HTTP parameters
 		if ($input) {
 			$input = json_decode($input, true);
-			if ($input) $_REQUEST = $input;
+			if ($input) {
+				$_REQUEST = $input;
+			}
 		}
 	} else {
 		// Accept JSON only
@@ -54,7 +56,9 @@ 
 
 	startup_gettext();
 
-	if (!init_plugins()) return;
+	if (!init_plugins()) {
+		return;
+	}
 
 	if ($_SESSION["uid"]) {
 		if (!validate_session()) {

update.php

Braces +32 added lines, -19 removed lines

@@ -59,8 +59,9 @@ 
 		return $tags_deleted;
 	}
 
-	if (!defined('PHP_EXECUTABLE'))
-		define('PHP_EXECUTABLE', '/usr/bin/php');
+	if (!defined('PHP_EXECUTABLE')) {
+			define('PHP_EXECUTABLE', '/usr/bin/php');
+	}
 
 	$pdo = Db::pdo();
 
@@ -249,8 +250,9 @@ 
 
 		RSSUtils::update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT);
 
-		if (!isset($options["pidlock"]) || $options["task"] == 0)
-			RSSUtils::housekeeping_common(true);
+		if (!isset($options["pidlock"]) || $options["task"] == 0) {
+					RSSUtils::housekeeping_common(true);
+		}
 
 		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
 	}
@@ -264,8 +266,9 @@ 
 		Debug::log("PLEASE BACKUP YOUR DATABASE BEFORE PROCEEDING!");
 		Debug::log("Type 'yes' to continue.");
 
-		if (read_stdin() != 'yes')
-			exit;
+		if (read_stdin() != 'yes') {
+					exit;
+		}
 
 		Debug::log("clearing existing indexes...");
 
@@ -319,8 +322,9 @@ 
 		Debug::log("WARNING: this will remove all existing type2 filters.");
 		Debug::log("Type 'yes' to continue.");
 
-		if (read_stdin() != 'yes')
-			exit;
+		if (read_stdin() != 'yes') {
+					exit;
+		}
 
 		Debug::log("converting filters...");
 
@@ -374,16 +378,18 @@ 
 		if ($updater->isUpdateRequired()) {
 			Debug::log("Schema update required, version " . $updater->getSchemaVersion() . " to " . SCHEMA_VERSION);
 
-			if (DB_TYPE == "mysql")
-				Debug::Log("READ THIS: Due to MySQL limitations, your database is not completely protected while updating.\n".
+			if (DB_TYPE == "mysql") {
+							Debug::Log("READ THIS: Due to MySQL limitations, your database is not completely protected while updating.\n".
 					"Errors may put it in an inconsistent state requiring manual rollback.\nBACKUP YOUR DATABASE BEFORE CONTINUING.");
-			else
-				Debug::log("WARNING: please backup your database before continuing.");
+			} else {
+							Debug::log("WARNING: please backup your database before continuing.");
+			}
 
 			Debug::log("Type 'yes' to continue.");
 
-			if (read_stdin() != 'yes')
-				exit;
+			if (read_stdin() != 'yes') {
+							exit;
+			}
 
 			Debug::log("Performing updates to version " . SCHEMA_VERSION);
 
@@ -456,7 +462,9 @@ 
 
 			$status = $about[3] ? "system" : "user";
 
-			if (in_array($name, $enabled)) $name .= "*";
+			if (in_array($name, $enabled)) {
+				$name .= "*";
+			}
 
 			printf("%-50s %-10s v%.2f (by %s)\n%s\n\n",
 				$name, $status, $about[0], $about[2], $about[1]);
@@ -469,8 +477,12 @@ 
 	if (isset($options["debug-feed"])) {
 		$feed = $options["debug-feed"];
 
-		if (isset($options["force-refetch"])) $_REQUEST["force_refetch"] = true;
-		if (isset($options["force-rehash"])) $_REQUEST["force_rehash"] = true;
+		if (isset($options["force-refetch"])) {
+			$_REQUEST["force_refetch"] = true;
+		}
+		if (isset($options["force-rehash"])) {
+			$_REQUEST["force_rehash"] = true;
+		}
 
 		Debug::set_loglevel(Debug::$LOG_EXTENDED);
 
@@ -485,7 +497,8 @@ 
 
 	PluginHost::getInstance()->run_commands($options);
 
-	if (file_exists(LOCK_DIRECTORY . "/$lock_filename"))
-		if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')
+	if (file_exists(LOCK_DIRECTORY . "/$lock_filename")) {
+			if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')
 			fclose($lock_handle);
+	}
 		unlink(LOCK_DIRECTORY . "/$lock_filename");

backend.php

Braces +8 added lines, -5 removed lines

@@ -5,10 +5,11 @@ 
 	$op = $_REQUEST["op"];
 	@$method = $_REQUEST['subop'] ? $_REQUEST['subop'] : $_REQUEST["method"];
 
-	if (!$method)
-		$method = 'index';
-	else
-		$method = strtolower($method);
+	if (!$method) {
+			$method = 'index';
+	} else {
+			$method = strtolower($method);
+	}
 
 	/* Public calls compatibility shim */
 
@@ -33,7 +34,9 @@ 
 
 	$script_started = microtime(true);
 
-	if (!init_plugins()) return;
+	if (!init_plugins()) {
+		return;
+	}
 
 	header("Content-Type: text/json; charset=utf-8");
 

public.php

Braces +3 added lines, -1 removed lines

@@ -14,7 +14,9 @@
 
 	$script_started = microtime(true);
 
-	if (!init_plugins()) return;
+	if (!init_plugins()) {
+		return;
+	}
 
 	if (ENABLE_GZIP_OUTPUT && function_exists("ob_gzhandler")) {
 		ob_start("ob_gzhandler");

include/sessions.php

Braces +3 added lines, -1 removed lines

@@ -37,7 +37,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"] =

include/functions.php

Braces +127 added lines, -64 removed lines

@@ -18,7 +18,9 @@ 
 	libxml_use_internal_errors(true);
 
 	// separate test because this is included before sanity checks
-	if (function_exists("mb_internal_encoding")) mb_internal_encoding("UTF-8");
+	if (function_exists("mb_internal_encoding")) {
+		mb_internal_encoding("UTF-8");
+	}
 
 	date_default_timezone_set('UTC');
 	if (defined('E_DEPRECATED')) {
@@ -194,8 +196,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)) {
 
@@ -237,8 +240,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;
@@ -256,14 +260,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);
@@ -277,8 +284,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);
@@ -307,8 +315,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);
 
@@ -367,7 +376,9 @@ 
 			if ($is_gzipped) {
 				$tmp = @gzdecode($contents);
 
-				if ($tmp) $contents = $tmp;
+				if ($tmp) {
+					$contents = $tmp;
+				}
 			}
 
 			return $contents;
@@ -400,14 +411,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;
@@ -464,7 +478,9 @@ 
 			if ($is_gzipped) {
 				$tmp = @gzdecode($data);
 
-				if ($tmp) $data = $tmp;
+				if ($tmp) {
+					$data = $tmp;
+				}
 			}
 
 			return $data;
@@ -474,7 +490,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;
@@ -487,7 +505,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
@@ -520,7 +540,9 @@ 
 			}
 		}
 
-		if (!$in_nested_tr) $pdo->commit();
+		if (!$in_nested_tr) {
+			$pdo->commit();
+		}
 
 	}
 
@@ -680,7 +702,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);
@@ -702,7 +726,9 @@ 
 			startup_gettext();
 			load_user_plugins($_SESSION["uid"]);
 		} else {
-			if (!validate_session()) $_SESSION["uid"] = false;
+			if (!validate_session()) {
+				$_SESSION["uid"] = false;
+			}
 
 			if (!$_SESSION["uid"]) {
 
@@ -797,13 +823,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);
 
@@ -815,7 +847,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;
 			}
@@ -831,26 +865,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);
@@ -1261,8 +1299,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;
+				}
 			}
 		}
 
@@ -1270,9 +1309,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);
@@ -1334,13 +1377,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);
+					}
 
 				}
 			}
@@ -1376,7 +1421,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');
 
@@ -1416,7 +1463,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);
 				}
@@ -1697,8 +1746,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;
 		}
@@ -1769,14 +1819,19 @@ 
 	}
 
 	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) {
@@ -1840,7 +1895,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();
 
@@ -1848,7 +1905,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);
@@ -1856,8 +1915,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");
 
@@ -1880,7 +1940,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;
@@ -1893,8 +1955,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/colors.php

Braces +52 added lines, -32 removed lines

@@ -155,11 +155,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) {
@@ -171,9 +172,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);
 }
@@ -191,19 +198,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];
@@ -246,12 +260,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 ($h < 0) $h++;
-      if ($h > 1) $h--;
+      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--;
+      }
    }
 
    return array($h, $s, $v);
@@ -271,12 +293,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;
@@ -299,10 +316,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;
@@ -312,7 +330,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/autoload.php

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