codysnider / tt-rss

classes/logger/sql.php

Spacing +1 added lines, -1 removed lines

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

Braces +6 added lines, -3 removed lines

@@ -6,7 +6,9 @@ 
 	function log_error($errno, $errstr, $file, $line, $context) {
 
 		// separate PDO connection object is used for logging
-		if (!$this->pdo) $this->pdo = Db::instance()->pdo_connect();
+		if (!$this->pdo) {
+			$this->pdo = Db::instance()->pdo_connect();
+		}
 
 		if ($this->pdo && get_schema_version() > 117) {
 
@@ -22,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/rssutils.php

Indentation +1 added lines, -1 removed lines

@@ -702,7 +702,7 @@
 					$entry_plugin_data .= mb_strtolower(get_class($plugin)) . ",";
 				}
 
-                if (Debug::get_loglevel() >= 3) {
+				if (Debug::get_loglevel() >= 3) {
 					print "processed content: ";
 					print htmlspecialchars($article["content"]);
 					print "\n";

Switch Indentation +26 added lines, -26 removed lines

@@ -1349,35 +1349,35 @@
 					continue;
 
 				switch ($rule["type"]) {
-					case "title":
-						$match = @preg_match("/$reg_exp/iu", $title);
-						break;
-					case "content":
-						// we don't need to deal with multiline regexps
-						$content = preg_replace("/[\r\n\t]/", "", $content);
+				case "title":
+					$match = @preg_match("/$reg_exp/iu", $title);
+					break;
+				case "content":
+					// we don't need to deal with multiline regexps
+					$content = preg_replace("/[\r\n\t]/", "", $content);
 
-						$match = @preg_match("/$reg_exp/iu", $content);
-						break;
-					case "both":
-						// we don't need to deal with multiline regexps
-						$content = preg_replace("/[\r\n\t]/", "", $content);
+					$match = @preg_match("/$reg_exp/iu", $content);
+					break;
+				case "both":
+					// we don't need to deal with multiline regexps
+					$content = preg_replace("/[\r\n\t]/", "", $content);
 
-						$match = (@preg_match("/$reg_exp/iu", $title) || @preg_match("/$reg_exp/iu", $content));
-						break;
-					case "link":
-						$match = @preg_match("/$reg_exp/iu", $link);
-						break;
-					case "author":
-						$match = @preg_match("/$reg_exp/iu", $author);
-						break;
-					case "tag":
-						foreach ($tags as $tag) {
-							if (@preg_match("/$reg_exp/iu", $tag)) {
-								$match = true;
-								break;
-							}
+					$match = (@preg_match("/$reg_exp/iu", $title) || @preg_match("/$reg_exp/iu", $content));
+					break;
+				case "link":
+					$match = @preg_match("/$reg_exp/iu", $link);
+					break;
+				case "author":
+					$match = @preg_match("/$reg_exp/iu", $author);
+					break;
+				case "tag":
+					foreach ($tags as $tag) {
+						if (@preg_match("/$reg_exp/iu", $tag)) {
+							$match = true;
+							break;
 						}
-						break;
+					}
+					break;
 				}
 
 				if ($rule_inverse) $match = !$match;

Spacing +32 added lines, -32 removed lines

@@ -7,11 +7,11 @@ 
 			if ($k != "feed" && isset($v)) {
 				$x = strip_tags(is_array($v) ? implode(",", $v) : $v);
 
-				$tmp .= sha1("$k:" . sha1($x));
+				$tmp .= sha1("$k:".sha1($x));
 			}
 		}
 
-		return sha1(implode(",", $pluginhost->get_plugin_names()) . $tmp);
+		return sha1(implode(",", $pluginhost->get_plugin_names()).$tmp);
 	}
 
 	// Strips utf8mb4 characters (i.e. emoji) for mysql
@@ -137,7 +137,7 @@ 
 			//update_rss_feed($line["id"], true);
 
 			if ($tline = $usth->fetch()) {
-				Debug::log(" => " . $tline["last_updated"] . ", " . $tline["id"] . " " . $tline["owner_uid"]);
+				Debug::log(" => ".$tline["last_updated"].", ".$tline["id"]." ".$tline["owner_uid"]);
 
 				if (array_search($tline["owner_uid"], $batch_owners) === FALSE)
 					array_push($batch_owners, $tline["owner_uid"]);
@@ -323,7 +323,7 @@ 
 
 		$date_feed_processed = date('Y-m-d H:i');
 
-		$cache_filename = CACHE_DIR . "/feeds/" . sha1($fetch_url) . ".xml";
+		$cache_filename = CACHE_DIR."/feeds/".sha1($fetch_url).".xml";
 
 		$pluginhost = new PluginHost();
 		$user_plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
@@ -340,7 +340,7 @@ 
 		Debug::log("running HOOK_FETCH_FEED handlers...", Debug::$LOG_VERBOSE);
 
 		foreach ($pluginhost->get_hooks(PluginHost::HOOK_FETCH_FEED) as $plugin) {
-			Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
+			Debug::log("... ".get_class($plugin), Debug::$LOG_VERBOSE);
 			$start = microtime(true);
 			$feed_data = $plugin->hook_fetch_feed($feed_data, $fetch_url, $owner_uid, $feed, 0, $auth_login, $auth_pass);
 			Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
@@ -402,7 +402,7 @@ 
 			$feed_data = trim($feed_data);
 
 			Debug::log("fetch done.", Debug::$LOG_VERBOSE);
-			Debug::log("source last modified: " . $fetch_last_modified, Debug::$LOG_VERBOSE);
+			Debug::log("source last modified: ".$fetch_last_modified, Debug::$LOG_VERBOSE);
 
 			if ($feed_data && $fetch_last_modified != $stored_last_modified) {
 				$sth = $pdo->prepare("UPDATE ttrss_feeds SET last_modified = ? WHERE id = ?");
@@ -410,7 +410,7 @@ 
 			}
 
 			// cache vanilla feed data for re-use
-			if ($feed_data && !$auth_pass && !$auth_login && is_writable(CACHE_DIR . "/feeds")) {
+			if ($feed_data && !$auth_pass && !$auth_login && is_writable(CACHE_DIR."/feeds")) {
 				$new_rss_hash = sha1($feed_data);
 
 				if ($new_rss_hash != $rss_hash) {
@@ -445,7 +445,7 @@ 
 		$feed_data_checksum = md5($feed_data);
 
 		foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_FETCHED) as $plugin) {
-			Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
+			Debug::log("... ".get_class($plugin), Debug::$LOG_VERBOSE);
 			$start = microtime(true);
 			$feed_data = $plugin->hook_feed_fetched($feed_data, $fetch_url, $owner_uid, $feed);
 			Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
@@ -467,7 +467,7 @@ 
 			// We use local pluginhost here because we need to load different per-user feed plugins
 
 			foreach ($pluginhost->get_hooks(PluginHost::HOOK_FEED_PARSED) as $plugin) {
-				Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
+				Debug::log("... ".get_class($plugin), Debug::$LOG_VERBOSE);
 				$start = microtime(true);
 				$plugin->hook_feed_parsed($rss);
 				Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
@@ -499,14 +499,14 @@ 
 			$site_url = mb_substr(rewrite_relative_url($fetch_url, clean($rss->get_link())), 0, 245);
 
 			Debug::log("site_url: $site_url", Debug::$LOG_VERBOSE);
-			Debug::log("feed_title: " . clean($rss->get_title()), Debug::$LOG_VERBOSE);
+			Debug::log("feed_title: ".clean($rss->get_title()), Debug::$LOG_VERBOSE);
 
 			if ($favicon_needs_check || $force_refetch) {
 
 				/* terrible hack: if we crash on floicon shit here, we won't check
 				 * the icon avgcolor again (unless the icon got updated) */
 
-				$favicon_file = ICONS_DIR . "/$feed.ico";
+				$favicon_file = ICONS_DIR."/$feed.ico";
 				$favicon_modified = @filemtime($favicon_file);
 
 				Debug::log("checking favicon...", Debug::$LOG_VERBOSE);
@@ -527,7 +527,7 @@ 
 
 					$favicon_color = calculate_avg_color($favicon_file);
 
-					$favicon_colorstring = ",favicon_avg_color = " . $pdo->quote($favicon_color);
+					$favicon_colorstring = ",favicon_avg_color = ".$pdo->quote($favicon_color);
 
 				} else if ($favicon_avg_color == 'fail') {
 					Debug::log("floicon failed on this file, not trying to recalculate avg color", Debug::$LOG_VERBOSE);
@@ -546,7 +546,7 @@ 
 				print_r($filters);
 			}
 
-			Debug::log("" . count($filters) . " filters loaded.", Debug::$LOG_VERBOSE);
+			Debug::log("".count($filters)." filters loaded.", Debug::$LOG_VERBOSE);
 
 			$items = $rss->get_items();
 
@@ -588,13 +588,13 @@ 
 
 				$entry_guid = "$owner_uid,$entry_guid";
 
-				$entry_guid_hashed = 'SHA1:' . sha1($entry_guid);
+				$entry_guid_hashed = 'SHA1:'.sha1($entry_guid);
 
 				Debug::log("guid $entry_guid / $entry_guid_hashed", Debug::$LOG_VERBOSE);
 
-				$entry_timestamp = (int)$item->get_date();
+				$entry_timestamp = (int) $item->get_date();
 
-				Debug::log("orig date: " . $item->get_date(), Debug::$LOG_VERBOSE);
+				Debug::log("orig date: ".$item->get_date(), Debug::$LOG_VERBOSE);
 
 				$entry_title = strip_tags($item->get_title());
 
@@ -606,7 +606,7 @@ 
 				Debug::log("link $entry_link", Debug::$LOG_VERBOSE);
 				Debug::log("language $entry_language", Debug::$LOG_VERBOSE);
 
-				if (!$entry_title) $entry_title = date("Y-m-d H:i:s", $entry_timestamp);;
+				if (!$entry_title) $entry_title = date("Y-m-d H:i:s", $entry_timestamp); ;
 
 				$entry_content = $item->get_content();
 				if (!$entry_content) $entry_content = $item->get_description();
@@ -627,7 +627,7 @@ 
 				Debug::log("looking for tags...", Debug::$LOG_VERBOSE);
 
 				$entry_tags = $item->get_categories();
-				Debug::log("tags found: " . join(", ", $entry_tags), Debug::$LOG_VERBOSE);
+				Debug::log("tags found: ".join(", ", $entry_tags), Debug::$LOG_VERBOSE);
 
 				Debug::log("done collecting data.", Debug::$LOG_VERBOSE);
 
@@ -692,14 +692,14 @@ 
 				Debug::log("hash differs, applying plugin filters:", Debug::$LOG_VERBOSE);
 
 				foreach ($pluginhost->get_hooks(PluginHost::HOOK_ARTICLE_FILTER) as $plugin) {
-					Debug::log("... " . get_class($plugin), Debug::$LOG_VERBOSE);
+					Debug::log("... ".get_class($plugin), Debug::$LOG_VERBOSE);
 
 					$start = microtime(true);
 					$article = $plugin->hook_article_filter($article);
 
 					Debug::log(sprintf("=== %.4f (sec)", microtime(true) - $start), Debug::$LOG_VERBOSE);
 
-					$entry_plugin_data .= mb_strtolower(get_class($plugin)) . ",";
+					$entry_plugin_data .= mb_strtolower(get_class($plugin)).",";
 				}
 
                 if (Debug::get_loglevel() >= 3) {
@@ -772,7 +772,7 @@ 
 					Debug::log("applying plugin filter actions...", Debug::$LOG_VERBOSE);
 
 					foreach ($plugin_filter_names as $pfn) {
-						list($pfclass,$pfaction) = explode(":", $pfn["param"]);
+						list($pfclass, $pfaction) = explode(":", $pfn["param"]);
 
 						if (isset($plugin_filter_actions[$pfclass])) {
 							$plugin = $pluginhost->get_plugin($pfclass);
@@ -867,7 +867,7 @@ 
 							$entry_current_hash,
 							$date_feed_processed,
 							$entry_comments,
-							(int)$num_comments,
+							(int) $num_comments,
 							$entry_plugin_data,
 							"$entry_language",
 							"$entry_author"]);
@@ -979,7 +979,7 @@ 
 						":content" => "$entry_content",
 						":content_hash" => $entry_current_hash,
 						":updated" => $entry_timestamp_fmt,
-						":num_comments" => (int)$num_comments,
+						":num_comments" => (int) $num_comments,
 						":plugin_data" => $entry_plugin_data,
 						":author" => "$entry_author",
 						":lang" => $entry_language,
@@ -987,7 +987,7 @@ 
 
 					if (DB_TYPE == "pgsql") {
 						$params[":ts_lang"] = $feed_language;
-						$params[":ts_content"] = mb_substr(strip_tags($entry_title . " " . $entry_content), 0, 900000);
+						$params[":ts_content"] = mb_substr(strip_tags($entry_title." ".$entry_content), 0, 900000);
 					}
 
 					$sth->execute($params);
@@ -1067,7 +1067,7 @@ 
 				foreach ($enclosures as $enc) {
 					$enc_url = $enc[0];
 					$enc_type = $enc[1];
-					$enc_dur = (int)$enc[2];
+					$enc_dur = (int) $enc[2];
 					$enc_title = $enc[3];
 					$enc_width = intval($enc[4]);
 					$enc_height = intval($enc[5]);
@@ -1075,7 +1075,7 @@ 
 					$esth->execute([$enc_url, $enc_type, $entry_ref_id]);
 
 					if (!$esth->fetch()) {
-						$usth->execute([$enc_url, $enc_type, (string)$enc_title, $enc_dur, $entry_ref_id, $enc_width, $enc_height]);
+						$usth->execute([$enc_url, $enc_type, (string) $enc_title, $enc_dur, $entry_ref_id, $enc_width, $enc_height]);
 					}
 				}
 
@@ -1109,7 +1109,7 @@ 
 				$filtered_tags = array_unique($filtered_tags);
 
 				if (Debug::get_loglevel() >= Debug::$LOG_VERBOSE) {
-					Debug::log("filtered tags: " . implode(", ", $filtered_tags), Debug::$LOG_VERBOSE);
+					Debug::log("filtered tags: ".implode(", ", $filtered_tags), Debug::$LOG_VERBOSE);
 
 				}
 
@@ -1297,11 +1297,11 @@ 
 		$num_deleted = 0;
 
 		if (is_writable(LOCK_DIRECTORY)) {
-			$files = glob(LOCK_DIRECTORY . "/*.lock");
+			$files = glob(LOCK_DIRECTORY."/*.lock");
 
 			if ($files) {
 				foreach ($files as $file) {
-					if (!file_is_locked(basename($file)) && time() - filemtime($file) > 86400*2) {
+					if (!file_is_locked(basename($file)) && time() - filemtime($file) > 86400 * 2) {
 						unlink($file);
 						++$num_deleted;
 					}
@@ -1516,7 +1516,7 @@ 
 	static function check_feed_favicon($site_url, $feed) {
 		#		print "FAVICON [$site_url]: $favicon_url\n";
 
-		$icon_file = ICONS_DIR . "/$feed.ico";
+		$icon_file = ICONS_DIR."/$feed.ico";
 
 		if (!file_exists($icon_file)) {
 			$favicon_url = RSSUtils::get_favicon_url($site_url);
@@ -1570,14 +1570,14 @@ 
 
 	static function is_gzipped($feed_data) {
 		return strpos(substr($feed_data, 0, 3),
-				"\x1f" . "\x8b" . "\x08", 0) === 0;
+				"\x1f"."\x8b"."\x08", 0) === 0;
 	}
 
 	static function load_filters($feed_id, $owner_uid) {
 		$filters = array();
 
 		$feed_id = (int) $feed_id;
-		$cat_id = (int)Feeds::getFeedCategory($feed_id);
+		$cat_id = (int) Feeds::getFeedCategory($feed_id);
 
 		if ($cat_id == 0)
 			$null_cat_qpart = "cat_id IS NULL OR";

Braces +73 added lines, -46 removed lines

@@ -80,7 +80,9 @@ 
 
 		// Update the least recently updated feeds first
 		$query_order = "ORDER BY last_updated";
-		if (DB_TYPE == "pgsql") $query_order .= " NULLS FIRST";
+		if (DB_TYPE == "pgsql") {
+			$query_order .= " NULLS FIRST";
+		}
 
 		$query = "SELECT DISTINCT ttrss_feeds.feed_url, ttrss_feeds.last_updated
 			FROM
@@ -139,8 +141,9 @@ 
 			if ($tline = $usth->fetch()) {
 				Debug::log(" => " . $tline["last_updated"] . ", " . $tline["id"] . " " . $tline["owner_uid"]);
 
-				if (array_search($tline["owner_uid"], $batch_owners) === FALSE)
-					array_push($batch_owners, $tline["owner_uid"]);
+				if (array_search($tline["owner_uid"], $batch_owners) === FALSE) {
+									array_push($batch_owners, $tline["owner_uid"]);
+				}
 
 				$fstarted = microtime(true);
 
@@ -311,11 +314,13 @@ 
 
 			$feed_language = mb_strtolower($row["feed_language"]);
 
-			if (!$feed_language)
-				$feed_language = mb_strtolower(get_pref('DEFAULT_SEARCH_LANGUAGE', $owner_uid));
+			if (!$feed_language) {
+							$feed_language = mb_strtolower(get_pref('DEFAULT_SEARCH_LANGUAGE', $owner_uid));
+			}
 
-			if (!$feed_language)
-				$feed_language = 'simple';
+			if (!$feed_language) {
+							$feed_language = 'simple';
+			}
 
 		} else {
 			return false;
@@ -514,8 +519,9 @@ 
 				RSSUtils::check_feed_favicon($site_url, $feed);
 				$favicon_modified_new = @filemtime($favicon_file);
 
-				if ($favicon_modified_new > $favicon_modified)
-					$favicon_avg_color = '';
+				if ($favicon_modified_new > $favicon_modified) {
+									$favicon_avg_color = '';
+				}
 
 				$favicon_colorstring = "";
 				if (file_exists($favicon_file) && function_exists("imagecreatefromstring") && $favicon_avg_color == '') {
@@ -578,8 +584,12 @@ 
 				}
 
 				$entry_guid = strip_tags($item->get_id());
-				if (!$entry_guid) $entry_guid = strip_tags($item->get_link());
-				if (!$entry_guid) $entry_guid = RSSUtils::make_guid_from_title($item->get_title());
+				if (!$entry_guid) {
+					$entry_guid = strip_tags($item->get_link());
+				}
+				if (!$entry_guid) {
+					$entry_guid = RSSUtils::make_guid_from_title($item->get_title());
+				}
 
 				if (!$entry_guid) {
 					$pdo->commit();
@@ -606,10 +616,15 @@ 
 				Debug::log("link $entry_link", Debug::$LOG_VERBOSE);
 				Debug::log("language $entry_language", Debug::$LOG_VERBOSE);
 
-				if (!$entry_title) $entry_title = date("Y-m-d H:i:s", $entry_timestamp);;
+				if (!$entry_title) {
+					$entry_title = date("Y-m-d H:i:s", $entry_timestamp);
+				}
+				;
 
 				$entry_content = $item->get_content();
-				if (!$entry_content) $entry_content = $item->get_description();
+				if (!$entry_content) {
+					$entry_content = $item->get_description();
+				}
 
 				if (Debug::get_loglevel() >= 3) {
 					print "content: ";
@@ -824,8 +839,9 @@ 
 
 				Debug::log("force catchup: $entry_force_catchup", Debug::$LOG_VERBOSE);
 
-				if ($cache_images)
-					RSSUtils::cache_media($entry_content, $site_url);
+				if ($cache_images) {
+									RSSUtils::cache_media($entry_content, $site_url);
+				}
 
 				$csth = $pdo->prepare("SELECT id FROM ttrss_entries
 					WHERE guid = ? OR guid = ?");
@@ -951,16 +967,18 @@ 
 
 						$sth->execute([$ref_id, $owner_uid, $feed]);
 
-						if ($row = $sth->fetch())
-							$entry_int_id = $row['int_id'];
+						if ($row = $sth->fetch()) {
+													$entry_int_id = $row['int_id'];
+						}
 					}
 
 					Debug::log("resulting RID: $entry_ref_id, IID: $entry_int_id", Debug::$LOG_VERBOSE);
 
-					if (DB_TYPE == "pgsql")
-						$tsvector_qpart = "tsvector_combined = to_tsvector(:ts_lang, :ts_content),";
-					else
-						$tsvector_qpart = "";
+					if (DB_TYPE == "pgsql") {
+											$tsvector_qpart = "tsvector_combined = to_tsvector(:ts_lang, :ts_content),";
+					} else {
+											$tsvector_qpart = "";
+					}
 
 					$sth = $pdo->prepare("UPDATE ttrss_entries
 						SET title = :title,
@@ -1049,8 +1067,9 @@ 
 					}
 				}
 
-				if ($cache_images)
-					RSSUtils::cache_enclosures($enclosures, $site_url);
+				if ($cache_images) {
+									RSSUtils::cache_enclosures($enclosures, $site_url);
+				}
 
 				if (Debug::get_loglevel() >= Debug::$LOG_EXTENDED) {
 					Debug::log("article enclosures:", Debug::$LOG_VERBOSE);
@@ -1345,8 +1364,9 @@ 
 				$reg_exp = str_replace('/', '\/', $rule["reg_exp"]);
 				$rule_inverse = $rule["inverse"];
 
-				if (!$reg_exp)
-					continue;
+				if (!$reg_exp) {
+									continue;
+				}
 
 				switch ($rule["type"]) {
 					case "title":
@@ -1380,7 +1400,9 @@ 
 						break;
 				}
 
-				if ($rule_inverse) $match = !$match;
+				if ($rule_inverse) {
+					$match = !$match;
+				}
 
 				if ($match_any_rule) {
 					if ($match) {
@@ -1395,17 +1417,25 @@ 
 				}
 			}
 
-			if ($inverse) $filter_match = !$filter_match;
+			if ($inverse) {
+				$filter_match = !$filter_match;
+			}
 
 			if ($filter_match) {
-				if (is_array($matched_rules)) array_push($matched_rules, $rule);
-				if (is_array($matched_filters)) array_push($matched_filters, $filter);
+				if (is_array($matched_rules)) {
+					array_push($matched_rules, $rule);
+				}
+				if (is_array($matched_filters)) {
+					array_push($matched_filters, $filter);
+				}
 
 				foreach ($filter["actions"] AS $action) {
 					array_push($matches, $action);
 
 					// if Stop action encountered, perform no further processing
-					if (isset($action["type"]) && $action["type"] == "stop") return $matches;
+					if (isset($action["type"]) && $action["type"] == "stop") {
+						return $matches;
+					}
 				}
 			}
 		}
@@ -1531,24 +1561,19 @@ 
 					if (preg_match('/^\x00\x00\x01\x00/', $contents)) {
 						// 0       string  \000\000\001\000        MS Windows icon resource
 						//error_log("check_feed_favicon: favicon_url=$favicon_url isa MS Windows icon resource");
-					}
-					elseif (preg_match('/^GIF8/', $contents)) {
+					} elseif (preg_match('/^GIF8/', $contents)) {
 						// 0       string          GIF8            GIF image data
 						//error_log("check_feed_favicon: favicon_url=$favicon_url isa GIF image");
-					}
-					elseif (preg_match('/^\x89PNG\x0d\x0a\x1a\x0a/', $contents)) {
+					} elseif (preg_match('/^\x89PNG\x0d\x0a\x1a\x0a/', $contents)) {
 						// 0       string          \x89PNG\x0d\x0a\x1a\x0a         PNG image data
 						//error_log("check_feed_favicon: favicon_url=$favicon_url isa PNG image");
-					}
-					elseif (preg_match('/^\xff\xd8/', $contents)) {
+					} elseif (preg_match('/^\xff\xd8/', $contents)) {
 						// 0       beshort         0xffd8          JPEG image data
 						//error_log("check_feed_favicon: favicon_url=$favicon_url isa JPG image");
-					}
-					elseif (preg_match('/^BM/', $contents)) {
+					} elseif (preg_match('/^BM/', $contents)) {
 						// 0	string		BM	PC bitmap (OS2, Windows BMP files)
 						//error_log("check_feed_favicon, favicon_url=$favicon_url isa BMP image");
-					}
-					else {
+					} else {
 						//error_log("check_feed_favicon: favicon_url=$favicon_url isa UNKNOWN type");
 						$contents = "";
 					}
@@ -1579,10 +1604,11 @@ 
 		$feed_id = (int) $feed_id;
 		$cat_id = (int)Feeds::getFeedCategory($feed_id);
 
-		if ($cat_id == 0)
-			$null_cat_qpart = "cat_id IS NULL OR";
-		else
-			$null_cat_qpart = "";
+		if ($cat_id == 0) {
+					$null_cat_qpart = "cat_id IS NULL OR";
+		} else {
+					$null_cat_qpart = "";
+		}
 
 		$pdo = Db::pdo();
 
@@ -1718,8 +1744,9 @@ 
 			}
 		}
 
-		if (!$favicon_url)
-			$favicon_url = rewrite_relative_url($url, "/favicon.ico");
+		if (!$favicon_url) {
+					$favicon_url = rewrite_relative_url($url, "/favicon.ico");
+		}
 
 		return $favicon_url;
 	}

classes/digest.php

Spacing +4 added lines, -4 removed lines

@@ -37,7 +37,7 @@ 
 					time() - $preferred_ts <= 7200
 				) {
 
-					Debug::log("Sending digest for UID:" . $line['id'] . " - " . $line["email"]);
+					Debug::log("Sending digest for UID:".$line['id']." - ".$line["email"]);
 
 					$do_catchup = get_pref('DIGEST_CATCHUP', $line['id'], false);
 
@@ -123,13 +123,13 @@ 
 
 		$sth = $pdo->prepare("SELECT ttrss_entries.title,
 				ttrss_feeds.title AS feed_title,
-				COALESCE(ttrss_feed_categories.title, '" . __('Uncategorized') . "') AS cat_title,
+				COALESCE(ttrss_feed_categories.title, '" . __('Uncategorized')."') AS cat_title,
 				date_updated,
 				ttrss_user_entries.ref_id,
 				link,
 				score,
 				content,
-				" . SUBSTRING_FOR_DATE . "(last_updated,1,19) AS last_updated
+				" . SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
 			FROM
 				ttrss_user_entries,ttrss_entries,ttrss_feeds
 			LEFT JOIN
@@ -165,7 +165,7 @@ 
 				$user_id);
 
 			if (get_pref('ENABLE_FEED_CATS', $user_id)) {
-				$line['feed_title'] = $line['cat_title'] . " / " . $line['feed_title'];
+				$line['feed_title'] = $line['cat_title']." / ".$line['feed_title'];
 			}
 
 			$article_labels = Article::get_article_labels($line["ref_id"], $user_id);

classes/ccache.php

Spacing +2 added lines, -2 removed lines

@@ -135,7 +135,7 @@ 
 				$sth->execute([":uid" => $owner_uid, ":cat" => $feed_id]);
 
 				while ($line = $sth->fetch()) {
-					CCache::update((int)$line["id"], $owner_uid, false, false);
+					CCache::update((int) $line["id"], $owner_uid, false, false);
 				}
 			}
 
@@ -197,7 +197,7 @@ 
 					$sth->execute([$owner_uid, $feed_id]);
 
 					if ($row = $sth->fetch()) {
-						CCache::update((int)$row["cat_id"], $owner_uid, true, true, true);
+						CCache::update((int) $row["cat_id"], $owner_uid, true, true, true);
 					}
 				}
 			}

Braces +9 added lines, -5 removed lines

@@ -66,8 +66,9 @@ 
 
 		// "" (null) is valid and should be cast to 0 (uncategorized)
 		// everything else i.e. tags are not
-		if (!is_numeric($feed_id) && $feed_id)
-			return;
+		if (!is_numeric($feed_id) && $feed_id) {
+					return;
+		}
 
 		$feed_id = (int) $feed_id;
 
@@ -102,8 +103,9 @@ 
 
 		// "" (null) is valid and should be cast to 0 (uncategorized)
 		// everything else i.e. tags are not
-		if (!is_numeric($feed_id) && $feed_id)
-			return;
+		if (!is_numeric($feed_id) && $feed_id) {
+					return;
+		}
 
 		$feed_id = (int) $feed_id;
 
@@ -182,7 +184,9 @@ 
 			$sth->execute([$feed_id, $unread, $owner_uid]);
 		}
 
-		if (!$tr_in_progress) $pdo->commit();
+		if (!$tr_in_progress) {
+			$pdo->commit();
+		}
 
 		if ($feed_id > 0 && $prev_unread != $unread) {
 

classes/feeditem/common.php

Spacing +1 added lines, -1 removed lines

@@ -175,7 +175,7 @@
 
 			// we don't support numeric tags
 			if (is_numeric($cat))
-				$cat = 't:' . $cat;
+				$cat = 't:'.$cat;
 
 			$cat = preg_replace('/[,\'\"]/', "", $cat);
 

Braces +30 added lines, -16 removed lines

@@ -14,8 +14,9 @@ 
 			$source = $elem->getElementsByTagName("source")->item(0);
 
 			// we don't need <source> element
-			if ($source)
-				$elem->removeChild($source);
+			if ($source) {
+							$elem->removeChild($source);
+			}
 		} catch (DOMException $e) {
 			//
 		}
@@ -31,14 +32,19 @@ 
 		if ($author) {
 			$name = $author->getElementsByTagName("name")->item(0);
 
-			if ($name) return clean($name->nodeValue);
+			if ($name) {
+				return clean($name->nodeValue);
+			}
 
 			$email = $author->getElementsByTagName("email")->item(0);
 
-			if ($email) return clean($email->nodeValue);
+			if ($email) {
+				return clean($email->nodeValue);
+			}
 
-			if ($author->nodeValue)
-				return clean($author->nodeValue);
+			if ($author->nodeValue) {
+							return clean($author->nodeValue);
+			}
 		}
 
 		$author_elems = $this->xpath->query("dc:creator", $this->elem);
@@ -56,15 +62,17 @@ 
 		//might give a wrong result if a default namespace was declared (possible with XPath 2.0)
 		$com_url = $this->xpath->query("comments", $this->elem)->item(0);
 
-		if ($com_url)
-			return clean($com_url->nodeValue);
+		if ($com_url) {
+					return clean($com_url->nodeValue);
+		}
 
 		//Atom Threading Extension (RFC 4685) stuff. Could be used in RSS feeds, so it's in common.
 		//'text/html' for type is too restrictive?
 		$com_url = $this->xpath->query("atom:link[@rel='replies' and contains(@type,'text/html')]/@href", $this->elem)->item(0);
 
-		if ($com_url)
-			return clean($com_url->nodeValue);
+		if ($com_url) {
+					return clean($com_url->nodeValue);
+		}
 	}
 
 	function get_comments_count() {
@@ -98,7 +106,9 @@ 
 			}
 
 			$desc = $this->xpath->query("media:description", $enclosure)->item(0);
-			if ($desc) $enc->title = clean($desc->nodeValue);
+			if ($desc) {
+				$enc->title = clean($desc->nodeValue);
+			}
 
 			array_push($encs, $enc);
 		}
@@ -127,7 +137,9 @@ 
 					$enc->title = clean($desc->nodeValue);
 				} else {
 					$desc = $this->xpath->query("media:description", $enclosure)->item(0);
-					if ($desc) $enc->title = clean($desc->nodeValue);
+					if ($desc) {
+						$enc->title = clean($desc->nodeValue);
+					}
 				}
 
 				array_push($encs, $enc);
@@ -174,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);
 
@@ -183,8 +196,9 @@ 
 				$cat = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $cat);
 			}
 
-			if (mb_strlen($cat) > 250)
-				$cat = mb_substr($cat, 0, 250);
+			if (mb_strlen($cat) > 250) {
+							$cat = mb_substr($cat, 0, 250);
+			}
 
 			return $cat;
 		}, $tmp);

classes/feeditem/atom.php

Braces +8 added lines, -6 removed lines

@@ -43,10 +43,11 @@ 
 					|| $link->getAttribute("rel") == "standout")) {
 				$base = $this->xpath->evaluate("string(ancestor-or-self::*[@xml:base][1]/@xml:base)", $link);
 
-				if ($base)
-					return rewrite_relative_url($base, clean(trim($link->getAttribute("href"))));
-				else
-					return clean(trim($link->getAttribute("href")));
+				if ($base) {
+									return rewrite_relative_url($base, clean(trim($link->getAttribute("href"))));
+				} else {
+									return clean(trim($link->getAttribute("href")));
+				}
 
 			}
 		}
@@ -106,8 +107,9 @@ 
 		$cats = [];
 
 		foreach ($categories as $cat) {
-			if ($cat->hasAttribute("term"))
-				array_push($cats, $cat->getAttribute("term"));
+			if ($cat->hasAttribute("term")) {
+							array_push($cats, $cat->getAttribute("term"));
+			}
 		}
 
 		$categories = $this->xpath->query("dc:subject", $this->elem);

classes/handler/public.php

Indentation +23 added lines, -23 removed lines

@@ -285,7 +285,7 @@ 
 
 				array_push($rv, [ "label" => $title, "value" => $id ]);
 			}
-	    }
+		}
 
 		print json_encode($rv);
 	}
@@ -358,37 +358,37 @@ 
 
 			$enclosures = Article::get_article_enclosures($line["id"]);
 
-            header("Content-Type: text/html");
+			header("Content-Type: text/html");
 
-            $rv .= "<!DOCTYPE html>
+			$rv .= "<!DOCTYPE html>
                     <html><head>
                     <meta http-equiv='Content-Type' content='text/html; charset=utf-8'/>
                     <title>".$line["title"]."</title>".
-                    stylesheet_tag("css/default.css")."
+					stylesheet_tag("css/default.css")."
                     <link rel='shortcut icon' type='image/png' href='images/favicon.png'>
                     <link rel='icon' type='image/png' sizes='72x72' href='images/favicon-72px.png'>";
 
-            $rv .= "<meta property='og:title' content=\"".htmlspecialchars(html_entity_decode($line["title"], ENT_NOQUOTES | ENT_HTML401))."\"/>\n";
-            $rv .= "<meta property='og:description' content=\"".
-                htmlspecialchars(
-                	truncate_string(
-                		preg_replace("/[\r\n\t]/", "",
+			$rv .= "<meta property='og:title' content=\"".htmlspecialchars(html_entity_decode($line["title"], ENT_NOQUOTES | ENT_HTML401))."\"/>\n";
+			$rv .= "<meta property='og:description' content=\"".
+				htmlspecialchars(
+					truncate_string(
+						preg_replace("/[\r\n\t]/", "",
 							preg_replace("/ {1,}/", " ",
 								strip_tags(html_entity_decode($line["content"], ENT_NOQUOTES | ENT_HTML401))
 							)
 					), 500, "...")
 				)."\"/>\n";
 
-            $rv .= "</head>";
+			$rv .= "</head>";
 
-            list ($og_image, $og_stream) = Article::get_article_image($enclosures, $line['content'], $line["site_url"]);
+			list ($og_image, $og_stream) = Article::get_article_image($enclosures, $line['content'], $line["site_url"]);
 
-            if ($og_image) {
-                $rv .= "<meta property='og:image' content=\"" . htmlspecialchars($og_image) . "\"/>";
-            }
+			if ($og_image) {
+				$rv .= "<meta property='og:image' content=\"" . htmlspecialchars($og_image) . "\"/>";
+			}
 
-            $rv .= "<body class='flat ttrss_utility ttrss_zoom'>";
-            $rv .= "<div class='container'>";
+			$rv .= "<body class='flat ttrss_utility ttrss_zoom'>";
+			$rv .= "<div class='container'>";
 
 			if ($line["link"]) {
 				$rv .= "<h1><a target='_blank' rel='noopener noreferrer'
@@ -410,7 +410,7 @@ 
 				$owner_uid, true);
 
 			$rv .= "<div>".$line['author']."</div>";
-            $rv .= "<div>$parsed_updated</div>";
+			$rv .= "<div>$parsed_updated</div>";
 
 			$rv .= "</div>"; # row
 
@@ -425,10 +425,10 @@ 
 
 			$rv .= $line["content"];
 
-            $rv .= Article::format_article_enclosures($id,
-                $line["always_display_enclosures"],
-                $line["content"],
-                $line["hide_images"]);
+			$rv .= Article::format_article_enclosures($id,
+				$line["always_display_enclosures"],
+				$line["content"],
+				$line["hide_images"]);
 
 			$rv .= "</div>"; # content
 
@@ -675,8 +675,8 @@ 
 					if ($sth->fetch()) {
 						$_SESSION["profile"] = $profile;
  					} else {
-					    $_SESSION["profile"] = null;
-                    }
+						$_SESSION["profile"] = null;
+					}
 				}
 			} else {
 

Switch Indentation +18 added lines, -18 removed lines

@@ -760,24 +760,24 @@
 				$feed_urls = false;
 
 				switch ($rc['code']) {
-					case 0:
-						print_warning(T_sprintf("Already subscribed to <b>%s</b>.", $feed_url));
-						break;
-					case 1:
-						print_notice(T_sprintf("Subscribed to <b>%s</b>.", $feed_url));
-						break;
-					case 2:
-						print_error(T_sprintf("Could not subscribe to <b>%s</b>.", $feed_url));
-						break;
-					case 3:
-						print_error(T_sprintf("No feeds found in <b>%s</b>.", $feed_url));
-						break;
-					case 4:
-						$feed_urls = $rc["feeds"];
-						break;
-					case 5:
-						print_error(T_sprintf("Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL.", $feed_url));
-						break;
+				case 0:
+					print_warning(T_sprintf("Already subscribed to <b>%s</b>.", $feed_url));
+					break;
+				case 1:
+					print_notice(T_sprintf("Subscribed to <b>%s</b>.", $feed_url));
+					break;
+				case 2:
+					print_error(T_sprintf("Could not subscribe to <b>%s</b>.", $feed_url));
+					break;
+				case 3:
+					print_error(T_sprintf("No feeds found in <b>%s</b>.", $feed_url));
+					break;
+				case 4:
+					$feed_urls = $rc["feeds"];
+					break;
+				case 5:
+					print_error(T_sprintf("Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL.", $feed_url));
+					break;
 				}
 
 				if ($feed_urls) {

Spacing +28 added lines, -29 removed lines

@@ -7,7 +7,7 @@ 
 
 		require_once "lib/MiniTemplator.class.php";
 
-		$note_style = 	"background-color : #fff7d5;
+		$note_style = "background-color : #fff7d5;
 			border-width : 1px; ".
 			"padding : 5px; border-style : dashed; border-color : #e7d796;".
 			"margin-bottom : 1em; color : #9a8c59;";
@@ -73,8 +73,8 @@ 
 		$feed_site_url = $qfh_ret[2];
 		/* $last_error = $qfh_ret[3]; */
 
-		$feed_self_url = get_self_url_prefix() .
-			"/public.php?op=rss&id=$feed&key=" .
+		$feed_self_url = get_self_url_prefix().
+			"/public.php?op=rss&id=$feed&key=".
 			Feeds::get_feed_access_key($feed, false, $owner_uid);
 
 		if (!$feed_site_url) $feed_site_url = get_self_url_prefix();
@@ -102,8 +102,7 @@ 
 				}
 
 				$tpl->setVariable('ARTICLE_ID',
-					htmlspecialchars($orig_guid ? $line['link'] :
-							$this->make_article_tag_uri($line['id'], $line['date_entered'])), true);
+					htmlspecialchars($orig_guid ? $line['link'] : $this->make_article_tag_uri($line['id'], $line['date_entered'])), true);
 				$tpl->setVariable('ARTICLE_LINK', htmlspecialchars($line['link']), true);
 				$tpl->setVariable('ARTICLE_TITLE', htmlspecialchars($line['title']), true);
 				$tpl->setVariable('ARTICLE_EXCERPT', $line["content_preview"], true);
@@ -112,7 +111,7 @@ 
 					$feed_site_url, false, $line["id"]);
 
 				if ($line['note']) {
-					$content = "<div style=\"$note_style\">Article note: " . $line['note'] . "</div>" .
+					$content = "<div style=\"$note_style\">Article note: ".$line['note']."</div>".
 						$content;
 					$tpl->setVariable('ARTICLE_NOTE', htmlspecialchars($line['note']), true);
 				}
@@ -201,7 +200,7 @@ 
 				$article = array();
 
 				$article['id'] = $line['link'];
-				$article['link']	= $line['link'];
+				$article['link'] = $line['link'];
 				$article['title'] = $line['title'];
 				$article['excerpt'] = $line["content_preview"];
 				$article['content'] = sanitize($line["content"], false, $owner_uid, $feed_site_url, false, $line["id"]);
@@ -277,13 +276,13 @@ 
 			WHERE ttrss_users.id = ttrss_settings_profiles.owner_uid AND login = ? ORDER BY title");
 			$sth->execute([$login]);
 
-			$rv = [ [ "value" => 0, "label" => __("Default profile") ] ];
+			$rv = [["value" => 0, "label" => __("Default profile")]];
 
 			while ($line = $sth->fetch()) {
 				$id = $line["id"];
 				$title = $line["title"];
 
-				array_push($rv, [ "label" => $title, "value" => $id ]);
+				array_push($rv, ["label" => $title, "value" => $id]);
 			}
 	    }
 
@@ -384,7 +383,7 @@ 
             list ($og_image, $og_stream) = Article::get_article_image($enclosures, $line['content'], $line["site_url"]);
 
             if ($og_image) {
-                $rv .= "<meta property='og:image' content=\"" . htmlspecialchars($og_image) . "\"/>";
+                $rv .= "<meta property='og:image' content=\"".htmlspecialchars($og_image)."\"/>";
             }
 
             $rv .= "<body class='flat ttrss_utility ttrss_zoom'>";
@@ -393,9 +392,9 @@ 
 			if ($line["link"]) {
 				$rv .= "<h1><a target='_blank' rel='noopener noreferrer'
 					title=\"".htmlspecialchars($line['title'])."\"
-					href=\"" .htmlspecialchars($line["link"]) . "\">" .	$line["title"] . "</a></h1>";
+					href=\"" .htmlspecialchars($line["link"])."\">".$line["title"]."</a></h1>";
 			} else {
-				$rv .= "<h1>" . $line["title"] . "</h1>";
+				$rv .= "<h1>".$line["title"]."</h1>";
 			}
 
 			$rv .= "<div class='content post'>";
@@ -448,8 +447,8 @@ 
 		$feed = clean($_REQUEST["id"]);
 		$key = clean($_REQUEST["key"]);
 		$is_cat = clean($_REQUEST["is_cat"]);
-		$limit = (int)clean($_REQUEST["limit"]);
-		$offset = (int)clean($_REQUEST["offset"]);
+		$limit = (int) clean($_REQUEST["limit"]);
+		$offset = (int) clean($_REQUEST["offset"]);
 
 		$search = clean($_REQUEST["q"]);
 		$view_mode = clean($_REQUEST["view-mode"]);
@@ -692,9 +691,9 @@ 
 			$return = clean($_REQUEST['return']);
 
 			if ($_REQUEST['return'] && mb_strpos($return, SELF_URL_PATH) === 0) {
-				header("Location: " . clean($_REQUEST['return']));
+				header("Location: ".clean($_REQUEST['return']));
 			} else {
-				header("Location: " . get_self_url_prefix());
+				header("Location: ".get_self_url_prefix());
 			}
 		}
 	}
@@ -786,7 +785,7 @@ 
 					print "<input type='hidden' name='op' value='subscribe'>";
 
 					print "<fieldset>";
-					print "<label style='display : inline'>" . __("Multiple feed URLs found:") . "</label>";
+					print "<label style='display : inline'>".__("Multiple feed URLs found:")."</label>";
 					print "<select name='feed_url' dojoType='dijit.form.Select'>";
 
 					foreach ($feed_urls as $url => $name) {
@@ -805,9 +804,9 @@ 
 					print "</form>";
 				}
 
-				$tp_uri = get_self_url_prefix() . "/prefs.php";
+				$tp_uri = get_self_url_prefix()."/prefs.php";
 
-				if ($rc['code'] <= 2){
+				if ($rc['code'] <= 2) {
 					$sth = $this->pdo->prepare("SELECT id FROM ttrss_feeds WHERE
 					feed_url = ? AND owner_uid = ?");
 					$sth->execute([$feed_url, $_SESSION['uid']]);
@@ -895,7 +894,7 @@ 
 					list($timestamp, $resetpass_token) = explode(":", $resetpass_token_full);
 
 					if ($timestamp && $resetpass_token &&
-						$timestamp >= time() - 15*60*60 &&
+						$timestamp >= time() - 15 * 60 * 60 &&
 						$resetpass_token == $hash) {
 
 							$sth = $this->pdo->prepare("UPDATE ttrss_users SET resetpass_token = NULL
@@ -935,8 +934,8 @@ 
 				<input dojoType='dijit.form.TextBox' type='email' name='email' value='' required>
 				</fieldset>";
 
-			$_SESSION["pwdreset:testvalue1"] = rand(1,10);
-			$_SESSION["pwdreset:testvalue2"] = rand(1,10);
+			$_SESSION["pwdreset:testvalue1"] = rand(1, 10);
+			$_SESSION["pwdreset:testvalue2"] = rand(1, 10);
 
 			print "<fieldset>
 				<label>".T_sprintf("How much is %d + %d:", $_SESSION["pwdreset:testvalue1"], $_SESSION["pwdreset:testvalue2"])."</label>
@@ -981,8 +980,8 @@ 
 
 					if ($id) {
 						$resetpass_token = sha1(get_random_bytes(128));
-						$resetpass_link = get_self_url_prefix() . "/public.php?op=forgotpass&hash=" . $resetpass_token .
-							"&login=" . urlencode($login);
+						$resetpass_link = get_self_url_prefix()."/public.php?op=forgotpass&hash=".$resetpass_token.
+							"&login=".urlencode($login);
 
 						require_once "lib/MiniTemplator.class.php";
 
@@ -1009,7 +1008,7 @@ 
 
 						if (!$rc) print_error($mailer->error());
 
-						$resetpass_token_full = time() . ":" . $resetpass_token;
+						$resetpass_token_full = time().":".$resetpass_token;
 
 						$sth = $this->pdo->prepare("UPDATE ttrss_users
 							SET resetpass_token = ?
@@ -1099,12 +1098,12 @@ 
 				if ($op == "performupdate") {
 					if ($updater->isUpdateRequired()) {
 
-						print "<h2>" . T_sprintf("Performing updates to version %d", SCHEMA_VERSION) . "</h2>";
+						print "<h2>".T_sprintf("Performing updates to version %d", SCHEMA_VERSION)."</h2>";
 
 						for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
 							print "<ul>";
 
-							print "<li class='text-info'>" . T_sprintf("Updating to version %d", $i) . "</li>";
+							print "<li class='text-info'>".T_sprintf("Updating to version %d", $i)."</li>";
 
 							print "<li>";
 							$result = $updater->performUpdateTo($i, true);
@@ -1123,7 +1122,7 @@ 
 
 								return;
 							} else {
-								print "<li class='text-success'>" . __("Completed.") . "</li>";
+								print "<li class='text-success'>".__("Completed.")."</li>";
 								print "</ul>";
 							}
 						}
@@ -1191,7 +1190,7 @@ 
 
 		$timestamp = date("Y-m-d", strtotime($timestamp));
 
-		return "tag:" . parse_url(get_self_url_prefix(), PHP_URL_HOST) . ",$timestamp:/$id";
+		return "tag:".parse_url(get_self_url_prefix(), PHP_URL_HOST).",$timestamp:/$id";
 	}
 
 	// this should be used very carefully because this endpoint is exposed to unauthenticated users

Braces +24 added lines, -10 removed lines

@@ -12,7 +12,9 @@ 
 			"padding : 5px; border-style : dashed; border-color : #e7d796;".
 			"margin-bottom : 1em; color : #9a8c59;";
 
-		if (!$limit) $limit = 60;
+		if (!$limit) {
+			$limit = 60;
+		}
 
 		$date_sort_field = "date_entered DESC, updated DESC";
 
@@ -77,7 +79,9 @@ 
 			"/public.php?op=rss&id=$feed&key=" .
 			Feeds::get_feed_access_key($feed, false, $owner_uid);
 
-		if (!$feed_site_url) $feed_site_url = get_self_url_prefix();
+		if (!$feed_site_url) {
+			$feed_site_url = get_self_url_prefix();
+		}
 
 		if ($format == 'atom') {
 			$tpl = new MiniTemplator;
@@ -207,8 +211,12 @@ 
 				$article['content'] = sanitize($line["content"], false, $owner_uid, $feed_site_url, false, $line["id"]);
 				$article['updated'] = date('c', strtotime($line["updated"]));
 
-				if ($line['note']) $article['note'] = $line['note'];
-				if ($article['author']) $article['author'] = $line['author'];
+				if ($line['note']) {
+					$article['note'] = $line['note'];
+				}
+				if ($article['author']) {
+					$article['author'] = $line['author'];
+				}
 
 				$tags = Article::get_article_tags($line["id"], $owner_uid);
 
@@ -459,7 +467,9 @@ 
 		$format = clean($_REQUEST['format']);
 		$orig_guid = clean($_REQUEST["orig_guid"]);
 
-		if (!$format) $format = 'atom';
+		if (!$format) {
+			$format = 'atom';
+		}
 
 		if (SINGLE_USER_MODE) {
 			authenticate_user("admin", null);
@@ -472,8 +482,9 @@ 
 				ttrss_access_keys WHERE access_key = ? AND feed_id = ?");
 			$sth->execute([$key, $feed]);
 
-			if ($row = $sth->fetch())
-				$owner_id = $row["owner_uid"];
+			if ($row = $sth->fetch()) {
+							$owner_id = $row["owner_uid"];
+			}
 		}
 
 		if ($owner_id) {
@@ -683,8 +694,9 @@ 
 				// start an empty session to deliver login error message
 				@session_start();
 
-				if (!isset($_SESSION["login_error_msg"]))
-					$_SESSION["login_error_msg"] = __("Incorrect username or password");
+				if (!isset($_SESSION["login_error_msg"])) {
+									$_SESSION["login_error_msg"] = __("Incorrect username or password");
+				}
 
 				user_error("Failed login attempt for $login from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING);
 			}
@@ -1007,7 +1019,9 @@ 
 							"subject" => __("[tt-rss] Password reset request"),
 							"message" => $message]);
 
-						if (!$rc) print_error($mailer->error());
+						if (!$rc) {
+							print_error($mailer->error());
+						}
 
 						$resetpass_token_full = time() . ":" . $resetpass_token;
 

classes/feedparser.php

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
 		if ($error) {
 			foreach (libxml_get_errors() as $error) {
 				if ($error->level == LIBXML_ERR_FATAL) {
-					if(!isset($this->error)) //currently only the first error is reported
+					if (!isset($this->error)) //currently only the first error is reported
 						$this->error = $this->format_error($error);
 					$this->libxml_errors [] = $this->format_error($error);
 				}
@@ -69,7 +69,7 @@ 
 					$this->type = $this::FEED_ATOM;
 					break;
 				default:
-					if( !isset($this->error) ){
+					if (!isset($this->error)) {
 						$this->error = "Unknown/unsupported feed type";
 					}
 					return;
@@ -166,7 +166,7 @@ 
 			if ($this->link) $this->link = trim($this->link);
 
 		} else {
-			if( !isset($this->error) ){
+			if (!isset($this->error)) {
 				$this->error = "Unknown/unsupported feed type";
 			}
 			return;

Braces +29 added lines, -17 removed lines

@@ -26,8 +26,10 @@ 
 		if ($error) {
 			foreach (libxml_get_errors() as $error) {
 				if ($error->level == LIBXML_ERR_FATAL) {
-					if(!isset($this->error)) //currently only the first error is reported
+					if(!isset($this->error)) {
+						//currently only the first error is reported
 						$this->error = $this->format_error($error);
+					}
 					$this->libxml_errors [] = $this->format_error($error);
 				}
 			}
@@ -81,8 +83,9 @@ 
 
 				$title = $xpath->query("//atom:feed/atom:title")->item(0);
 
-				if (!$title)
-					$title = $xpath->query("//atom03:feed/atom03:title")->item(0);
+				if (!$title) {
+									$title = $xpath->query("//atom03:feed/atom03:title")->item(0);
+				}
 
 
 				if ($title) {
@@ -91,14 +94,17 @@ 
 
 				$link = $xpath->query("//atom:feed/atom:link[not(@rel)]")->item(0);
 
-				if (!$link)
-					$link = $xpath->query("//atom:feed/atom:link[@rel='alternate']")->item(0);
+				if (!$link) {
+									$link = $xpath->query("//atom:feed/atom:link[@rel='alternate']")->item(0);
+				}
 
-				if (!$link)
-					$link = $xpath->query("//atom03:feed/atom03:link[not(@rel)]")->item(0);
+				if (!$link) {
+									$link = $xpath->query("//atom03:feed/atom03:link[not(@rel)]")->item(0);
+				}
 
-				if (!$link)
-					$link = $xpath->query("//atom03:feed/atom03:link[@rel='alternate']")->item(0);
+				if (!$link) {
+									$link = $xpath->query("//atom03:feed/atom03:link[@rel='alternate']")->item(0);
+				}
 
 				if ($link && $link->hasAttributes()) {
 					$this->link = $link->getAttribute("href");
@@ -106,8 +112,9 @@ 
 
 				$articles = $xpath->query("//atom:entry");
 
-				if (!$articles || $articles->length == 0)
-					$articles = $xpath->query("//atom03:entry");
+				if (!$articles || $articles->length == 0) {
+									$articles = $xpath->query("//atom03:entry");
+				}
 
 				foreach ($articles as $article) {
 					array_push($this->items, new FeedItem_Atom($article, $this->doc, $this->xpath));
@@ -124,10 +131,11 @@ 
 				$link = $xpath->query("//channel/link")->item(0);
 
 				if ($link) {
-					if ($link->getAttribute("href"))
-						$this->link = $link->getAttribute("href");
-					else if ($link->nodeValue)
-						$this->link = $link->nodeValue;
+					if ($link->getAttribute("href")) {
+											$this->link = $link->getAttribute("href");
+					} else if ($link->nodeValue) {
+											$this->link = $link->nodeValue;
+					}
 				}
 
 				$articles = $xpath->query("//channel/item");
@@ -162,8 +170,12 @@ 
 
 			}
 
-			if ($this->title) $this->title = trim($this->title);
-			if ($this->link) $this->link = trim($this->link);
+			if ($this->title) {
+				$this->title = trim($this->title);
+			}
+			if ($this->link) {
+				$this->link = trim($this->link);
+			}
 
 		} else {
 			if( !isset($this->error) ){

classes/opml.php

Indentation +69 added lines, -69 removed lines

@@ -202,36 +202,36 @@ 
 					$cat_filter = $tmp_line["cat_filter"];
 
 					if (!$tmp_line["match_on"]) {
-                        if ($cat_filter && $tmp_line["cat_id"] || $tmp_line["feed_id"]) {
-                            $tmp_line["feed"] = Feeds::getFeedTitle(
-                                $cat_filter ? $tmp_line["cat_id"] : $tmp_line["feed_id"],
-                                $cat_filter);
-                        } else {
-                            $tmp_line["feed"] = "";
-                        }
-                    } else {
-					    $match = [];
-					    foreach (json_decode($tmp_line["match_on"], true) as $feed_id) {
-
-                            if (strpos($feed_id, "CAT:") === 0) {
-                                $feed_id = (int)substr($feed_id, 4);
-                                if ($feed_id) {
-                                    array_push($match, [Feeds::getCategoryTitle($feed_id), true, false]);
-                                } else {
-                                    array_push($match, [0, true, true]);
-                                }
-                            } else {
-                                if ($feed_id) {
-                                    array_push($match, [Feeds::getFeedTitle((int)$feed_id), false, false]);
-                                } else {
-                                    array_push($match, [0, false, true]);
-                                }
-                            }
-                        }
-
-                        $tmp_line["match"] = $match;
-					    unset($tmp_line["match_on"]);
-                    }
+						if ($cat_filter && $tmp_line["cat_id"] || $tmp_line["feed_id"]) {
+							$tmp_line["feed"] = Feeds::getFeedTitle(
+								$cat_filter ? $tmp_line["cat_id"] : $tmp_line["feed_id"],
+								$cat_filter);
+						} else {
+							$tmp_line["feed"] = "";
+						}
+					} else {
+						$match = [];
+						foreach (json_decode($tmp_line["match_on"], true) as $feed_id) {
+
+							if (strpos($feed_id, "CAT:") === 0) {
+								$feed_id = (int)substr($feed_id, 4);
+								if ($feed_id) {
+									array_push($match, [Feeds::getCategoryTitle($feed_id), true, false]);
+								} else {
+									array_push($match, [0, true, true]);
+								}
+							} else {
+								if ($feed_id) {
+									array_push($match, [Feeds::getFeedTitle((int)$feed_id), false, false]);
+								} else {
+									array_push($match, [0, false, true]);
+								}
+							}
+						}
+
+						$tmp_line["match"] = $match;
+						unset($tmp_line["match_on"]);
+					}
 
 					unset($tmp_line["feed_id"]);
 					unset($tmp_line["cat_id"]);
@@ -403,28 +403,28 @@ 
 
 						if ($rule["match"]) {
 
-                            $match_on = [];
+							$match_on = [];
 
-						    foreach ($rule["match"] as $match) {
-						        list ($name, $is_cat, $is_id) = $match;
+							foreach ($rule["match"] as $match) {
+								list ($name, $is_cat, $is_id) = $match;
 
-						        if ($is_id) {
-						            array_push($match_on, ($is_cat ? "CAT:" : "") . $name);
-                                } else {
+								if ($is_id) {
+									array_push($match_on, ($is_cat ? "CAT:" : "") . $name);
+								} else {
 
-                                    if (!$is_cat) {
-                                        $tsth = $this->pdo->prepare("SELECT id FROM ttrss_feeds
+									if (!$is_cat) {
+										$tsth = $this->pdo->prepare("SELECT id FROM ttrss_feeds
                                     		WHERE title = ? AND owner_uid = ?");
 
-                                        $tsth->execute([$name, $_SESSION['uid']]);
+										$tsth->execute([$name, $_SESSION['uid']]);
 
-                                        if ($row = $tsth->fetch()) {
-                                            $match_id = $row['id'];
+										if ($row = $tsth->fetch()) {
+											$match_id = $row['id'];
 
 											array_push($match_on, $match_id);
-                                        }
-                                    } else {
-                                        $tsth = $this->pdo->prepare("SELECT id FROM ttrss_feed_categories
+										}
+									} else {
+										$tsth = $this->pdo->prepare("SELECT id FROM ttrss_feed_categories
                                     		WHERE title = ? AND owner_uid = ?");
 										$tsth->execute([$name, $_SESSION['uid']]);
 
@@ -433,33 +433,33 @@ 
 
 											array_push($match_on, "CAT:$match_id");
 										}
-                                    }
-                                }
-                            }
+									}
+								}
+							}
 
-                            $reg_exp = $rule["reg_exp"];
-                            $filter_type = (int)$rule["filter_type"];
-                            $inverse = bool_to_sql_bool($rule["inverse"]);
-                            $match_on = json_encode($match_on);
+							$reg_exp = $rule["reg_exp"];
+							$filter_type = (int)$rule["filter_type"];
+							$inverse = bool_to_sql_bool($rule["inverse"]);
+							$match_on = json_encode($match_on);
 
-                            $usth = $this->pdo->prepare("INSERT INTO ttrss_filters2_rules
+							$usth = $this->pdo->prepare("INSERT INTO ttrss_filters2_rules
 								(feed_id,cat_id,match_on,filter_id,filter_type,reg_exp,cat_filter,inverse)
                                 VALUES
                                 (NULL, NULL, ?, ?, ?, ?, false, ?)");
-                            $usth->execute([$match_on, $filter_id, $filter_type, $reg_exp, $inverse]);
+							$usth->execute([$match_on, $filter_id, $filter_type, $reg_exp, $inverse]);
 
-                        } else {
+						} else {
 
-                            if (!$rule["cat_filter"]) {
-                                $tsth = $this->pdo->prepare("SELECT id FROM ttrss_feeds
+							if (!$rule["cat_filter"]) {
+								$tsth = $this->pdo->prepare("SELECT id FROM ttrss_feeds
                                     WHERE title = ? AND owner_uid = ?");
 
-                                $tsth->execute([$rule['feed'], $_SESSION['uid']]);
+								$tsth->execute([$rule['feed'], $_SESSION['uid']]);
 
-                                if ($row = $tsth->fetch()) {
-                                    $feed_id = $row['id'];
-                                }
-                            } else {
+								if ($row = $tsth->fetch()) {
+									$feed_id = $row['id'];
+								}
+							} else {
 								$tsth = $this->pdo->prepare("SELECT id FROM ttrss_feed_categories
                                     WHERE title = ? AND owner_uid = ?");
 
@@ -468,19 +468,19 @@ 
 								if ($row = $tsth->fetch()) {
 									$feed_id = $row['id'];
 								}
-                            }
+							}
 
-                            $cat_filter = bool_to_sql_bool($rule["cat_filter"]);
-                            $reg_exp = $rule["reg_exp"];
-                            $filter_type = (int)$rule["filter_type"];
-                            $inverse = bool_to_sql_bool($rule["inverse"]);
+							$cat_filter = bool_to_sql_bool($rule["cat_filter"]);
+							$reg_exp = $rule["reg_exp"];
+							$filter_type = (int)$rule["filter_type"];
+							$inverse = bool_to_sql_bool($rule["inverse"]);
 
-                            $usth = $this->pdo->prepare("INSERT INTO ttrss_filters2_rules
+							$usth = $this->pdo->prepare("INSERT INTO ttrss_filters2_rules
 								(feed_id,cat_id,filter_id,filter_type,reg_exp,cat_filter,inverse)
                                 VALUES
                                 (?, ?, ?, ?, ?, ?, ?)");
-                            $usth->execute([$feed_id, $cat_id, $filter_id, $filter_type, $reg_exp, $cat_filter, $inverse]);
-                        }
+							$usth->execute([$feed_id, $cat_id, $filter_id, $filter_type, $reg_exp, $cat_filter, $inverse]);
+						}
 					}
 
 					foreach ($filter["actions"] as $action) {

Spacing +14 added lines, -14 removed lines

@@ -70,7 +70,7 @@ 
 			$cat_title = htmlspecialchars($row['title']);
 
 			if ($include_settings) {
-				$order_id = (int)$row["order_id"];
+				$order_id = (int) $row["order_id"];
 				$ttrss_specific_qpart = "ttrssSortOrder=\"$order_id\"";
 			}
 		} else {
@@ -103,8 +103,8 @@ 
 			$site_url = htmlspecialchars($fline["site_url"]);
 
 			if ($include_settings) {
-				$update_interval = (int)$fline["update_interval"];
-				$order_id = (int)$fline["order_id"];
+				$update_interval = (int) $fline["update_interval"];
+				$order_id = (int) $fline["order_id"];
 
 				$ttrss_specific_qpart = "ttrssSortOrder=\"$order_id\" ttrssUpdateInterval=\"$update_interval\"";
 			} else {
@@ -130,7 +130,7 @@ 
 
 		if (!isset($_REQUEST["debug"])) {
 			header("Content-type: application/xml+opml");
-			header("Content-Disposition: attachment; filename=" . $name );
+			header("Content-Disposition: attachment; filename=".$name);
 		} else {
 			header("Content-type: text/xml");
 		}
@@ -139,7 +139,7 @@ 
 
 		$out .= "<opml version=\"1.0\">";
 		$out .= "<head>
-			<dateCreated>" . date("r", time()) . "</dateCreated>
+			<dateCreated>" . date("r", time())."</dateCreated>
 			<title>Tiny Tiny RSS Feed Export</title>
 		</head>";
 		$out .= "<body>";
@@ -214,7 +214,7 @@ 
 					    foreach (json_decode($tmp_line["match_on"], true) as $feed_id) {
 
                             if (strpos($feed_id, "CAT:") === 0) {
-                                $feed_id = (int)substr($feed_id, 4);
+                                $feed_id = (int) substr($feed_id, 4);
                                 if ($feed_id) {
                                     array_push($match, [Feeds::getCategoryTitle($feed_id), true, false]);
                                 } else {
@@ -222,7 +222,7 @@ 
                                 }
                             } else {
                                 if ($feed_id) {
-                                    array_push($match, [Feeds::getFeedTitle((int)$feed_id), false, false]);
+                                    array_push($match, [Feeds::getFeedTitle((int) $feed_id), false, false]);
                                 } else {
                                     array_push($match, [0, false, true]);
                                 }
@@ -409,7 +409,7 @@ 
 						        list ($name, $is_cat, $is_id) = $match;
 
 						        if ($is_id) {
-						            array_push($match_on, ($is_cat ? "CAT:" : "") . $name);
+						            array_push($match_on, ($is_cat ? "CAT:" : "").$name);
                                 } else {
 
                                     if (!$is_cat) {
@@ -438,7 +438,7 @@ 
                             }
 
                             $reg_exp = $rule["reg_exp"];
-                            $filter_type = (int)$rule["filter_type"];
+                            $filter_type = (int) $rule["filter_type"];
                             $inverse = bool_to_sql_bool($rule["inverse"]);
                             $match_on = json_encode($match_on);
 
@@ -472,7 +472,7 @@ 
 
                             $cat_filter = bool_to_sql_bool($rule["cat_filter"]);
                             $reg_exp = $rule["reg_exp"];
-                            $filter_type = (int)$rule["filter_type"];
+                            $filter_type = (int) $rule["filter_type"];
                             $inverse = bool_to_sql_bool($rule["inverse"]);
 
                             $usth = $this->pdo->prepare("INSERT INTO ttrss_filters2_rules
@@ -485,7 +485,7 @@ 
 
 					foreach ($filter["actions"] as $action) {
 
-						$action_id = (int)$action["action_id"];
+						$action_id = (int) $action["action_id"];
 						$action_param = $action["action_param"];
 
 						$usth = $this->pdo->prepare("INSERT INTO ttrss_filters2_actions
@@ -585,7 +585,7 @@ 
 		}
 
 		if (is_uploaded_file($_FILES['opml_file']['tmp_name'])) {
-			$tmp_file = tempnam(CACHE_DIR . '/upload', 'opml');
+			$tmp_file = tempnam(CACHE_DIR.'/upload', 'opml');
 
 			$result = move_uploaded_file($_FILES['opml_file']['tmp_name'],
 				$tmp_file);
@@ -623,10 +623,10 @@ 
 		print "$msg<br/>";
 	}
 
-	static function opml_publish_url(){
+	static function opml_publish_url() {
 
 		$url_path = get_self_url_prefix();
-		$url_path .= "/opml.php?op=publish&key=" .
+		$url_path .= "/opml.php?op=publish&key=".
 			Feeds::get_feed_access_key('OPML:Publish', false, $_SESSION["uid"]);
 
 		return $url_path;

Braces +47 added lines, -21 removed lines

@@ -52,10 +52,11 @@ 
 
 		$cat_id = (int) $cat_id;
 
-		if ($hide_private_feeds)
-			$hide_qpart = "(private IS false AND auth_login = '' AND auth_pass = '')";
-		else
-			$hide_qpart = "true";
+		if ($hide_private_feeds) {
+					$hide_qpart = "(private IS false AND auth_login = '' AND auth_pass = '')";
+		} else {
+					$hide_qpart = "true";
+		}
 
 		$out = "";
 
@@ -77,7 +78,9 @@ 
 			$cat_title = "";
 		}
 
-		if ($cat_title) $out .= "<outline text=\"$cat_title\" $ttrss_specific_qpart>\n";
+		if ($cat_title) {
+			$out .= "<outline text=\"$cat_title\" $ttrss_specific_qpart>\n";
+		}
 
 		$sth = $this->pdo->prepare("SELECT id,title
 			FROM ttrss_feed_categories WHERE
@@ -120,13 +123,17 @@ 
 			$out .= "<outline type=\"rss\" text=\"$title\" xmlUrl=\"$url\" $ttrss_specific_qpart $html_url_qpart/>\n";
 		}
 
-		if ($cat_title) $out .= "</outline>\n";
+		if ($cat_title) {
+			$out .= "</outline>\n";
+		}
 
 		return $out;
 	}
 
 	function opml_export($name, $owner_uid, $hide_private_feeds = false, $include_settings = true) {
-		if (!$owner_uid) return;
+		if (!$owner_uid) {
+			return;
+		}
 
 		if (!isset($_REQUEST["debug"])) {
 			header("Content-type: application/xml+opml");
@@ -275,8 +282,9 @@ 
 
 		// cleanup empty categories
 		foreach ($outlines as $node) {
-			if ($node->getElementsByTagName('outline')->length == 0)
-				$node->parentNode->removeChild($node);
+			if ($node->getElementsByTagName('outline')->length == 0) {
+							$node->parentNode->removeChild($node);
+			}
 		}
 
 		$res = $doc->saveXML();
@@ -297,10 +305,14 @@ 
 		$attrs = $node->attributes;
 
 		$feed_title = mb_substr($attrs->getNamedItem('text')->nodeValue, 0, 250);
-		if (!$feed_title) $feed_title = mb_substr($attrs->getNamedItem('title')->nodeValue, 0, 250);
+		if (!$feed_title) {
+			$feed_title = mb_substr($attrs->getNamedItem('title')->nodeValue, 0, 250);
+		}
 
 		$feed_url = $attrs->getNamedItem('xmlUrl')->nodeValue;
-		if (!$feed_url) $feed_url = $attrs->getNamedItem('xmlURL')->nodeValue;
+		if (!$feed_url) {
+			$feed_url = $attrs->getNamedItem('xmlURL')->nodeValue;
+		}
 
 		$site_url = mb_substr($attrs->getNamedItem('htmlUrl')->nodeValue, 0, 250);
 
@@ -309,19 +321,27 @@ 
 				feed_url = ? AND owner_uid = ?");
 			$sth->execute([$feed_url, $owner_uid]);
 
-			if (!$feed_title) $feed_title = '[Unknown]';
+			if (!$feed_title) {
+				$feed_title = '[Unknown]';
+			}
 
 			if (!$sth->fetch()) {
 				#$this->opml_notice("[FEED] [$feed_title/$feed_url] dst_CAT=$cat_id");
 				$this->opml_notice(T_sprintf("Adding feed: %s", $feed_title == '[Unknown]' ? $feed_url : $feed_title));
 
-				if (!$cat_id) $cat_id = null;
+				if (!$cat_id) {
+					$cat_id = null;
+				}
 
 				$update_interval = (int) $attrs->getNamedItem('ttrssUpdateInterval')->nodeValue;
-				if (!$update_interval) $update_interval = 0;
+				if (!$update_interval) {
+					$update_interval = 0;
+				}
 
 				$order_id = (int) $attrs->getNamedItem('ttrssSortOrder')->nodeValue;
-				if (!$order_id) $order_id = 0;
+				if (!$order_id) {
+					$order_id = 0;
+				}
 
 				$sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
 					(title, feed_url, owner_uid, cat_id, site_url, order_id, update_interval) VALUES
@@ -505,15 +525,18 @@ 
 		if ($root_node) {
 			$cat_title = mb_substr($root_node->attributes->getNamedItem('text')->nodeValue, 0, 250);
 
-			if (!$cat_title)
-				$cat_title = mb_substr($root_node->attributes->getNamedItem('title')->nodeValue, 0, 250);
+			if (!$cat_title) {
+							$cat_title = mb_substr($root_node->attributes->getNamedItem('title')->nodeValue, 0, 250);
+			}
 
 			if (!in_array($cat_title, array("tt-rss-filters", "tt-rss-labels", "tt-rss-prefs"))) {
 				$cat_id = $this->get_feed_category($cat_title, $parent_id);
 
 				if ($cat_id === false) {
 					$order_id = (int) $root_node->attributes->getNamedItem('ttrssSortOrder')->nodeValue;
-					if (!$order_id) $order_id = 0;
+					if (!$order_id) {
+						$order_id = 0;
+					}
 
 					Feeds::add_feed_category($cat_title, $parent_id, $order_id);
 					$cat_id = $this->get_feed_category($cat_title, $parent_id);
@@ -540,8 +563,9 @@ 
 				$attrs = $node->attributes;
 				$node_cat_title = $attrs->getNamedItem('text')->nodeValue;
 
-				if (!$node_cat_title)
-					$node_cat_title = $attrs->getNamedItem('title')->nodeValue;
+				if (!$node_cat_title) {
+									$node_cat_title = $attrs->getNamedItem('title')->nodeValue;
+				}
 
 				$node_feed_url = $attrs->getNamedItem('xmlUrl')->nodeValue;
 
@@ -574,7 +598,9 @@ 
 	}
 
 	function opml_import($owner_uid) {
-		if (!$owner_uid) return;
+		if (!$owner_uid) {
+			return;
+		}
 
 		$doc = false;