codysnider / tt-rss

classes/labels.php

Braces +24 added lines, -10 removed lines

@@ -56,11 +56,13 @@ 
 	public static function update_cache($owner_uid, $id, $labels = false, $force = false) {
 		$pdo = Db::pdo();
 
-		if ($force)
-			Labels::clear_cache($id);
+		if ($force) {
+					Labels::clear_cache($id);
+		}
 
-		if (!$labels)
-			$labels = Article::get_article_labels($id);
+		if (!$labels) {
+					$labels = Article::get_article_labels($id);
+		}
 
 		$labels = json_encode($labels);
 
@@ -84,7 +86,9 @@ 
 
 		$label_id = Labels::find_id($label, $owner_uid);
 
-		if (!$label_id) return;
+		if (!$label_id) {
+		    return;
+		}
 
 		$pdo = Db::pdo();
 
@@ -102,7 +106,9 @@ 
 
 		$label_id = Labels::find_id($label, $owner_uid);
 
-		if (!$label_id) return;
+		if (!$label_id) {
+		    return;
+		}
 
 		$pdo = Db::pdo();
 
@@ -128,7 +134,9 @@ 
 	}
 
 	public static function remove($id, $owner_uid) {
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+		if (!$owner_uid) {
+		    $owner_uid = $_SESSION["uid"];
+		}
 
 		$pdo = Db::pdo();
 		$tr_in_progress = false;
@@ -168,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();
 
@@ -198,7 +210,9 @@ 
 			$result = $sth->rowCount();
 		}
 
-		if (!$tr_in_progress) $pdo->commit();
+		if (!$tr_in_progress) {
+		    $pdo->commit();
+		}
 
 		return $result;
 	}

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/auth/base.php

Braces +3 added lines, -1 removed lines

@@ -14,7 +14,9 @@
 		if ($login && defined('AUTH_AUTO_CREATE') && AUTH_AUTO_CREATE) {
 			$user_id = $this->find_user_by_login($login);
 
-			if (!$password) $password = make_password();
+			if (!$password) {
+			    $password = make_password();
+			}
 
 			if (!$user_id) {
 				$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);

classes/feeditem/common.php

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);
+		}
 	}
 
 	public 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/diskcache.php

Braces +26 added lines, -20 removed lines

@@ -18,10 +18,11 @@ 
 
 	public function isWritable($filename = "") {
 		if ($filename) {
-			if (file_exists($this->getFullPath($filename)))
-				return is_writable($this->getFullPath($filename));
-			else
-				return is_writable($this->dir);
+			if (file_exists($this->getFullPath($filename))) {
+							return is_writable($this->getFullPath($filename));
+			} else {
+							return is_writable($this->dir);
+			}
 		} else {
 			return is_writable($this->dir);
 		}
@@ -32,10 +33,11 @@ 
 	}
 
 	public function getSize($filename) {
-		if ($this->exists($filename))
-			return filesize($this->getFullPath($filename));
-		else
-			return -1;
+		if ($this->exists($filename)) {
+					return filesize($this->getFullPath($filename));
+		} else {
+					return -1;
+		}
 	}
 
 	public function getFullPath($filename) {
@@ -53,17 +55,19 @@ 
 	}
 
 	public function get($filename) {
-		if ($this->exists($filename))
-			return file_get_contents($this->getFullPath($filename));
-		else
-			return null;
+		if ($this->exists($filename)) {
+					return file_get_contents($this->getFullPath($filename));
+		} else {
+					return null;
+		}
 	}
 
 	public function getMimeType($filename) {
-		if ($this->exists($filename))
-			return mime_content_type($this->getFullPath($filename));
-		else
-			return null;
+		if ($this->exists($filename)) {
+					return mime_content_type($this->getFullPath($filename));
+		} else {
+					return null;
+		}
 	}
 
 	public function send($filename) {
@@ -82,7 +86,9 @@ 
 	static public function rewriteUrls($str)
 	{
 		$res = trim($str);
-		if (!$res) return '';
+		if (!$res) {
+		    return '';
+		}
 
 		$doc = new DOMDocument();
 		if ($doc->loadHTML('<?xml encoding="UTF-8">' . $res)) {
@@ -105,9 +111,9 @@ 
 
 						$src = $cache->getUrl(sha1($src));
 
-						if ($entry->hasAttribute('poster'))
-							$entry->setAttribute('poster', $src);
-						else {
+						if ($entry->hasAttribute('poster')) {
+													$entry->setAttribute('poster', $src);
+						} else {
 							$entry->setAttribute('src', $src);
 							$entry->removeAttribute("srcset");
 						}

classes/rssutils.php

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/pluginhost.php

Braces +36 added lines, -17 removed lines

@@ -82,8 +82,9 @@ 
 	}
 
 	public static function getInstance() {
-		if (self::$instance == null)
-			self::$instance = new self();
+		if (self::$instance == null) {
+					self::$instance = new self();
+		}
 
 		return self::$instance;
 	}
@@ -191,7 +192,9 @@ 
 			$class_file = strtolower(clean_filename($class));
 
 			if (!is_dir(__DIR__."/../plugins/$class_file") &&
-					!is_dir(__DIR__."/../plugins.local/$class_file")) continue;
+					!is_dir(__DIR__."/../plugins.local/$class_file")) {
+			    continue;
+			}
 
 			// try system plugin directory first
 			$file = __DIR__ . "/../plugins/$class_file/init.php";
@@ -203,7 +206,9 @@ 
 			}
 
 			if (!isset($this->plugins[$class])) {
-				if (file_exists($file)) require_once $file;
+				if (file_exists($file)) {
+				    require_once $file;
+				}
 
 				if (class_exists($class) && is_subclass_of($class, "Plugin")) {
 
@@ -219,8 +224,9 @@ 
 								if ($namespace && $class_name) {
 									$class_file = "$vendor_dir/$namespace/" . str_replace('\\', '/', $class_name) . ".php";
 
-									if (file_exists($class_file))
-										require_once $class_file;
+									if (file_exists($class_file)) {
+																			require_once $class_file;
+									}
 								}
 							}
 						});
@@ -245,18 +251,24 @@ 
 					switch ($kind) {
 					case $this::KIND_SYSTEM:
 						if ($this->is_system($plugin)) {
-							if (!$skip_init) $plugin->init($this);
+							if (!$skip_init) {
+							    $plugin->init($this);
+							}
 							$this->register_plugin($class, $plugin);
 						}
 						break;
 					case $this::KIND_USER:
 						if (!$this->is_system($plugin)) {
-							if (!$skip_init) $plugin->init($this);
+							if (!$skip_init) {
+							    $plugin->init($this);
+							}
 							$this->register_plugin($class, $plugin);
 						}
 						break;
 					case $this::KIND_ALL:
-						if (!$skip_init) $plugin->init($this);
+						if (!$skip_init) {
+						    $plugin->init($this);
+						}
 						$this->register_plugin($class, $plugin);
 						break;
 					}
@@ -367,8 +379,9 @@ 
 				owner_uid= ? AND name = ?");
 			$sth->execute([$this->owner_uid, $plugin]);
 
-			if (!isset($this->storage[$plugin]))
-				$this->storage[$plugin] = array();
+			if (!isset($this->storage[$plugin])) {
+							$this->storage[$plugin] = array();
+			}
 
 			$content = serialize($this->storage[$plugin]);
 
@@ -391,12 +404,15 @@ 
 	public function set($sender, $name, $value, $sync = true) {
 		$idx = get_class($sender);
 
-		if (!isset($this->storage[$idx]))
-			$this->storage[$idx] = array();
+		if (!isset($this->storage[$idx])) {
+					$this->storage[$idx] = array();
+		}
 
 		$this->storage[$idx][$name] = $value;
 
-		if ($sync) $this->save_data(get_class($sender));
+		if ($sync) {
+		    $this->save_data(get_class($sender));
+		}
 	}
 
 	public function get($sender, $name, $default_value = false) {
@@ -433,7 +449,9 @@ 
 
 	// cat_id: only -1 is supported (Special)
 	public function add_feed($cat_id, $title, $icon, $sender) {
-		if (!$this->feeds[$cat_id]) $this->feeds[$cat_id] = array();
+		if (!$this->feeds[$cat_id]) {
+		    $this->feeds[$cat_id] = array();
+		}
 
 		$id = count($this->feeds[$cat_id]);
 
@@ -479,8 +497,9 @@ 
 	public function add_filter_action($sender, $action_name, $action_desc) {
 		$sender_class = get_class($sender);
 
-		if (!isset($this->plugin_actions[$sender_class]))
-			$this->plugin_actions[$sender_class] = array();
+		if (!isset($this->plugin_actions[$sender_class])) {
+					$this->plugin_actions[$sender_class] = array();
+		}
 
 		array_push($this->plugin_actions[$sender_class],
 			array("action" => $action_name, "description" => $action_desc, "sender" => $sender));

classes/opml.php

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;
 	}
 
 	public 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 @@ 
 	}
 
 	public function opml_import($owner_uid) {
-		if (!$owner_uid) return;
+		if (!$owner_uid) {
+		    return;
+		}
 
 		$doc = false;
 

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