codysnider / tt-rss

errors.php

Indentation +9 added lines, -9 removed lines

@@ -7,10 +7,10 @@ 
 $ERRORS[0] = "";
 
 $ERRORS[1] = __("This program requires XmlHttpRequest " .
-        "to function properly. Your browser doesn't seem to support it.");
+		"to function properly. Your browser doesn't seem to support it.");
 
 $ERRORS[2] = __("This program requires cookies " .
-        "to function properly. Your browser doesn't seem to support them.");
+		"to function properly. Your browser doesn't seem to support them.");
 
 $ERRORS[3] = __("Backend sanity check failed.");
 
@@ -41,15 +41,15 @@ 
 $ERRORS[15] = __("Encoding data as JSON failed");
 
 if ($_REQUEST['mode'] == 'js') {
-    header("Content-Type: text/javascript; charset=UTF-8");
+	header("Content-Type: text/javascript; charset=UTF-8");
 
-    print "var ERRORS = [];\n";
+	print "var ERRORS = [];\n";
 
-    foreach ($ERRORS as $id => $error) {
+	foreach ($ERRORS as $id => $error) {
 
-        $error = preg_replace("/\n/", "", $error);
-        $error = preg_replace("/\"/", "\\\"", $error);
+		$error = preg_replace("/\n/", "", $error);
+		$error = preg_replace("/\"/", "\\\"", $error);
 
-        print "ERRORS[$id] = \"$error\";\n";
-    }
+		print "ERRORS[$id] = \"$error\";\n";
+	}
 }

lib/phpqrcode/bindings/tcpdf/qrcode.php

Indentation +24 added lines, -24 removed lines

@@ -173,29 +173,29 @@ 
 	/**
 	 * Maximum matrix size for maximum version (version 40 is 177*177 matrix).
 	 */
-    define('QRSPEC_WIDTH_MAX', 177);
+	define('QRSPEC_WIDTH_MAX', 177);
 
 	// -----------------------------------------------------
 
 	/**
 	 * Matrix index to get width from $capacity array.
 	 */
-    define('QRCAP_WIDTH',    0);
+	define('QRCAP_WIDTH',    0);
 
-    /**
+	/**
 	 * Matrix index to get number of words from $capacity array.
 	 */
-    define('QRCAP_WORDS',    1);
+	define('QRCAP_WORDS',    1);
 
-    /**
+	/**
 	 * Matrix index to get remainder from $capacity array.
 	 */
-    define('QRCAP_REMINDER', 2);
+	define('QRCAP_REMINDER', 2);
 
-    /**
+	/**
 	 * Matrix index to get error correction level from $capacity array.
 	 */
-    define('QRCAP_EC',       3);
+	define('QRCAP_EC',       3);
 
 	// -----------------------------------------------------
 
@@ -204,33 +204,33 @@ 
 	/**
 	 * Number of header bits for structured mode
 	 */
-    define('STRUCTURE_HEADER_BITS',  20);
+	define('STRUCTURE_HEADER_BITS',  20);
 
-    /**
+	/**
 	 * Max number of symbols for structured mode
 	 */
-    define('MAX_STRUCTURED_SYMBOLS', 16);
+	define('MAX_STRUCTURED_SYMBOLS', 16);
 
 	// -----------------------------------------------------
 
-    // Masks
+	// Masks
 
-    /**
+	/**
 	 * Down point base value for case 1 mask pattern (concatenation of same color in a line or a column)
 	 */
-    define('N1',  3);
+	define('N1',  3);
 
-    /**
+	/**
 	 * Down point base value for case 2 mask pattern (module block of same color)
 	 */
 	define('N2',  3);
 
-    /**
+	/**
 	 * Down point base value for case 3 mask pattern (1:1:3:1:1(dark:bright:dark:bright:dark)pattern in a line or a column)
 	 */
 	define('N3', 40);
 
-    /**
+	/**
 	 * Down point base value for case 4 mask pattern (ration of dark modules in whole)
 	 */
 	define('N4', 10);
@@ -264,12 +264,12 @@ 
 
 	// for compaibility with PHP4
 	if (!function_exists('str_split')) {
-    	/**
-    	 * Convert a string to an array (needed for PHP4 compatibility)
-    	 * @param string $string The input string.
-    	 * @param int $split_length Maximum length of the chunk.
-    	 * @return  If the optional split_length  parameter is specified, the returned array will be broken down into chunks with each being split_length  in length, otherwise each chunk will be one character in length. FALSE is returned if split_length is less than 1. If the split_length length exceeds the length of string , the entire string is returned as the first (and only) array element.
-    	 */
+		/**
+		 * Convert a string to an array (needed for PHP4 compatibility)
+		 * @param string $string The input string.
+		 * @param int $split_length Maximum length of the chunk.
+		 * @return  If the optional split_length  parameter is specified, the returned array will be broken down into chunks with each being split_length  in length, otherwise each chunk will be one character in length. FALSE is returned if split_length is less than 1. If the split_length length exceeds the length of string , the entire string is returned as the first (and only) array element.
+		 */
 		public function str_split($string, $split_length=1) {
 			if ((strlen($string) > $split_length) OR (!$split_length)) {
 				do {
@@ -2622,7 +2622,7 @@ 
 		}
 
 		/**
-		* Return block number 1
+		 * Return block number 1
 		 * @param array $spec
 		 * @return int value
 		 */

classes/rpc.php

Braces +15 added lines, -6 removed lines

@@ -11,7 +11,9 @@ 
 		$_SESSION["profile"] = (int) clean($_REQUEST["id"]);
 
 		// default value
-		if (!$_SESSION["profile"]) $_SESSION["profile"] = null;
+		if (!$_SESSION["profile"]) {
+			$_SESSION["profile"] = null;
+		}
 	}
 
 	public function remprofiles() {
@@ -173,7 +175,9 @@ 
 				if ($row = $sth->fetch()) {
 					$feed_id = $row["id"];
 				} else {
-					if (!$title) $title = '[Unknown]';
+					if (!$title) {
+						$title = '[Unknown]';
+					}
 
 					$sth = $this->pdo->prepare("INSERT INTO ttrss_feeds
 							(owner_uid,feed_url,site_url,title,cat_id,auth_login,auth_pass,update_method)
@@ -216,7 +220,9 @@ 
 	private function archive_article($id, $owner_uid) {
 		$this->pdo->beginTransaction();
 
-		if (!$owner_uid) $owner_uid = $_SESSION['uid'];
+		if (!$owner_uid) {
+			$owner_uid = $_SESSION['uid'];
+		}
 
 		$sth = $this->pdo->prepare("SELECT feed_id FROM ttrss_user_entries
 			WHERE ref_id = ? AND owner_uid = ?");
@@ -278,8 +284,9 @@ 
 			'seq' => $seq
 		];
 
-		if ($seq % 2 == 0)
-			$reply['runtime-info'] = make_runtime_info();
+		if ($seq % 2 == 0) {
+					$reply['runtime-info'] = make_runtime_info();
+		}
 
 		print json_encode($reply);
 	}
@@ -353,7 +360,9 @@ 
 		$payload = json_decode(clean($_REQUEST["payload"]), false);
 		$mode = clean($_REQUEST["mode"]);
 
-		if (!$payload || !is_array($payload)) return;
+		if (!$payload || !is_array($payload)) {
+			return;
+		}
 
 		if ($mode == 1) {
 			foreach ($payload as $feed) {

classes/article.php

Indentation +14 added lines, -14 removed lines

@@ -13,7 +13,7 @@ 
 		$sth = $this->pdo->prepare("SELECT link FROM ttrss_entries, ttrss_user_entries
 						WHERE id = ? AND id = ref_id AND owner_uid = ?
 						LIMIT 1");
-        $sth->execute([$id, $_SESSION['uid']]);
+		$sth->execute([$id, $_SESSION['uid']]);
 
 		if ($row = $sth->fetch()) {
 			$article_url = $row['link'];
@@ -76,7 +76,7 @@ 
 
 			$sth = $pdo->prepare("SELECT int_id FROM ttrss_user_entries WHERE
 				ref_id = ? AND owner_uid = ? LIMIT 1");
-            $sth->execute([$ref_id, $owner_uid]);
+			$sth->execute([$ref_id, $owner_uid]);
 
 			if ($row = $sth->fetch()) {
 				$int_id = $row['int_id'];
@@ -616,22 +616,22 @@ 
 
 	public static function purge_orphans() {
 
-        // purge orphaned posts in main content table
+		// purge orphaned posts in main content table
 
-        if (DB_TYPE == "mysql")
-            $limit_qpart = "LIMIT 5000";
-        else
-            $limit_qpart = "";
+		if (DB_TYPE == "mysql")
+			$limit_qpart = "LIMIT 5000";
+		else
+			$limit_qpart = "";
 
-        $pdo = Db::pdo();
-        $res = $pdo->query("DELETE FROM ttrss_entries WHERE
+		$pdo = Db::pdo();
+		$res = $pdo->query("DELETE FROM ttrss_entries WHERE
 			NOT EXISTS (SELECT ref_id FROM ttrss_user_entries WHERE ref_id = id) $limit_qpart");
 
-        if (Debug::enabled()) {
-            $rows = $res->rowCount();
-            Debug::log("Purged $rows orphaned posts.");
-        }
-    }
+		if (Debug::enabled()) {
+			$rows = $res->rowCount();
+			Debug::log("Purged $rows orphaned posts.");
+		}
+	}
 
 	public static function catchupArticlesById($ids, $cmode, $owner_uid = false) {
 

Braces +90 added lines, -53 removed lines

@@ -57,10 +57,16 @@ 
 
 		$rc = false;
 
-		if (!$title) $title = $url;
-		if (!$title && !$url) return false;
+		if (!$title) {
+			$title = $url;
+		}
+		if (!$title && !$url) {
+			return false;
+		}
 
-		if (filter_var($url, FILTER_VALIDATE_URL) === FALSE) return false;
+		if (filter_var($url, FILTER_VALIDATE_URL) === FALSE) {
+			return false;
+		}
 
 		$pdo = Db::pdo();
 
@@ -271,7 +277,9 @@ 
 		$tags_str = $this->format_tags_string($tags);
 		$tags_str_full = join(", ", $tags);
 
-		if (!$tags_str_full) $tags_str_full = __("no tags");
+		if (!$tags_str_full) {
+			$tags_str_full = __("no tags");
+		}
 
 		print json_encode([
 			"id" => (int) $id,
@@ -320,10 +328,11 @@ 
 
 			foreach ($ids as $id) {
 
-				if ($assign)
-					Labels::add_article($id, $label, $_SESSION["uid"]);
-				else
-					Labels::remove_article($id, $label, $_SESSION["uid"]);
+				if ($assign) {
+									Labels::add_article($id, $label, $_SESSION["uid"]);
+				} else {
+									Labels::remove_article($id, $label, $_SESSION["uid"]);
+				}
 
 				$labels = $this->get_article_labels($id, $_SESSION["uid"]);
 
@@ -384,14 +393,18 @@ 
 				$width = $line["width"];
 				$height = $line["height"];
 
-				if (!$ctype) $ctype = __("unknown type");
+				if (!$ctype) {
+					$ctype = __("unknown type");
+				}
 
 				//$filename = substr($url, strrpos($url, "/")+1);
 				$filename = basename($url);
 
 				$player = format_inline_player($url, $ctype);
 
-				if ($player) array_push($entries_inline, $player);
+				if ($player) {
+					array_push($entries_inline, $player);
+				}
 
 #				$entry .= " <a target=\"_blank\" href=\"" . htmlspecialchars($url) . "\" rel=\"noopener noreferrer\">" .
 #					$filename . " (" . $ctype . ")" . "</a>";
@@ -419,8 +432,9 @@ 
 
 					foreach ($entries as $entry) {
 
-						foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ENCLOSURE) as $plugin)
-							$retval = $plugin->hook_render_enclosure($entry, $hide_images);
+						foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ENCLOSURE) as $plugin) {
+													$retval = $plugin->hook_render_enclosure($entry, $hide_images);
+						}
 
 
 						if ($retval) {
@@ -431,10 +445,12 @@ 
 
 								if (!$hide_images) {
 									$encsize = '';
-									if ($entry['height'] > 0)
-										$encsize .= ' height="' . intval($entry['height']) . '"';
-									if ($entry['width'] > 0)
-										$encsize .= ' width="' . intval($entry['width']) . '"';
+									if ($entry['height'] > 0) {
+																			$encsize .= ' height="' . intval($entry['height']) . '"';
+									}
+									if ($entry['width'] > 0) {
+																			$encsize .= ' width="' . intval($entry['width']) . '"';
+									}
 									$rv .= "<p><img
 										alt=\"".htmlspecialchars($entry["filename"])."\"
 										src=\"" .htmlspecialchars($entry["url"]) . "\"
@@ -466,15 +482,17 @@ 
 			$rv .= "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 
 			foreach ($entries as $entry) {
-				if ($entry["title"])
-					$title = " &mdash; " . truncate_string($entry["title"], 30);
-				else
-					$title = "";
+				if ($entry["title"]) {
+									$title = " &mdash; " . truncate_string($entry["title"], 30);
+				} else {
+									$title = "";
+				}
 
-				if ($entry["filename"])
-					$filename = truncate_middle(htmlspecialchars($entry["filename"]), 60);
-				else
-					$filename = "";
+				if ($entry["filename"]) {
+									$filename = truncate_middle(htmlspecialchars($entry["filename"]), 60);
+				} else {
+									$filename = "";
+				}
 
 				$rv .= "<div onclick='popupOpenUrl(\"".htmlspecialchars($entry["url"])."\")'
 					dojoType=\"dijit.MenuItem\">".$filename . $title."</div>";
@@ -492,7 +510,9 @@ 
 
 		$a_id = $id;
 
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+		if (!$owner_uid) {
+			$owner_uid = $_SESSION["uid"];
+		}
 
 		$pdo = Db::pdo();
 
@@ -510,7 +530,9 @@ 
 				WHERE ref_id = ? AND owner_uid = ?");
 			$csth->execute([$id, $owner_uid]);
 
-			if ($row = $csth->fetch()) $tag_cache = $row["tag_cache"];
+			if ($row = $csth->fetch()) {
+				$tag_cache = $row["tag_cache"];
+			}
 		}
 
 		if ($tag_cache) {
@@ -551,8 +573,9 @@ 
 
 			$tags_str = mb_substr($tags_str, 0, mb_strlen($tags_str)-2);
 
-			if (count($tags) > $maxtags)
-				$tags_str .= ", &hellip;";
+			if (count($tags) > $maxtags) {
+							$tags_str .= ", &hellip;";
+			}
 
 			return $tags_str;
 		}
@@ -560,7 +583,9 @@ 
 
 	public static function format_article_labels($labels) {
 
-		if (!is_array($labels)) return '';
+		if (!is_array($labels)) {
+			return '';
+		}
 
 		$labels_str = "";
 
@@ -618,10 +643,11 @@ 
 
         // purge orphaned posts in main content table
 
-        if (DB_TYPE == "mysql")
-            $limit_qpart = "LIMIT 5000";
-        else
-            $limit_qpart = "";
+        if (DB_TYPE == "mysql") {
+                    $limit_qpart = "LIMIT 5000";
+        } else {
+                    $limit_qpart = "";
+        }
 
         $pdo = Db::pdo();
         $res = $pdo->query("DELETE FROM ttrss_entries WHERE
@@ -635,7 +661,9 @@ 
 
 	public static function catchupArticlesById($ids, $cmode, $owner_uid = false) {
 
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+		if (!$owner_uid) {
+			$owner_uid = $_SESSION["uid"];
+		}
 
 		$pdo = Db::pdo();
 
@@ -685,7 +713,9 @@ 
 	public static function get_article_labels($id, $owner_uid = false) {
 		$rv = array();
 
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+		if (!$owner_uid) {
+			$owner_uid = $_SESSION["uid"];
+		}
 
 		$pdo = Db::pdo();
 
@@ -699,10 +729,11 @@ 
 			if ($label_cache) {
 				$tmp = json_decode($label_cache, true);
 
-				if (!$tmp || $tmp["no-labels"] == 1)
-					return $rv;
-				else
-					return $tmp;
+				if (!$tmp || $tmp["no-labels"] == 1) {
+									return $rv;
+				} else {
+									return $tmp;
+				}
 			}
 		}
 
@@ -721,10 +752,11 @@ 
 			array_push($rv, $rk);
 		}
 
-		if (count($rv) > 0)
-			Labels::update_cache($owner_uid, $id, $rv);
-		else
-			Labels::update_cache($owner_uid, $id, array("no-labels" => 1));
+		if (count($rv) > 0) {
+					Labels::update_cache($owner_uid, $id, $rv);
+		} else {
+					Labels::update_cache($owner_uid, $id, array("no-labels" => 1));
+		}
 
 		return $rv;
 	}
@@ -772,28 +804,33 @@ 
 				}
 			}
 
-			if (!$article_image)
-				foreach ($enclosures as $enc) {
+			if (!$article_image) {
+							foreach ($enclosures as $enc) {
 					if (strpos($enc["content_type"], "image/") !== FALSE) {
 						$article_image = $enc["content_url"];
+			}
 						break;
 					}
 				}
 
-			if ($article_image)
-				$article_image = rewrite_relative_url($site_url, $article_image);
+			if ($article_image) {
+							$article_image = rewrite_relative_url($site_url, $article_image);
+			}
 
-			if ($article_stream)
-				$article_stream = rewrite_relative_url($site_url, $article_stream);
+			if ($article_stream) {
+							$article_stream = rewrite_relative_url($site_url, $article_stream);
+			}
 		}
 
 		$cache = new DiskCache("images");
 
-		if ($article_image && $cache->exists(sha1($article_image)))
-			$article_image = $cache->getUrl(sha1($article_image));
+		if ($article_image && $cache->exists(sha1($article_image))) {
+					$article_image = $cache->getUrl(sha1($article_image));
+		}
 
-		if ($article_stream && $cache->exists(sha1($article_stream)))
-			$article_stream = $cache->getUrl(sha1($article_stream));
+		if ($article_stream && $cache->exists(sha1($article_stream))) {
+					$article_stream = $cache->getUrl(sha1($article_stream));
+		}
 
 		return [$article_image, $article_stream];
 	}

classes/feeds.php

Indentation +77 added lines, -77 removed lines

@@ -5,9 +5,9 @@ 
 	const NEVER_GROUP_FEEDS = [ -6, 0 ];
 	const NEVER_GROUP_BY_DATE = [ -2, -1, -3 ];
 
-    private $params;
+	private $params;
 
-    function csrf_ignore($method) {
+	function csrf_ignore($method) {
 		$csrf_ignored = array("index", "quickaddfeed", "search");
 
 		return array_search($method, $csrf_ignored) !== false;
@@ -101,7 +101,7 @@ 
 		//$reply .= "<option value=\"catchupPage()\">".__('Mark as read')."</option>";
 
 		$reply .= "<option value=\"App.displayDlg('".__("Show as feed")."','generatedFeed', '$feed_id:$is_cat:$rss_link')\">".
-            __('Show as feed')."</option>";
+			__('Show as feed')."</option>";
 
 		$reply .= "</select>";
 
@@ -133,10 +133,10 @@ 
 		$method_split = explode(":", $method);
 
 		if ($method == "ForceUpdate" && $feed > 0 && is_numeric($feed)) {
-            $sth = $this->pdo->prepare("UPDATE ttrss_feeds
+			$sth = $this->pdo->prepare("UPDATE ttrss_feeds
                             SET last_updated = '1970-01-01', last_update_started = '1970-01-01'
                             WHERE id = ?");
-            $sth->execute([$feed]);
+			$sth->execute([$feed]);
 		}
 
 		if ($method_split[0] == "MarkAllReadGR")  {
@@ -197,7 +197,7 @@ 
 				"include_children" => $include_children,
 				"check_first_id" => $check_first_id,
 				"skip_first_id_check" => $skip_first_id_check,
-                "order_by" => $order_by
+				"order_by" => $order_by
 			);
 
 			$qfh_ret = $this->queryFeedHeadlines($params);
@@ -235,7 +235,7 @@ 
 
 		$headlines_count = 0;
 
-        if (is_object($result)) {
+		if (is_object($result)) {
 			while ($line = $result->fetch(PDO::FETCH_ASSOC)) {
 
 				++$headlines_count;
@@ -248,7 +248,7 @@ 
 					foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
 						$line = $p->hook_query_headlines($line, 250, false);
 					}
-                }
+				}
 
 				$id = $line["id"];
 
@@ -295,53 +295,53 @@ 
 
 				if (!$line["feed_title"]) $line["feed_title"] = "";
 
-                $line["buttons_left"] = "";
-                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_LEFT_BUTTON) as $p) {
-                    $line["buttons_left"] .= $p->hook_article_left_button($line);
-                }
+				$line["buttons_left"] = "";
+				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_LEFT_BUTTON) as $p) {
+					$line["buttons_left"] .= $p->hook_article_left_button($line);
+				}
 
-                $line["buttons"] = "";
-                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_BUTTON) as $p) {
-                    $line["buttons"] .= $p->hook_article_button($line);
-                }
+				$line["buttons"] = "";
+				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_BUTTON) as $p) {
+					$line["buttons"] .= $p->hook_article_button($line);
+				}
 
-                $line["content"] = sanitize($line["content"],
-                    $line['hide_images'], false, $line["site_url"], $highlight_words, $line["id"]);
+				$line["content"] = sanitize($line["content"],
+					$line['hide_images'], false, $line["site_url"], $highlight_words, $line["id"]);
 
-                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_CDM) as $p) {
-                    $line = $p->hook_render_article_cdm($line);
-                }
+				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_CDM) as $p) {
+					$line = $p->hook_render_article_cdm($line);
+				}
 
-                $line['content'] = DiskCache::rewriteUrls($line['content']);
+				$line['content'] = DiskCache::rewriteUrls($line['content']);
 
-                if ($line['note'])
-                    $line['note'] = Article::format_article_note($id, $line['note']);
-                else
-                    $line['note'] = "";
+				if ($line['note'])
+					$line['note'] = Article::format_article_note($id, $line['note']);
+				else
+					$line['note'] = "";
 
-                if (!get_pref("CDM_EXPANDED")) {
-                    $line["cdm_excerpt"] = "<span class='collapse'>
+				if (!get_pref("CDM_EXPANDED")) {
+					$line["cdm_excerpt"] = "<span class='collapse'>
                         <i class='material-icons' onclick='return Article.cdmUnsetActive(event)'
                             title=\"" . __("Collapse article") . "\">remove_circle</i></span>";
 
-                    if (get_pref('SHOW_CONTENT_PREVIEW')) {
-                        $line["cdm_excerpt"] .= "<span class='excerpt'>" . $line["content_preview"] . "</span>";
-                    }
-                }
+					if (get_pref('SHOW_CONTENT_PREVIEW')) {
+						$line["cdm_excerpt"] .= "<span class='excerpt'>" . $line["content_preview"] . "</span>";
+					}
+				}
 
-                $line["enclosures"] = Article::format_article_enclosures($id, $line["always_display_enclosures"],
-                    $line["content"], $line["hide_images"]);
+				$line["enclosures"] = Article::format_article_enclosures($id, $line["always_display_enclosures"],
+					$line["content"], $line["hide_images"]);
 
-                if ($line["orig_feed_id"]) {
+				if ($line["orig_feed_id"]) {
 
-                    $ofgh = $this->pdo->prepare("SELECT * FROM ttrss_archived_feeds
+					$ofgh = $this->pdo->prepare("SELECT * FROM ttrss_archived_feeds
                     WHERE id = ? AND owner_uid = ?");
-                    $ofgh->execute([$line["orig_feed_id"], $_SESSION['uid']]);
+					$ofgh->execute([$line["orig_feed_id"], $_SESSION['uid']]);
 
-                    if ($tmp_line = $ofgh->fetch()) {
-                        $line["orig_feed"] = [ $tmp_line["title"], $tmp_line["site_url"], $tmp_line["feed_url"] ];
-                    }
-                }
+					if ($tmp_line = $ofgh->fetch()) {
+						$line["orig_feed"] = [ $tmp_line["title"], $tmp_line["site_url"], $tmp_line["feed_url"] ];
+					}
+				}
 
 				$line["updated_long"] = make_local_datetime($line["updated"],true);
 				$line["updated"] = make_local_datetime($line["updated"], false, false, false, true);
@@ -363,7 +363,7 @@ 
 					$line['feed_icon'] = "<i class='icon-no-feed material-icons'>rss_feed</i>";
 				}
 
-			    //setting feed headline background color, needs to change text color based on dark/light
+				//setting feed headline background color, needs to change text color based on dark/light
 				$fav_color = $line['favicon_avg_color'];
 
 				require_once "colors.php";
@@ -377,18 +377,18 @@ 
 				}
 
 				if (isset($rgba_cache[$feed_id])) {
-				    $line['feed_bg_color'] = 'rgba(' . implode(",", $rgba_cache[$feed_id]) . ',0.3)';
-                }
+					$line['feed_bg_color'] = 'rgba(' . implode(",", $rgba_cache[$feed_id]) . ',0.3)';
+				}
 
 				/* we don't need those */
 
-                foreach (["date_entered", "guid", "last_published", "last_marked", "tag_cache", "favicon_avg_color",
-                             "uuid", "label_cache", "yyiw"] as $k)
-                    unset($line[$k]);
+				foreach (["date_entered", "guid", "last_published", "last_marked", "tag_cache", "favicon_avg_color",
+							 "uuid", "label_cache", "yyiw"] as $k)
+					unset($line[$k]);
 
 				array_push($reply['content'], $line);
 			}
-        }
+		}
 
 		if (!$headlines_count) {
 
@@ -570,7 +570,7 @@ 
 		$reply['headlines']['is_cat'] = (bool) $cat_view;
 
 		$reply['headlines-info'] = ["count" => (int) $headlines_count,
-            						"disable_cache" => (bool) $disable_cache];
+									"disable_cache" => (bool) $disable_cache];
 
 		// this is parsed by handleRpcJson() on first viewfeed() to set cdm expanded, etc
 		$reply['runtime-info'] = make_runtime_info();
@@ -578,9 +578,9 @@ 
 		$reply_json = json_encode($reply);
 
 		if (!$reply_json) {
-		    $reply_json = json_encode(["error" => ["code" => 15,
-                "message" => json_last_error_msg()]]);
-        }
+			$reply_json = json_encode(["error" => ["code" => 15,
+				"message" => json_last_error_msg()]]);
+		}
 
 		print $reply_json;
 
@@ -780,9 +780,9 @@ 
 		$sth->execute([$feed_id, $_SESSION['uid']]);
 
 		if (!$sth->fetch()) {
-		    print "Access denied.";
-		    return;
-        }
+			print "Access denied.";
+			return;
+		}
 
 		$refetch_checked = isset($_REQUEST["force_refetch"]) ? "checked" : "";
 		$rehash_checked = isset($_REQUEST["force_rehash"]) ? "checked" : "";
@@ -1230,7 +1230,7 @@ 
 				} else {
 					$icon = self::getIconFile($id);
 
-                    if ($icon && file_exists($icon)) {
+					if ($icon && file_exists($icon)) {
 						return ICONS_URL . "/" . basename($icon) . "?" . filemtime($icon);
 					}
 				}
@@ -1240,7 +1240,7 @@ 
 	}
 
 	public static function getFeedTitle($id, $cat = false) {
-	    $pdo = Db::pdo();
+		$pdo = Db::pdo();
 
 		if ($cat) {
 			return Feeds::getCategoryTitle($id);
@@ -1271,10 +1271,10 @@ 
 
 		} else if (is_numeric($id) && $id > 0) {
 
-		    $sth = $pdo->prepare("SELECT title FROM ttrss_feeds WHERE id = ?");
-		    $sth->execute([$id]);
+			$sth = $pdo->prepare("SELECT title FROM ttrss_feeds WHERE id = ?");
+			$sth->execute([$id]);
 
-		    if ($row = $sth->fetch()) {
+			if ($row = $sth->fetch()) {
 				return $row["title"];
 			} else {
 				return "Unknown feed ($id)";
@@ -1293,7 +1293,7 @@ 
 
 		if ($cat >= 0) {
 
-		    if (!$cat) $cat = null;
+			if (!$cat) $cat = null;
 
 			$sth = $pdo->prepare("SELECT id FROM ttrss_feeds
                     WHERE (cat_id = :cat OR (:cat IS NULL AND cat_id IS NULL))
@@ -1333,7 +1333,7 @@ 
 				WHERE article_id = ref_id AND unread = true
 					AND ttrss_user_entries.owner_uid = ?");
 			$sth->execute([$owner_uid]);
-            $row = $sth->fetch();
+			$row = $sth->fetch();
 
 			return $row["unread"];
 		}
@@ -1381,7 +1381,7 @@ 
 			return __("Labels");
 		} else {
 
-		    $pdo = Db::pdo();
+			$pdo = Db::pdo();
 
 			$sth = $pdo->prepare("SELECT title FROM ttrss_feed_categories WHERE
 				id = ?");
@@ -1417,7 +1417,7 @@ 
 		$pdo = Db::pdo();
 
 		// WARNING: due to highly dynamic nature of this query its going to quote parameters
-        // right before adding them to SQL part
+		// right before adding them to SQL part
 
 		$feed = $params["feed"];
 		$limit = isset($params["limit"]) ? $params["limit"] : 30;
@@ -1661,7 +1661,7 @@ 
 					$ssth = $pdo->prepare("SELECT title,site_url,last_error,last_updated
 							FROM ttrss_feeds WHERE id = ? AND owner_uid = ?");
 					$ssth->execute([$feed, $owner_uid]);
-                    $row = $ssth->fetch();
+					$row = $ssth->fetch();
 
 					$feed_title = $row["title"];
 					$feed_site_url = $row["site_url"];
@@ -1899,9 +1899,9 @@ 
 	public static function getFeedCategory($feed) {
 		$pdo = Db::pdo();
 
-	    $sth = $pdo->prepare("SELECT cat_id FROM ttrss_feeds
+		$sth = $pdo->prepare("SELECT cat_id FROM ttrss_feeds
 				WHERE id = ?");
-	    $sth->execute([$feed]);
+		$sth->execute([$feed]);
 
 		if ($row = $sth->fetch()) {
 			return $row["cat_id"];
@@ -1911,20 +1911,20 @@ 
 
 	}
 
-    function color_of($name) {
-        $colormap = [ "#1cd7d7","#d91111","#1212d7","#8e16e5","#7b7b7b",
-            "#39f110","#0bbea6","#ec0e0e","#1534f2","#b9e416",
-            "#479af2","#f36b14","#10c7e9","#1e8fe7","#e22727" ];
+	function color_of($name) {
+		$colormap = [ "#1cd7d7","#d91111","#1212d7","#8e16e5","#7b7b7b",
+			"#39f110","#0bbea6","#ec0e0e","#1534f2","#b9e416",
+			"#479af2","#f36b14","#10c7e9","#1e8fe7","#e22727" ];
 
-        $sum = 0;
+		$sum = 0;
 
-        for ($i = 0; $i < strlen($name); $i++) {
-            $sum += ord($name[$i]);
-        }
+		for ($i = 0; $i < strlen($name); $i++) {
+			$sum += ord($name[$i]);
+		}
 
-        $sum %= count($colormap);
+		$sum %= count($colormap);
 
-        return $colormap[$sum];
+		return $colormap[$sum];
 	}
 
 	public static function get_feeds_from_html($url, $content) {

Braces +162 added lines, -85 removed lines

@@ -17,7 +17,9 @@ 
 			$feed_id, $is_cat, $search,
 			$error, $feed_last_updated) {
 
-		if ($is_cat) $cat_q = "&is_cat=$is_cat";
+		if ($is_cat) {
+			$cat_q = "&is_cat=$is_cat";
+		}
 
 		if ($search) {
 			$search_q = "&q=$search";
@@ -48,8 +50,9 @@ 
 			$reply .= strip_tags($feed_title);
 		}
 
-		if ($error)
-			$reply .= " <i title=\"" . htmlspecialchars($error) . "\" class='material-icons icon-error'>error</i>";
+		if ($error) {
+					$reply .= " <i title=\"" . htmlspecialchars($error) . "\" class='material-icons icon-error'>error</i>";
+		}
 
 		$reply .= "</span>";
 		$reply .= "<span id='feed_current_unread' style='display: none'></span>";
@@ -127,8 +130,12 @@ 
 		$rgba_cache = array();
 		$topmost_article_ids = array();
 
-		if (!$offset) $offset = 0;
-		if ($method == "undefined") $method = "";
+		if (!$offset) {
+			$offset = 0;
+		}
+		if ($method == "undefined") {
+			$method = "";
+		}
 
 		$method_split = explode(":", $method);
 
@@ -274,14 +281,17 @@ 
 					$label_cache = json_decode($label_cache, true);
 
 					if ($label_cache) {
-						if ($label_cache["no-labels"] == 1)
-							$labels = array();
-						else
-							$labels = $label_cache;
+						if ($label_cache["no-labels"] == 1) {
+													$labels = array();
+						} else {
+													$labels = $label_cache;
+						}
 					}
 				}
 
-				if (!is_array($labels)) $labels = Article::get_article_labels($id);
+				if (!is_array($labels)) {
+					$labels = Article::get_article_labels($id);
+				}
 
 				$labels_str = "<span class=\"HLLCTR-$id\">";
 				$labels_str .= Article::format_article_labels($labels);
@@ -293,7 +303,9 @@ 
 					array_push($topmost_article_ids, $id);
 				}
 
-				if (!$line["feed_title"]) $line["feed_title"] = "";
+				if (!$line["feed_title"]) {
+					$line["feed_title"] = "";
+				}
 
                 $line["buttons_left"] = "";
                 foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_LEFT_BUTTON) as $p) {
@@ -314,10 +326,11 @@ 
 
                 $line['content'] = DiskCache::rewriteUrls($line['content']);
 
-                if ($line['note'])
-                    $line['note'] = Article::format_article_note($id, $line['note']);
-                else
-                    $line['note'] = "";
+                if ($line['note']) {
+                                    $line['note'] = Article::format_article_note($id, $line['note']);
+                } else {
+                                    $line['note'] = "";
+                }
 
                 if (!get_pref("CDM_EXPANDED")) {
                     $line["cdm_excerpt"] = "<span class='collapse'>
@@ -350,10 +363,11 @@ 
 				$line['imported'] = T_sprintf("Imported at %s",
 					make_local_datetime($line["date_entered"], false));
 
-				if ($line["tag_cache"])
-					$tags = explode(",", $line["tag_cache"]);
-				else
-					$tags = false;
+				if ($line["tag_cache"]) {
+									$tags = explode(",", $line["tag_cache"]);
+				} else {
+									$tags = false;
+				}
 
 				$line["tags_str"] = Article::format_tags_string($tags);
 
@@ -383,8 +397,9 @@ 
 				/* we don't need those */
 
                 foreach (["date_entered", "guid", "last_published", "last_marked", "tag_cache", "favicon_avg_color",
-                             "uuid", "label_cache", "yyiw"] as $k)
-                    unset($line[$k]);
+                             "uuid", "label_cache", "yyiw"] as $k) {
+                                    unset($line[$k]);
+                }
 
 				array_push($reply['content'], $line);
 			}
@@ -474,7 +489,9 @@ 
 		$order_by = $_REQUEST["order_by"];
 		$check_first_id = $_REQUEST["fid"];
 
-		if (is_numeric($feed)) $feed = (int) $feed;
+		if (is_numeric($feed)) {
+			$feed = (int) $feed;
+		}
 
 		/* Feed -5 is a special case: it is used to display auxiliary information
 		 * when there's nothing to load - e.g. no stuff in fresh feed */
@@ -562,10 +579,11 @@ 
 		$disable_cache = $ret[3];
 		$reply['headlines'] = $ret[4];
 
-		if (!$next_unread_feed)
-			$reply['headlines']['id'] = $feed;
-		else
-			$reply['headlines']['id'] = $next_unread_feed;
+		if (!$next_unread_feed) {
+					$reply['headlines']['id'] = $feed;
+		} else {
+					$reply['headlines']['id'] = $next_unread_feed;
+		}
 
 		$reply['headlines']['is_cat'] = (bool) $cat_view;
 
@@ -851,7 +869,9 @@ 
 
 	public static function catchup_feed($feed, $cat_view, $owner_uid = false, $mode = 'all', $search = false) {
 
-		if (!$owner_uid) $owner_uid = $_SESSION['uid'];
+		if (!$owner_uid) {
+			$owner_uid = $_SESSION['uid'];
+		}
 
 		$pdo = Db::pdo();
 
@@ -1026,7 +1046,9 @@ 
 
 		$pdo = Db::pdo();
 
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+		if (!$owner_uid) {
+			$owner_uid = $_SESSION["uid"];
+		}
 
 		if ($unread_only) {
 			$unread_qpart = "unread = true";
@@ -1142,7 +1164,9 @@ 
 
 		$url = Feeds::fix_url($url);
 
-		if (!$url || !Feeds::validate_feed_url($url)) return array("code" => 2);
+		if (!$url || !Feeds::validate_feed_url($url)) {
+			return array("code" => 2);
+		}
 
 		$contents = @fetch_file_contents($url, false, $auth_login, $auth_pass);
 
@@ -1170,7 +1194,9 @@ 
 			$url = key($feedUrls);
 		}
 
-		if (!$cat_id) $cat_id = null;
+		if (!$cat_id) {
+			$cat_id = null;
+		}
 
 		$sth = $pdo->prepare("SELECT id FROM ttrss_feeds
 			WHERE feed_url = ? AND owner_uid = ?");
@@ -1287,13 +1313,17 @@ 
 
 	public static function getCategoryUnread($cat, $owner_uid = false) {
 
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+		if (!$owner_uid) {
+			$owner_uid = $_SESSION["uid"];
+		}
 
 		$pdo = Db::pdo();
 
 		if ($cat >= 0) {
 
-		    if (!$cat) $cat = null;
+		    if (!$cat) {
+		    	$cat = null;
+		    }
 
 			$sth = $pdo->prepare("SELECT id FROM ttrss_feeds
                     WHERE (cat_id = :cat OR (:cat IS NULL AND cat_id IS NULL))
@@ -1306,7 +1336,9 @@ 
 				array_push($cat_feeds, "feed_id = " . (int)$line["id"]);
 			}
 
-			if (count($cat_feeds) == 0) return 0;
+			if (count($cat_feeds) == 0) {
+				return 0;
+			}
 
 			$match_part = implode(" OR ", $cat_feeds);
 
@@ -1341,7 +1373,9 @@ 
 
 	// only accepts real cats (>= 0)
 	public static function getCategoryChildrenUnread($cat, $owner_uid = false) {
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+		if (!$owner_uid) {
+			$owner_uid = $_SESSION["uid"];
+		}
 
 		$pdo = Db::pdo();
 
@@ -1361,7 +1395,9 @@ 
 
 	public static function getGlobalUnread($user_id = false) {
 
-		if (!$user_id) $user_id = $_SESSION["uid"];
+		if (!$user_id) {
+			$user_id = $_SESSION["uid"];
+		}
 
 		$pdo = Db::pdo();
 
@@ -1396,7 +1432,9 @@ 
 	}
 
 	public static function getLabelUnread($label_id, $owner_uid = false) {
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+		if (!$owner_uid) {
+			$owner_uid = $_SESSION["uid"];
+		}
 
 		$pdo = Db::pdo();
 
@@ -1491,8 +1529,9 @@ 
 
 				$unread = getFeedUnread($feed, $cat_view);
 
-				if ($cat_view && $feed > 0 && $include_children)
-					$unread += Feeds::getCategoryChildrenUnread($feed);
+				if ($cat_view && $feed > 0 && $include_children) {
+									$unread += Feeds::getCategoryChildrenUnread($feed);
+				}
 
 				if ($unread > 0) {
 					$view_query_part = " unread = true AND ";
@@ -1604,7 +1643,9 @@ 
 			$allow_archived = true;
 			$ignore_vfeed_group = true;
 
-			if (!$override_order) $override_order = "last_read DESC";
+			if (!$override_order) {
+				$override_order = "last_read DESC";
+			}
 
 		} else if ($feed == -3) { // fresh virtual feed
 			$query_strategy_part = "unread = true AND score >= 0";
@@ -1715,13 +1756,16 @@ 
 						LEFT JOIN ttrss_feeds ON (feed_id = ttrss_feeds.id)";
 			}
 
-			if ($vfeed_query_part) $vfeed_query_part .= "favicon_avg_color,";
+			if ($vfeed_query_part) {
+				$vfeed_query_part .= "favicon_avg_color,";
+			}
 
 			$first_id = 0;
 			$first_id_query_strategy_part = $query_strategy_part;
 
-			if ($feed == -3)
-				$first_id_query_strategy_part = "true";
+			if ($feed == -3) {
+							$first_id_query_strategy_part = "true";
+			}
 
 			if (DB_TYPE == "pgsql") {
 				$sanity_interval_qpart = "date_entered >= NOW() - INTERVAL '1 hour' AND";
@@ -1853,7 +1897,9 @@ 
 							$query_strategy_part ORDER BY $order_by
 							$limit_query_part $offset_query_part";
 
-			if ($_REQUEST["debug"]) print $query;
+			if ($_REQUEST["debug"]) {
+				print $query;
+			}
 
 			$res = $pdo->query($query);
 		}
@@ -2003,18 +2049,23 @@ 
 			}
 		}
 
-		if ($url != "http:///")
-			return $url;
-		else
-			return '';
+		if ($url != "http:///") {
+					return $url;
+		} else {
+					return '';
+		}
 	}
 
 	public static function add_feed_category($feed_cat, $parent_cat_id = false, $order_id = 0) {
 
-		if (!$feed_cat) return false;
+		if (!$feed_cat) {
+			return false;
+		}
 
 		$feed_cat = mb_substr($feed_cat, 0, 250);
-		if (!$parent_cat_id) $parent_cat_id = null;
+		if (!$parent_cat_id) {
+			$parent_cat_id = null;
+		}
 
 		$pdo = Db::pdo();
 		$tr_in_progress = false;
@@ -2036,7 +2087,9 @@ 
 					VALUES (?, ?, ?, ?)");
 			$sth->execute([$_SESSION['uid'], $feed_cat, $parent_cat_id, (int)$order_id]);
 
-			if (!$tr_in_progress) $pdo->commit();
+			if (!$tr_in_progress) {
+				$pdo->commit();
+			}
 
 			return true;
 		}
@@ -2048,7 +2101,9 @@ 
 
 	public static function get_feed_access_key($feed_id, $is_cat, $owner_uid = false) {
 
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+		if (!$owner_uid) {
+			$owner_uid = $_SESSION["uid"];
+		}
 
 		$is_cat = bool_to_sql_bool($is_cat);
 
@@ -2086,7 +2141,9 @@ 
 	 */
 	public static function purge_feed($feed_id, $purge_interval) {
 
-		if (!$purge_interval) $purge_interval = Feeds::feed_purge_interval($feed_id);
+		if (!$purge_interval) {
+			$purge_interval = Feeds::feed_purge_interval($feed_id);
+		}
 
 		$pdo = Db::pdo();
 
@@ -2106,7 +2163,9 @@ 
 			return;
 		}
 
-		if (!$owner_uid) return;
+		if (!$owner_uid) {
+			return;
+		}
 
 		if (FORCE_ARTICLE_PURGE == 0) {
 			$purge_unread = get_pref("PURGE_UNREAD_ARTICLES",
@@ -2116,10 +2175,11 @@ 
 			$purge_interval = FORCE_ARTICLE_PURGE;
 		}
 
-		if (!$purge_unread)
-			$query_limit = " unread = false AND ";
-		else
-			$query_limit = "";
+		if (!$purge_unread) {
+					$query_limit = " unread = false AND ";
+		} else {
+					$query_limit = "";
+		}
 
 		$purge_interval = (int) $purge_interval;
 
@@ -2166,8 +2226,10 @@ 
 			$purge_interval = $row["purge_interval"];
 			$owner_uid = $row["owner_uid"];
 
-			if ($purge_interval == 0) $purge_interval = get_pref(
+			if ($purge_interval == 0) {
+				$purge_interval = get_pref(
 				'PURGE_OLD_DAYS', $owner_uid);
+			}
 
 			return $purge_interval;
 
@@ -2185,10 +2247,11 @@ 
 
 		$pdo = Db::pdo();
 
-		if ($search_language)
-			$search_language = $pdo->quote(mb_strtolower($search_language));
-		else
-			$search_language = $pdo->quote("english");
+		if ($search_language) {
+					$search_language = $pdo->quote(mb_strtolower($search_language));
+		} else {
+					$search_language = $pdo->quote("english");
+		}
 
 		foreach ($keywords as $k) {
 			if (strpos($k, "-") === 0) {
@@ -2223,56 +2286,68 @@ 
 					break;
 				case "note":
 					if ($commandpair[1]) {
-						if ($commandpair[1] == "true")
-							array_push($query_keywords, "($not (note IS NOT NULL AND note != ''))");
-						else if ($commandpair[1] == "false")
-							array_push($query_keywords, "($not (note IS NULL OR note = ''))");
-						else
-							array_push($query_keywords, "($not (LOWER(note) LIKE ".
+						if ($commandpair[1] == "true") {
+													array_push($query_keywords, "($not (note IS NOT NULL AND note != ''))");
+						} else if ($commandpair[1] == "false") {
+													array_push($query_keywords, "($not (note IS NULL OR note = ''))");
+						} else {
+													array_push($query_keywords, "($not (LOWER(note) LIKE ".
 								$pdo->quote('%' . mb_strtolower($commandpair[1]) . '%')."))");
+						}
 					} else {
 						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						if (!$not) array_push($search_words, $k);
+						if (!$not) {
+							array_push($search_words, $k);
+						}
 					}
 					break;
 				case "star":
 
 					if ($commandpair[1]) {
-						if ($commandpair[1] == "true")
-							array_push($query_keywords, "($not (marked = true))");
-						else
-							array_push($query_keywords, "($not (marked = false))");
+						if ($commandpair[1] == "true") {
+													array_push($query_keywords, "($not (marked = true))");
+						} else {
+													array_push($query_keywords, "($not (marked = false))");
+						}
 					} else {
 						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						if (!$not) array_push($search_words, $k);
+						if (!$not) {
+							array_push($search_words, $k);
+						}
 					}
 					break;
 				case "pub":
 					if ($commandpair[1]) {
-						if ($commandpair[1] == "true")
-							array_push($query_keywords, "($not (published = true))");
-						else
-							array_push($query_keywords, "($not (published = false))");
+						if ($commandpair[1] == "true") {
+													array_push($query_keywords, "($not (published = true))");
+						} else {
+													array_push($query_keywords, "($not (published = false))");
+						}
 
 					} else {
 						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						if (!$not) array_push($search_words, $k);
+						if (!$not) {
+							array_push($search_words, $k);
+						}
 					}
 					break;
 				case "unread":
 					if ($commandpair[1]) {
-						if ($commandpair[1] == "true")
-							array_push($query_keywords, "($not (unread = true))");
-						else
-							array_push($query_keywords, "($not (unread = false))");
+						if ($commandpair[1] == "true") {
+													array_push($query_keywords, "($not (unread = true))");
+						} else {
+													array_push($query_keywords, "($not (unread = false))");
+						}
 
 					} else {
 						array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-						if (!$not) array_push($search_words, $k);
+						if (!$not) {
+							array_push($search_words, $k);
+						}
 					}
 					break;
 				default:
@@ -2295,7 +2370,9 @@ 
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
 						}
 
-						if (!$not) array_push($search_words, $k);
+						if (!$not) {
+							array_push($search_words, $k);
+						}
 					}
 			}
 		}

classes/pref/feeds.php

Indentation +2 added lines, -2 removed lines

@@ -1568,8 +1568,8 @@
 	public static function remove_feed($id, $owner_uid) {
 		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_UNSUBSCRIBE_FEED) as $p) {
 			if (! $p->hook_unsubscribe_feed($id, $owner_uid)) {
-                user_error("Feed $id (owner: $owner_uid) not removed due to plugin error (HOOK_UNSUBSCRIBE_FEED).", E_USER_WARNING);
-                return;
+				user_error("Feed $id (owner: $owner_uid) not removed due to plugin error (HOOK_UNSUBSCRIBE_FEED).", E_USER_WARNING);
+				return;
 			}
 		}
 

Braces +40 added lines, -26 removed lines

@@ -42,10 +42,11 @@ 
 
 	private function get_category_items($cat_id) {
 
-		if (clean($_REQUEST['mode']) != 2)
-			$search = $_SESSION["prefs_feed_search"];
-		else
-			$search = "";
+		if (clean($_REQUEST['mode']) != 2) {
+					$search = $_SESSION["prefs_feed_search"];
+		} else {
+					$search = "";
+		}
 
 		// first one is set by API
 		$show_empty_cats = clean($_REQUEST['force_show_empty']) ||
@@ -76,8 +77,9 @@ 
 			$num_children = $this->calculate_children_count($cat);
 			$cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
 
-			if ($num_children > 0 || $show_empty_cats)
-				array_push($items, $cat);
+			if ($num_children > 0 || $show_empty_cats) {
+							array_push($items, $cat);
+			}
 
 		}
 
@@ -117,10 +119,11 @@ 
 
 	public function makefeedtree() {
 
-		if (clean($_REQUEST['mode']) != 2)
-			$search = $_SESSION["prefs_feed_search"];
-		else
-			$search = "";
+		if (clean($_REQUEST['mode']) != 2) {
+					$search = $_SESSION["prefs_feed_search"];
+		} else {
+					$search = "";
+		}
 
 		$root = array();
 		$root['id'] = 'root';
@@ -231,8 +234,9 @@ 
 				$num_children = $this->calculate_children_count($cat);
 				$cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
 
-				if ($num_children > 0 || $show_empty_cats)
-					array_push($root['items'], $cat);
+				if ($num_children > 0 || $show_empty_cats) {
+									array_push($root['items'], $cat);
+				}
 
 				$root['param'] += count($cat['items']);
 			}
@@ -279,8 +283,9 @@ 
 
 			$cat['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', count($cat['items'])), count($cat['items']));
 
-			if (count($cat['items']) > 0 || $show_empty_cats)
-				array_push($root['items'], $cat);
+			if (count($cat['items']) > 0 || $show_empty_cats) {
+							array_push($root['items'], $cat);
+			}
 
 			$num_children = $this->calculate_children_count($root);
 			$root['param'] = vsprintf(_ngettext('(%d feed)', '(%d feeds)', (int) $num_children), $num_children);
@@ -343,8 +348,9 @@ 
 	private function process_category_order(&$data_map, $item_id, $parent_id = false, $nest_level = 0) {
 
 		$prefix = "";
-		for ($i = 0; $i < $nest_level; $i++)
-			$prefix .= "   ";
+		for ($i = 0; $i < $nest_level; $i++) {
+					$prefix .= "   ";
+		}
 
 		Debug::log("$prefix C: $item_id P: $parent_id");
 
@@ -409,8 +415,9 @@ 
 		#file_put_contents("/tmp/saveorder.json", clean($_POST['payload']));
 		#$data = json_decode(file_get_contents("/tmp/saveorder.json"), true);
 
-		if (!is_array($data['items']))
-			$data['items'] = json_decode($data['items'], true);
+		if (!is_array($data['items'])) {
+					$data['items'] = json_decode($data['items'], true);
+		}
 
 #		print_r($data['items']);
 
@@ -494,7 +501,9 @@ 
 			}
 		}
 
-		if (is_file($icon_file)) @unlink($icon_file);
+		if (is_file($icon_file)) {
+			@unlink($icon_file);
+		}
 
 		print $rc;
 		return;
@@ -590,8 +599,9 @@ 
 			if (DB_TYPE == "pgsql") {
 				$feed_language = $row["feed_language"];
 
-				if (!$feed_language)
-					$feed_language = get_pref('DEFAULT_SEARCH_LANGUAGE');
+				if (!$feed_language) {
+									$feed_language = get_pref('DEFAULT_SEARCH_LANGUAGE');
+				}
 
 				print "<fieldset>";
 
@@ -1404,11 +1414,13 @@ 
 		$obj = array();
 		$feed_id = (int) $feed_id;
 
-		if (!$title)
-			$title = Feeds::getFeedTitle($feed_id, false);
+		if (!$title) {
+					$title = Feeds::getFeedTitle($feed_id, false);
+		}
 
-		if ($unread === false)
-			$unread = getFeedUnread($feed_id, false);
+		if ($unread === false) {
+					$unread = getFeedUnread($feed_id, false);
+		}
 
 		$obj['id'] = 'FEED:' . $feed_id;
 		$obj['name'] = $title;
@@ -1738,7 +1750,9 @@ 
 
 
 	private function update_feed_access_key($feed_id, $is_cat, $owner_uid = false) {
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+		if (!$owner_uid) {
+			$owner_uid = $_SESSION["uid"];
+		}
 
 		// clear old value and generate new one
 		$sth = $this->pdo->prepare("DELETE FROM ttrss_access_keys

classes/pref/prefs.php

Braces +28 added lines, -16 removed lines

@@ -160,7 +160,9 @@ 
 		$boolean_prefs = explode(",", clean($_POST["boolean_prefs"]));
 
 		foreach ($boolean_prefs as $pref) {
-			if (!isset($_POST[$pref])) $_POST[$pref] = 'false';
+			if (!isset($_POST[$pref])) {
+				$_POST[$pref] = 'false';
+			}
 		}
 
 		$need_reload = false;
@@ -180,11 +182,15 @@ 
 					}
 					break;
 				case 'USER_LANGUAGE':
-					if (!$need_reload) $need_reload = $_SESSION["language"] != $value;
+					if (!$need_reload) {
+						$need_reload = $_SESSION["language"] != $value;
+					}
 					break;
 
 				case 'USER_CSS_THEME':
-					if (!$need_reload) $need_reload = get_pref($pref_name) != $value;
+					if (!$need_reload) {
+						$need_reload = get_pref($pref_name) != $value;
+					}
 					break;
 			}
 
@@ -616,8 +622,9 @@ 
 			$pref_name = $line["pref_name"];
 			$short_desc = $this->getShortDesc($pref_name);
 
-			if (!$short_desc)
-				continue;
+			if (!$short_desc) {
+							continue;
+			}
 
 			$prefs_available[$pref_name] = [
 				'type_name' => $line["type_name"],
@@ -669,7 +676,9 @@ 
 						$themes = array_filter($themes, "theme_exists");
 						asort($themes);
 
-						if (!theme_exists($value)) $value = "default.php";
+						if (!theme_exists($value)) {
+							$value = "default.php";
+						}
 
 						print "<select name='$pref_name' id='$pref_name' dojoType='fox.form.Select'>";
 
@@ -728,14 +737,15 @@ 
 							$disabled = "";
 						}
 
-						if ($type_name == 'integer')
-							print "<input dojoType=\"dijit.form.NumberSpinner\"
+						if ($type_name == 'integer') {
+													print "<input dojoType=\"dijit.form.NumberSpinner\"
 								required='1' $disabled
 								name=\"$pref_name\" value=\"$value\">";
-						else
-							print "<input dojoType=\"dijit.form.TextBox\"
+						} else {
+													print "<input dojoType=\"dijit.form.TextBox\"
 								required='1' $regexp $disabled
 								name=\"$pref_name\" value=\"$value\">";
+						}
 
 					} else if ($pref_name == "SSL_CERT_SERIAL") {
 
@@ -770,8 +780,9 @@ 
 						print "<input dojoType=\"dijit.form.ValidationTextBox\" $regexp name=\"$pref_name\" value=\"$value\">";
 					}
 
-					if ($item['help_text'])
-						print "<div class='help-text text-muted'><label for='CB_$pref_name'>".$item['help_text']."</label></div>";
+					if ($item['help_text']) {
+											print "<div class='help-text text-muted'><label for='CB_$pref_name'>".$item['help_text']."</label></div>";
+					}
 
 					print "</fieldset>";
 				}
@@ -1108,10 +1119,11 @@ 
 	}
 
 	public function setplugins() {
-		if (is_array(clean($_REQUEST["plugins"])))
-			$plugins = join(",", clean($_REQUEST["plugins"]));
-		else
-			$plugins = "";
+		if (is_array(clean($_REQUEST["plugins"]))) {
+					$plugins = join(",", clean($_REQUEST["plugins"]));
+		} else {
+					$plugins = "";
+		}
 
 		set_pref("_ENABLED_PLUGINS", $plugins);
 	}

classes/pref/filters.php

Braces +52 added lines, -25 removed lines

@@ -21,8 +21,9 @@ 
 		#file_put_contents("/tmp/saveorder.json", clean($_POST['payload']));
 		#$data = json_decode(file_get_contents("/tmp/saveorder.json"), true);
 
-		if (!is_array($data['items']))
-			$data['items'] = json_decode($data['items'], true);
+		if (!is_array($data['items'])) {
+					$data['items'] = json_decode($data['items'], true);
+		}
 
 		$index = 0;
 
@@ -98,12 +99,16 @@ 
 			}
 		}
 
-		if (count($scope_qparts) == 0) $scope_qparts = ["true"];
+		if (count($scope_qparts) == 0) {
+			$scope_qparts = ["true"];
+		}
 
 		$glue = $filter['match_any_rule'] ? " OR " :  " AND ";
 		$scope_qpart = join($glue, $scope_qparts);
 
-		if (!$scope_qpart) $scope_qpart = "true";
+		if (!$scope_qpart) {
+			$scope_qpart = "true";
+		}
 
 		$rv = array();
 
@@ -161,7 +166,9 @@ 
 
 	public function testFilter() {
 
-		if (isset($_REQUEST["offset"])) return $this->testFilterDo();
+		if (isset($_REQUEST["offset"])) {
+			return $this->testFilterDo();
+		}
 
 		//print __("Articles matching this filter:");
 
@@ -206,10 +213,11 @@ 
                         $feed_id = (int)substr($feed_id, 4);
                         array_push($feeds_fmt, Feeds::getCategoryTitle($feed_id));
                     } else {
-                        if ($feed_id)
-                            array_push($feeds_fmt, Feeds::getFeedTitle((int)$feed_id));
-                        else
-                            array_push($feeds_fmt, __("All feeds"));
+                        if ($feed_id) {
+                                                    array_push($feeds_fmt, Feeds::getFeedTitle((int)$feed_id));
+                        } else {
+                                                    array_push($feeds_fmt, __("All feeds"));
+                        }
                     }
                 }
 
@@ -396,7 +404,9 @@ 
 				unset($line["cat_id"]);
 				unset($line["filter_id"]);
 				unset($line["id"]);
-				if (!$line["inverse"]) unset($line["inverse"]);
+				if (!$line["inverse"]) {
+					unset($line["inverse"]);
+				}
 				unset($line["match_on"]);
 
 				$data = htmlspecialchars(json_encode($line));
@@ -518,12 +528,16 @@ 
 	}
 
 	private function getRuleName($rule) {
-		if (!$rule) $rule = json_decode(clean($_REQUEST["rule"]), true);
+		if (!$rule) {
+			$rule = json_decode(clean($_REQUEST["rule"]), true);
+		}
 
 		$feeds = $rule["feed_id"];
 		$feeds_fmt = [];
 
-		if (!is_array($feeds)) $feeds = [$feeds];
+		if (!is_array($feeds)) {
+			$feeds = [$feeds];
+		}
 
 		foreach ($feeds as $feed_id) {
 
@@ -531,10 +545,11 @@ 
                 $feed_id = (int)substr($feed_id, 4);
                 array_push($feeds_fmt, Feeds::getCategoryTitle($feed_id));
             } else {
-                if ($feed_id)
-                    array_push($feeds_fmt, Feeds::getFeedTitle((int)$feed_id));
-                else
-                    array_push($feeds_fmt, __("All feeds"));
+                if ($feed_id) {
+                                    array_push($feeds_fmt, Feeds::getFeedTitle((int)$feed_id));
+                } else {
+                                    array_push($feeds_fmt, __("All feeds"));
+                }
             }
         }
 
@@ -573,8 +588,9 @@ 
 			$title = __($row["description"]);
 
 			if ($action["action_id"] == 4 || $action["action_id"] == 6 ||
-				$action["action_id"] == 7)
-				$title .= ": " . $action["action_param"];
+				$action["action_id"] == 7) {
+							$title .= ": " . $action["action_param"];
+			}
 
 			if ($action["action_id"] == 9) {
 				list ($pfclass, $pfaction) = explode(":", $action["action_param"]);
@@ -644,8 +660,12 @@ 
 		$sth = $this->pdo->prepare("DELETE FROM ttrss_filters2_actions WHERE filter_id = ?");
 		$sth->execute([$filter_id]);
 
-		if (!is_array(clean($_REQUEST["rule"]))) $_REQUEST["rule"] = [];
-		if (!is_array(clean($_REQUEST["action"]))) $_REQUEST["action"] = [];
+		if (!is_array(clean($_REQUEST["rule"]))) {
+			$_REQUEST["rule"] = [];
+		}
+		if (!is_array(clean($_REQUEST["action"]))) {
+			$_REQUEST["action"] = [];
+		}
 
 		if ($filter_id) {
 			/* create rules */
@@ -1137,7 +1157,9 @@ 
 			$match_any_rule = $row["match_any_rule"];
 			$inverse = $row["inverse"];
 
-			if (!$title) $title = __("[No caption]");
+			if (!$title) {
+				$title = __("[No caption]");
+			}
 
 			$title = sprintf(_ngettext("%s (%d rule)", "%s (%d rules)", (int) $num_rules), $title, $num_rules);
 
@@ -1153,11 +1175,16 @@ 
 				$num_actions -= 1;
 			}
 
-			if ($match_any_rule) $title .= " (" . __("matches any rule") . ")";
-			if ($inverse) $title .= " (" . __("inverse") . ")";
+			if ($match_any_rule) {
+				$title .= " (" . __("matches any rule") . ")";
+			}
+			if ($inverse) {
+				$title .= " (" . __("inverse") . ")";
+			}
 
-			if ($num_actions > 0)
-				$actions = sprintf(_ngettext("%s (+%d action)", "%s (+%d actions)", (int) $num_actions), $actions, $num_actions);
+			if ($num_actions > 0) {
+							$actions = sprintf(_ngettext("%s (+%d action)", "%s (+%d actions)", (int) $num_actions), $actions, $num_actions);
+			}
 
 			return [$title, $actions];
 		}

classes/pref/users.php

Braces +17 added lines, -10 removed lines

@@ -235,7 +235,10 @@ 
 			$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
 			$pwd_hash = encrypt_password($tmp_user_pwd, $salt, true);
 
-			if (!$login) return; // no blank usernames
+			if (!$login) {
+				return;
+			}
+			// no blank usernames
 
 			$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE
 				login = ?");
@@ -294,10 +297,11 @@ 
 
 				$message = T_sprintf("Changed password of user %s to %s", "<strong>$login</strong>", "<strong>$tmp_user_pwd</strong>");
 
-				if ($format_output)
-					print_notice($message);
-				else
-					print $message;
+				if ($format_output) {
+									print_notice($message);
+				} else {
+									print $message;
+				}
 
 			}
 		}
@@ -365,7 +369,9 @@ 
 			$sort = $this->validate_field($sort,
 				["login", "access_level", "created", "num_feeds", "created", "last_login"], "login");
 
-			if ($sort != "login") $sort = "$sort DESC";
+			if ($sort != "login") {
+				$sort = "$sort DESC";
+			}
 
 			$sth = $this->pdo->prepare("SELECT
 					tu.id,
@@ -437,10 +443,11 @@ 
 		}
 
 		public function validate_field($string, $allowed, $default = "") {
-			if (in_array($string, $allowed))
-				return $string;
-			else
-				return $default;
+			if (in_array($string, $allowed)) {
+							return $string;
+			} else {
+							return $default;
+			}
 		}
 
 }