codysnider / tt-rss

classes/db/mysqli.php

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
 
 			return $this->link;
 		} else {
-			print("Unable to connect to database (as $user to $host, database $db): " . mysqli_connect_error());
+			print("Unable to connect to database (as $user to $host, database $db): ".mysqli_connect_error());
 			exit(102);
 		}
 	}
@@ -31,7 +31,7 @@ 
 			$this->last_error = @mysqli_error($this->link);
 
 			@mysqli_query($this->link, "ROLLBACK");
-			user_error("Query $query failed: " . ($this->link ? $this->last_error : "No connection"),
+			user_error("Query $query failed: ".($this->link ? $this->last_error : "No connection"),
 				$die_on_error ? E_USER_ERROR : E_USER_WARNING);
 		}
 

Braces +8 added lines, -5 removed lines

@@ -4,10 +4,11 @@ 
 	private $last_error;
 
 	function connect($host, $user, $pass, $db, $port) {
-		if ($port)
-			$this->link = mysqli_connect($host, $user, $pass, $db, $port);
-		else
-			$this->link = mysqli_connect($host, $user, $pass, $db);
+		if ($port) {
+					$this->link = mysqli_connect($host, $user, $pass, $db, $port);
+		} else {
+					$this->link = mysqli_connect($host, $user, $pass, $db);
+		}
 
 		if ($this->link) {
 			$this->init();
@@ -20,7 +21,9 @@ 
 	}
 
 	function escape_string($s, $strip_tags = true) {
-		if ($strip_tags) $s = strip_tags($s);
+		if ($strip_tags) {
+			$s = strip_tags($s);
+		}
 
 		return mysqli_real_escape_string($this->link, $s);
 	}

classes/db/pgsql.php

Spacing +3 added lines, -3 removed lines

@@ -15,13 +15,13 @@ 
 		}
 
 		if (is_numeric($port) && $port > 0) {
-			$string = "$string port=" . $port;
+			$string = "$string port=".$port;
 		}
 
 		$this->link = pg_connect($string);
 
 		if (!$this->link) {
-			print("Unable to connect to database (as $user to $host, database $db):" . pg_last_error());
+			print("Unable to connect to database (as $user to $host, database $db):".pg_last_error());
 			exit(102);
 		}
 
@@ -44,7 +44,7 @@ 
 
 			@pg_query($this->link, "ROLLBACK");
 			$query = htmlspecialchars($query); // just in case
-			user_error("Query $query failed: " . ($this->link ? $this->last_error : "No connection"),
+			user_error("Query $query failed: ".($this->link ? $this->last_error : "No connection"),
 				$die_on_error ? E_USER_ERROR : E_USER_WARNING);
 		}
 		return $result;

Braces +3 added lines, -1 removed lines

@@ -31,7 +31,9 @@
 	}
 
 	function escape_string($s, $strip_tags = true) {
-		if ($strip_tags) $s = strip_tags($s);
+		if ($strip_tags) {
+			$s = strip_tags($s);
+		}
 
 		return pg_escape_string($s);
 	}

classes/api.php

Indentation +1 added lines, -1 removed lines

@@ -597,7 +597,7 @@
 								"title" => $line["title"],
 								"unread" => $unread,
 								"is_cat" => true,
-                                "order_id" => (int) $line["order_id"]
+								"order_id" => (int) $line["order_id"]
 							);
 						array_push($feeds, $row);
 					}

Switch Indentation +33 added lines, -33 removed lines

@@ -218,16 +218,16 @@ 
 
 			$override_order = false;
 			switch (clean($_REQUEST["order_by"])) {
-				case "title":
-					$override_order = "ttrss_entries.title, date_entered, updated";
-					break;
-				case "date_reverse":
-					$override_order = "score DESC, date_entered, updated";
-					$skip_first_id_check = true;
-					break;
-				case "feed_dates":
-					$override_order = "updated DESC";
-					break;
+			case "title":
+				$override_order = "ttrss_entries.title, date_entered, updated";
+				break;
+			case "date_reverse":
+				$override_order = "score DESC, date_entered, updated";
+				$skip_first_id_check = true;
+				break;
+			case "feed_dates":
+				$override_order = "updated DESC";
+				break;
 			}
 
 			/* do not rely on params below */
@@ -259,32 +259,32 @@ 
 		$set_to = "";
 
 		switch ($field_raw) {
-			case 0:
-				$field = "marked";
-				$additional_fields = ",last_marked = NOW()";
-				break;
-			case 1:
-				$field = "published";
-				$additional_fields = ",last_published = NOW()";
-				break;
-			case 2:
-				$field = "unread";
-				$additional_fields = ",last_read = NOW()";
-				break;
-			case 3:
-				$field = "note";
+		case 0:
+			$field = "marked";
+			$additional_fields = ",last_marked = NOW()";
+			break;
+		case 1:
+			$field = "published";
+			$additional_fields = ",last_published = NOW()";
+			break;
+		case 2:
+			$field = "unread";
+			$additional_fields = ",last_read = NOW()";
+			break;
+		case 3:
+			$field = "note";
 		};
 
 		switch ($mode) {
-			case 1:
-				$set_to = "true";
-				break;
-			case 0:
-				$set_to = "false";
-				break;
-			case 2:
-				$set_to = "NOT $field";
-				break;
+		case 1:
+			$set_to = "true";
+			break;
+		case 0:
+			$set_to = "false";
+			break;
+		case 2:
+			$set_to = "NOT $field";
+			break;
 		}
 
 		if ($field == "note") $set_to = $this->pdo->quote($data);

Spacing +21 added lines, -22 removed lines

@@ -74,11 +74,11 @@ 
 		}
 
 		if (get_pref("ENABLE_API_ACCESS", $uid)) {
-			if (authenticate_user($login, $password, false,  Auth_Base::AUTH_SERVICE_API)) {               // try login with normal password
+			if (authenticate_user($login, $password, false, Auth_Base::AUTH_SERVICE_API)) {               // try login with normal password
 				$this->wrap(self::STATUS_OK, array("session_id" => session_id(),
 					"api_level" => self::API_LEVEL));
 			} else if (authenticate_user($login, $password_base64, false, Auth_Base::AUTH_SERVICE_API)) { // else try with base64_decoded password
-				$this->wrap(self::STATUS_OK,	array("session_id" => session_id(),
+				$this->wrap(self::STATUS_OK, array("session_id" => session_id(),
 					"api_level" => self::API_LEVEL));
 			} else {                                                         // else we are not logged in
 				user_error("Failed login attempt for $login from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING);
@@ -169,7 +169,7 @@ 
 			}
 		}
 
-		foreach (array(-2,-1,0) as $cat_id) {
+		foreach (array(-2, -1, 0) as $cat_id) {
 			if ($include_empty || !$this->isCategoryEmpty($cat_id)) {
 				$unread = getFeedUnread($cat_id, true);
 
@@ -190,11 +190,11 @@ 
 
 			if (is_numeric($feed_id)) $feed_id = (int) $feed_id;
 
-			$limit = (int)clean($_REQUEST["limit"]);
+			$limit = (int) clean($_REQUEST["limit"]);
 
 			if (!$limit || $limit >= 200) $limit = 200;
 
-			$offset = (int)clean($_REQUEST["skip"]);
+			$offset = (int) clean($_REQUEST["skip"]);
 			$filter = clean($_REQUEST["filter"]);
 			$is_cat = API::param_to_bool(clean($_REQUEST["is_cat"]));
 			$show_excerpt = API::param_to_bool(clean($_REQUEST["show_excerpt"]));
@@ -202,14 +202,14 @@ 
 			/* all_articles, unread, adaptive, marked, updated */
 			$view_mode = clean($_REQUEST["view_mode"]);
 			$include_attachments = API::param_to_bool(clean($_REQUEST["include_attachments"]));
-			$since_id = (int)clean($_REQUEST["since_id"]);
+			$since_id = (int) clean($_REQUEST["since_id"]);
 			$include_nested = API::param_to_bool(clean($_REQUEST["include_nested"]));
 			$sanitize_content = !isset($_REQUEST["sanitize"]) ||
 				API::param_to_bool($_REQUEST["sanitize"]);
 			$force_update = API::param_to_bool(clean($_REQUEST["force_update"]));
 			$has_sandbox = API::param_to_bool(clean($_REQUEST["has_sandbox"]));
-			$excerpt_length = (int)clean($_REQUEST["excerpt_length"]);
-			$check_first_id = (int)clean($_REQUEST["check_first_id"]);
+			$excerpt_length = (int) clean($_REQUEST["excerpt_length"]);
+			$check_first_id = (int) clean($_REQUEST["check_first_id"]);
 			$include_header = API::param_to_bool(clean($_REQUEST["include_header"]));
 
 			$_SESSION['hasSandbox'] = $has_sandbox;
@@ -253,7 +253,7 @@ 
 		$article_ids = explode(",", clean($_REQUEST["article_ids"]));
 		$mode = (int) clean($_REQUEST["mode"]);
 		$data = clean($_REQUEST["data"]);
-		$field_raw = (int)clean($_REQUEST["field"]);
+		$field_raw = (int) clean($_REQUEST["field"]);
 
 		$field = "";
 		$set_to = "";
@@ -360,7 +360,7 @@ 
 					"updated" => (int) strtotime($line["updated"]),
 					"feed_id" => $line["feed_id"],
 					"attachments" => $attachments,
-					"score" => (int)$line["score"],
+					"score" => (int) $line["score"],
 					"feed_title" => $line["feed_title"],
 					"note" => $line["note"],
 					"lang" => $line["lang"]
@@ -434,7 +434,7 @@ 
 	}
 
 	function getLabels() {
-		$article_id = (int)clean($_REQUEST['article_id']);
+		$article_id = (int) clean($_REQUEST['article_id']);
 
 		$rv = array();
 
@@ -459,7 +459,7 @@ 
 			}
 
 			array_push($rv, array(
-				"id" => (int)Labels::label_to_feed_id($line['id']),
+				"id" => (int) Labels::label_to_feed_id($line['id']),
 				"caption" => $line['caption'],
 				"fg_color" => $line['fg_color'],
 				"bg_color" => $line['bg_color'],
@@ -644,10 +644,10 @@ 
 					$row = array(
 							"feed_url" => $line["feed_url"],
 							"title" => $line["title"],
-							"id" => (int)$line["id"],
-							"unread" => (int)$unread,
+							"id" => (int) $line["id"],
+							"unread" => (int) $unread,
 							"has_icon" => $has_icon,
-							"cat_id" => (int)$line["cat_id"],
+							"cat_id" => (int) $line["cat_id"],
 							"last_updated" => (int) strtotime($line["last_updated"]),
 							"order_id" => (int) $line["order_id"],
 						);
@@ -748,12 +748,12 @@ 
 					if (!is_array($labels)) $labels = Article::get_article_labels($line["id"]);
 
 					$headline_row = array(
-						"id" => (int)$line["id"],
+						"id" => (int) $line["id"],
 						"guid" => $line["guid"],
 						"unread" => API::param_to_bool($line["unread"]),
 						"marked" => API::param_to_bool($line["marked"]),
 						"published" => API::param_to_bool($line["published"]),
-						"updated" => (int)strtotime($line["updated"]),
+						"updated" => (int) strtotime($line["updated"]),
 						"is_updated" => $is_updated,
 						"title" => $line["title"],
 						"link" => $line["link"],
@@ -786,17 +786,16 @@ 
 
 					$headline_row["labels"] = $labels;
 
-					$headline_row["feed_title"] = $line["feed_title"] ? $line["feed_title"] :
-						$feed_title;
+					$headline_row["feed_title"] = $line["feed_title"] ? $line["feed_title"] : $feed_title;
 
-					$headline_row["comments_count"] = (int)$line["num_comments"];
+					$headline_row["comments_count"] = (int) $line["num_comments"];
 					$headline_row["comments_link"] = $line["comments"];
 
 					$headline_row["always_display_attachments"] = API::param_to_bool($line["always_display_enclosures"]);
 
 					$headline_row["author"] = $line["author"];
 
-					$headline_row["score"] = (int)$line["score"];
+					$headline_row["score"] = (int) $line["score"];
 					$headline_row["note"] = $line["note"];
 					$headline_row["lang"] = $line["lang"];
 
@@ -858,7 +857,7 @@ 
 		$_REQUEST['mode'] = 2;
 		$_REQUEST['force_show_empty'] = $include_empty;
 
-		if ($pf){
+		if ($pf) {
 			$data = $pf->makefeedtree();
 			$this->wrap(self::STATUS_OK, array("categories" => $data));
 		} else {

Braces +47 added lines, -28 removed lines

@@ -57,7 +57,9 @@ 
 		$password = clean($_REQUEST["password"]);
 		$password_base64 = base64_decode(clean($_REQUEST["password"]));
 
-		if (SINGLE_USER_MODE) $login = "admin";
+		if (SINGLE_USER_MODE) {
+			$login = "admin";
+		}
 
 		$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE login = ?");
 		$sth->execute([$login]);
@@ -134,10 +136,11 @@ 
 
 		// TODO do not return empty categories, return Uncategorized and standard virtual cats
 
-		if ($enable_nested)
-			$nested_qpart = "parent_cat IS NULL";
-		else
-			$nested_qpart = "true";
+		if ($enable_nested) {
+					$nested_qpart = "parent_cat IS NULL";
+		} else {
+					$nested_qpart = "true";
+		}
 
 		$sth = $this->pdo->prepare("SELECT
 				id, title, order_id, (SELECT COUNT(id) FROM
@@ -156,8 +159,9 @@ 
 			if ($include_empty || $line["num_feeds"] > 0 || $line["num_cats"] > 0) {
 				$unread = getFeedUnread($line["id"], true);
 
-				if ($enable_nested)
-					$unread += Feeds::getCategoryChildrenUnread($line["id"]);
+				if ($enable_nested) {
+									$unread += Feeds::getCategoryChildrenUnread($line["id"]);
+				}
 
 				if ($unread || !$unread_only) {
 					array_push($cats, array("id" => $line["id"],
@@ -188,11 +192,15 @@ 
 		$feed_id = clean($_REQUEST["feed_id"]);
 		if ($feed_id !== "") {
 
-			if (is_numeric($feed_id)) $feed_id = (int) $feed_id;
+			if (is_numeric($feed_id)) {
+				$feed_id = (int) $feed_id;
+			}
 
 			$limit = (int)clean($_REQUEST["limit"]);
 
-			if (!$limit || $limit >= 200) $limit = 200;
+			if (!$limit || $limit >= 200) {
+				$limit = 200;
+			}
 
 			$offset = (int)clean($_REQUEST["skip"]);
 			$filter = clean($_REQUEST["filter"]);
@@ -287,7 +295,9 @@ 
 				break;
 		}
 
-		if ($field == "note") $set_to = $this->pdo->quote($data);
+		if ($field == "note") {
+			$set_to = $this->pdo->quote($data);
+		}
 
 		if ($field && $set_to && count($article_ids) > 0) {
 
@@ -443,10 +453,11 @@ 
 			WHERE owner_uid = ? ORDER BY caption");
 		$sth->execute([$_SESSION['uid']]);
 
-		if ($article_id)
-			$article_labels = Article::get_article_labels($article_id);
-		else
-			$article_labels = array();
+		if ($article_id) {
+					$article_labels = Article::get_article_labels($article_id);
+		} else {
+					$article_labels = array();
+		}
 
 		while ($line = $sth->fetch()) {
 
@@ -483,10 +494,11 @@ 
 
 			foreach ($article_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"]);
+				}
 
 				++$num_updated;
 
@@ -738,14 +750,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($line["id"]);
+					if (!is_array($labels)) {
+						$labels = Article::get_article_labels($line["id"]);
+					}
 
 					$headline_row = array(
 						"id" => (int)$line["id"],
@@ -763,11 +778,13 @@ 
 
 					$enclosures = Article::get_article_enclosures($line['id']);
 
-					if ($include_attachments)
-						$headline_row['attachments'] = $enclosures;
+					if ($include_attachments) {
+											$headline_row['attachments'] = $enclosures;
+					}
 
-					if ($show_excerpt)
-						$headline_row["excerpt"] = $line["content_preview"];
+					if ($show_excerpt) {
+											$headline_row["excerpt"] = $line["content_preview"];
+					}
 
 					if ($show_content) {
 
@@ -782,7 +799,9 @@ 
 					}
 
 					// unify label output to ease parsing
-					if ($labels["no-labels"] == 1) $labels = array();
+					if ($labels["no-labels"] == 1) {
+						$labels = array();
+					}
 
 					$headline_row["labels"] = $labels;
 

classes/backend.php

Switch Indentation +8 added lines, -8 removed lines

@@ -126,14 +126,14 @@
 										$tmp = '';
 										foreach (str_split($keys[$i]) as $c) {
 											switch ($c) {
-												case '*':
-													$tmp .= __('Shift') . '+';
-													break;
-												case '^':
-													$tmp .= __('Ctrl') . '+';
-													break;
-												default:
-													$tmp .= $c;
+											case '*':
+												$tmp .= __('Shift') . '+';
+												break;
+											case '^':
+												$tmp .= __('Ctrl') . '+';
+												break;
+											default:
+												$tmp .= $c;
 											}
 										}
 										$keys[$i] = $tmp;

Spacing +10 added lines, -10 removed lines

@@ -2,7 +2,7 @@ 
 class Backend extends Handler {
 	function loading() {
 		header("Content-type: text/html");
-		print __("Loading, please wait...") . " " .
+		print __("Loading, please wait...")." ".
 			"<img src='images/indicator_tiny.gif'>";
 	}
 
@@ -34,12 +34,12 @@ 
 
 		print "<ul class='panel panel-scrollable hotkeys-help' style='height : 300px'>";
 
-		print "<h2>" . __("Keyboard Shortcuts") . "</h2>";
+		print "<h2>".__("Keyboard Shortcuts")."</h2>";
 
 		foreach ($info as $section => $hotkeys) {
 
 			print "<li><hr></li>";
-			print "<li><h3>" . $section . "</h3></li>";
+			print "<li><h3>".$section."</h3></li>";
 
 			foreach ($hotkeys as $action => $description) {
 
@@ -47,7 +47,7 @@ 
 					foreach ($omap[$action] as $sequence) {
 						if (strpos($sequence, "|") !== FALSE) {
 							$sequence = substr($sequence,
-								strpos($sequence, "|")+1,
+								strpos($sequence, "|") + 1,
 								strlen($sequence));
 						} else {
 							$keys = explode(" ", $sequence);
@@ -58,10 +58,10 @@ 
 									foreach (str_split($keys[$i]) as $c) {
 										switch ($c) {
 										case '*':
-											$tmp .= __('Shift') . '+';
+											$tmp .= __('Shift').'+';
 											break;
 										case '^':
-											$tmp .= __('Ctrl') . '+';
+											$tmp .= __('Ctrl').'+';
 											break;
 										default:
 											$tmp .= $c;
@@ -107,7 +107,7 @@ 
 			foreach ($info as $section => $hotkeys) {
 
 				if ($cur_section) print "<li>&nbsp;</li>";
-				print "<li><h3>" . $section . "</h3></li>";
+				print "<li><h3>".$section."</h3></li>";
 				$cur_section = $section;
 
 				foreach ($hotkeys as $action => $description) {
@@ -116,7 +116,7 @@ 
 						foreach ($omap[$action] as $sequence) {
 							if (strpos($sequence, "|") !== FALSE) {
 								$sequence = substr($sequence,
-									strpos($sequence, "|")+1,
+									strpos($sequence, "|") + 1,
 									strlen($sequence));
 							} else {
 								$keys = explode(" ", $sequence);
@@ -127,10 +127,10 @@ 
 										foreach (str_split($keys[$i]) as $c) {
 											switch ($c) {
 												case '*':
-													$tmp .= __('Shift') . '+';
+													$tmp .= __('Shift').'+';
 													break;
 												case '^':
-													$tmp .= __('Ctrl') . '+';
+													$tmp .= __('Ctrl').'+';
 													break;
 												default:
 													$tmp .= $c;

Braces +9 added lines, -3 removed lines

@@ -27,7 +27,9 @@ 
 		$omap = array();
 
 		foreach ($imap[1] as $sequence => $action) {
-			if (!isset($omap[$action])) $omap[$action] = array();
+			if (!isset($omap[$action])) {
+				$omap[$action] = array();
+			}
 
 			array_push($omap[$action], $sequence);
 		}
@@ -96,7 +98,9 @@ 
 			$omap = array();
 
 			foreach ($imap[1] as $sequence => $action) {
-				if (!isset($omap[$action])) $omap[$action] = array();
+				if (!isset($omap[$action])) {
+					$omap[$action] = array();
+				}
 
 				array_push($omap[$action], $sequence);
 			}
@@ -106,7 +110,9 @@ 
 			$cur_section = "";
 			foreach ($info as $section => $hotkeys) {
 
-				if ($cur_section) print "<li>&nbsp;</li>";
+				if ($cur_section) {
+					print "<li>&nbsp;</li>";
+				}
 				print "<li><h3>" . $section . "</h3></li>";
 				$cur_section = $section;
 

classes/pref/system.php

Spacing +7 added lines, -7 removed lines

@@ -60,14 +60,14 @@ 
 					$line[$k] = htmlspecialchars($v);
 				}
 
-				print "<td class='errno'>" . Logger::$errornames[$line["errno"]] . " (" . $line["errno"] . ")</td>";
-				print "<td class='filename'>" . $line["filename"] . ":" . $line["lineno"] . "</td>";
-				print "<td class='errstr'>" . $line["errstr"] . "<hr/>" . nl2br($line["context"]) . "</td>";
-				print "<td class='login'>" . $line["login"] . "</td>";
+				print "<td class='errno'>".Logger::$errornames[$line["errno"]]." (".$line["errno"].")</td>";
+				print "<td class='filename'>".$line["filename"].":".$line["lineno"]."</td>";
+				print "<td class='errstr'>".$line["errstr"]."<hr/>".nl2br($line["context"])."</td>";
+				print "<td class='login'>".$line["login"]."</td>";
 
-				print "<td class='timestamp'>" .
+				print "<td class='timestamp'>".
 					make_local_datetime(
-					$line["created_at"], false) . "</td>";
+					$line["created_at"], false)."</td>";
 
 				print "</tr>";
 			}
@@ -90,7 +90,7 @@ 
 		ob_end_clean();
 
 		print "<div class='phpinfo'>";
-		print preg_replace( '%^.*<body>(.*)</body>.*$%ms','$1', $info);
+		print preg_replace('%^.*<body>(.*)</body>.*$%ms', '$1', $info);
 		print "</div>";
 
 		print "</div>";

classes/pref/prefs.php

Indentation +2 added lines, -2 removed lines

@@ -1060,8 +1060,8 @@
 		$authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
 
 		if ($authenticator &&
-                method_exists($authenticator, "check_password") &&
-                $authenticator->check_password($_SESSION["uid"], "password")) {
+				method_exists($authenticator, "check_password") &&
+				$authenticator->check_password($_SESSION["uid"], "password")) {
 
 			return true;
 		}

Switch Indentation +13 added lines, -13 removed lines

@@ -170,22 +170,22 @@
 			$value = $_POST[$pref_name];
 
 			switch ($pref_name) {
-				case 'DIGEST_PREFERRED_TIME':
-					if (get_pref('DIGEST_PREFERRED_TIME') != $value) {
+			case 'DIGEST_PREFERRED_TIME':
+				if (get_pref('DIGEST_PREFERRED_TIME') != $value) {
 
-						$sth = $this->pdo->prepare("UPDATE ttrss_users SET
+					$sth = $this->pdo->prepare("UPDATE ttrss_users SET
 						last_digest_sent = NULL WHERE id = ?");
-						$sth->execute([$_SESSION['uid']]);
+					$sth->execute([$_SESSION['uid']]);
 
-					}
-					break;
-				case 'USER_LANGUAGE':
-					if (!$need_reload) $need_reload = $_SESSION["language"] != $value;
-					break;
-
-				case 'USER_CSS_THEME':
-					if (!$need_reload) $need_reload = get_pref($pref_name) != $value;
-					break;
+				}
+				break;
+			case 'USER_LANGUAGE':
+				if (!$need_reload) $need_reload = $_SESSION["language"] != $value;
+				break;
+
+			case 'USER_CSS_THEME':
+				if (!$need_reload) $need_reload = get_pref($pref_name) != $value;
+				break;
 			}
 
 			set_pref($pref_name, $value);

Spacing +25 added lines, -25 removed lines

@@ -82,7 +82,7 @@ 
 			"ENABLE_API_ACCESS" => array(__("Enable API"), __("Allows accessing this account through the API")),
 			"ENABLE_FEED_CATS" => array(__("Enable categories")),
 			"FEEDS_SORT_BY_UNREAD" => array(__("Sort feeds by unread articles count"), ""),
-			"FRESH_ARTICLE_MAX_AGE" => array(__("Maximum age of fresh articles"), "<strong>" . __("hours") . "</strong>"),
+			"FRESH_ARTICLE_MAX_AGE" => array(__("Maximum age of fresh articles"), "<strong>".__("hours")."</strong>"),
 			"HIDE_READ_FEEDS" => array(__("Hide read feeds")),
 			"HIDE_READ_SHOWS_SPECIAL" => array(__("Always show special feeds"), __("While hiding read feeds")),
 			"LONG_DATE_FORMAT" => array(__("Long date format"), __("Syntax is identical to PHP <a href='http://php.net/manual/function.date.php'>date()</a> function.")),
@@ -403,7 +403,7 @@ 
 
 			if ($_SESSION["auth_module"] == "auth_internal") {
 
-				print "<div dojoType='dijit.layout.ContentPane' title=\"" . __('App passwords') . "\">";
+				print "<div dojoType='dijit.layout.ContentPane' title=\"".__('App passwords')."\">";
 
 				print_notice("You can create separate passwords for API clients. Using one is required if you enable OTP.");
 
@@ -415,11 +415,11 @@ 
 
 				print "<button style='float : left' class='alt-primary' dojoType='dijit.form.Button'
 					onclick=\"Helpers.AppPasswords.generate()\">" .
-					__('Generate new password') . "</button> ";
+					__('Generate new password')."</button> ";
 
 				print "<button style='float : left' class='alt-danger' dojoType='dijit.form.Button'
 					onclick=\"Helpers.AppPasswords.removeSelected()\">" .
-					__('Remove selected passwords') . "</button>";
+					__('Remove selected passwords')."</button>";
 
 				print "</div>"; # content pane
 			}
@@ -474,13 +474,13 @@ 
 					print_notice("You will need to generate app passwords for the API clients if you enable OTP.");
 
 					if (function_exists("imagecreatefromstring")) {
-						print "<h3>" . __("Scan the following code by the Authenticator application or copy the key manually") . "</h3>";
+						print "<h3>".__("Scan the following code by the Authenticator application or copy the key manually")."</h3>";
 
 						$csrf_token = $_SESSION["csrf_token"];
 						print "<img alt='otp qr-code' src='backend.php?op=pref-prefs&method=otpqrcode&csrf_token=$csrf_token'>";
 					} else {
 						print_error("PHP GD functions are required to generate QR codes.");
-						print "<h3>" . __("Use the following OTP key with a compatible Authenticator application") . "</h3>";
+						print "<h3>".__("Use the following OTP key with a compatible Authenticator application")."</h3>";
 					}
 
 					print "<form dojoType='dijit.form.Form' id='changeOtpForm'>";
@@ -647,7 +647,7 @@ 
 					print "<fieldset class='prefs'>";
 
 					print "<label for='CB_$pref_name'>";
-					print $item['short_desc'] . ":";
+					print $item['short_desc'].":";
 					print "</label>";
 
 					$value = $item['value'];
@@ -684,7 +684,7 @@ 
 						print "</select>";
 
 						print " <button dojoType=\"dijit.form.Button\" class='alt-info'
-							onclick=\"Helpers.customizeCSS()\">" . __('Customize') . "</button>";
+							onclick=\"Helpers.customizeCSS()\">" . __('Customize')."</button>";
 
 						print " <button dojoType='dijit.form.Button' onclick='window.open(\"https://tt-rss.org/wiki/Themes\")'>
 							<i class='material-icons'>open_in_new</i> ".__("More themes...")."</button>";
@@ -747,12 +747,12 @@ 
 						$has_serial = ($cert_serial) ? "false" : "true";
 
 						print "<button dojoType='dijit.form.Button' disabled='$has_serial'
-							onclick=\"dijit.byId('SSL_CERT_SERIAL').attr('value', '$cert_serial')\">" .
-							__('Register') . "</button>";
+							onclick=\"dijit.byId('SSL_CERT_SERIAL').attr('value', '$cert_serial')\">".
+							__('Register')."</button>";
 
 						print "<button dojoType='dijit.form.Button' class='alt-danger'
 							onclick=\"dijit.byId('SSL_CERT_SERIAL').attr('value', '')\">" .
-							__('Clear') . "</button>";
+							__('Clear')."</button>";
 
 						print "<button dojoType='dijit.form.Button' class='alt-info'
 							onclick='window.open(\"https://tt-rss.org/wiki/SSL%20Certificate%20Authentication\")'>
@@ -763,7 +763,7 @@ 
 							id=\"$pref_name\" regexp=\"[012]?\d:\d\d\" placeHolder=\"12:00\"
 							name=\"$pref_name\" value=\"$value\">";
 
-						$item['help_text'] .= ". " . T_sprintf("Current server time: %s", date("H:i"));
+						$item['help_text'] .= ". ".T_sprintf("Current server time: %s", date("H:i"));
 					} else {
 						$regexp = ($type_name == 'integer') ? 'regexp="^\d*$"' : '';
 
@@ -849,7 +849,7 @@ 
 			print_warning("Your PHP configuration has open_basedir restrictions enabled. Some plugins relying on CURL for functionality may not work correctly.");
 		}
 
-		$feed_handler_whitelist = [ "Af_Comics" ];
+		$feed_handler_whitelist = ["Af_Comics"];
 
 		$feed_handlers = array_merge(
 			PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FEED_FETCHED),
@@ -861,9 +861,9 @@ 
 
 		if (count($feed_handlers) > 0) {
 			print_error(
-				T_sprintf("The following plugins use per-feed content hooks. This may cause excessive data usage and origin server load resulting in a ban of your instance: <b>%s</b>" ,
+				T_sprintf("The following plugins use per-feed content hooks. This may cause excessive data usage and origin server load resulting in a ban of your instance: <b>%s</b>",
 					implode(", ", array_map(function($plugin) { return get_class($plugin); }, $feed_handlers))
-				) . " (<a href='https://tt-rss.org/wiki/FeedHandlerPlugins' target='_blank'>".__("More info...")."</a>)"
+				)." (<a href='https://tt-rss.org/wiki/FeedHandlerPlugins' target='_blank'>".__("More info...")."</a>)"
 			);
 		}
 
@@ -892,7 +892,7 @@ 
 					<label class='checkbox description text-muted' id='PLABEL-$name'>
 						<input disabled='1'
 							dojoType='dijit.form.CheckBox' $checked type='checkbox'>
-						".htmlspecialchars($about[1]). "</label>";
+						".htmlspecialchars($about[1])."</label>";
 
 					if (@$about[4]) {
 						print "<button dojoType='dijit.form.Button' class='alt-info'
@@ -1159,7 +1159,7 @@ 
 		print "<div dojoType='fox.Toolbar'>";
 
 		print "<div dojoType='fox.form.DropDownButton'>".
-				"<span>" . __('Select')."</span>";
+				"<span>".__('Select')."</span>";
 		print "<div dojoType='dijit.Menu' style='display: none'>";
 		print "<div onclick=\"Tables.select('pref-profiles-list', true)\"
 			dojoType='dijit.MenuItem'>".__('All')."</div>";
@@ -1197,7 +1197,7 @@ 
 			$is_active = "";
 		}
 
-		print "<td width='100%'><span>" . __("Default profile") . " $is_active</span></td>";
+		print "<td width='100%'><span>".__("Default profile")." $is_active</span></td>";
 
 		print "</tr>";
 
@@ -1219,7 +1219,7 @@ 
 
 			print "<td><span dojoType='dijit.InlineEditBox'
 				width='300px' autoSave='false'
-				profile-id='$profile_id'>" . $edit_title .
+				profile-id='$profile_id'>".$edit_title.
 				"<script type='dojo/method' event='onChange' args='item'>
 					var elem = this;
 					dojo.xhrPost({
@@ -1268,13 +1268,13 @@ 
 
 	private function appPasswordList() {
 		print "<div dojoType='fox.Toolbar'>";
-		print "<div dojoType='fox.form.DropDownButton'>" .
-			"<span>" . __('Select') . "</span>";
+		print "<div dojoType='fox.form.DropDownButton'>".
+			"<span>".__('Select')."</span>";
 		print "<div dojoType='dijit.Menu' style='display: none'>";
 		print "<div onclick=\"Tables.select('app-password-list', true)\"
-				dojoType=\"dijit.MenuItem\">" . __('All') . "</div>";
+				dojoType=\"dijit.MenuItem\">" . __('All')."</div>";
 		print "<div onclick=\"Tables.select('app-password-list', false)\"
-				dojoType=\"dijit.MenuItem\">" . __('None') . "</div>";
+				dojoType=\"dijit.MenuItem\">" . __('None')."</div>";
 		print "</div></div>";
 		print "</div>"; #toolbar
 
@@ -1299,7 +1299,7 @@ 
 
 			print "<td align='center'>
 						<input onclick='Tables.onRowChecked(this)' dojoType='dijit.form.CheckBox' type='checkbox'></td>";
-			print "<td>" . htmlspecialchars($row["title"]) . "</td>";
+			print "<td>".htmlspecialchars($row["title"])."</td>";
 
 			print "<td align='right' class='text-muted'>";
 			print make_local_datetime($row['created'], false);
@@ -1319,7 +1319,7 @@ 
 	private function encryptAppPassword($password) {
 		$salt = substr(bin2hex(get_random_bytes(24)), 0, 24);
 
-		return "SSHA-512:".hash('sha512', $salt . $password). ":$salt";
+		return "SSHA-512:".hash('sha512', $salt.$password).":$salt";
 	}
 
 	function deleteAppPassword() {

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>";
 				}
@@ -1113,10 +1124,11 @@ 
 	}
 
 	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/labels.php

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
 
 			print "</section>";
 
-			print "<header>" . __("Colors") . "</header>";
+			print "<header>".__("Colors")."</header>";
 			print "<section>";
 
 			print "<table>";
@@ -93,7 +93,7 @@ 
 
 		while ($line = $sth->fetch()) {
 			$label = array();
-			$label['id'] = 'LABEL:' . $line['id'];
+			$label['id'] = 'LABEL:'.$line['id'];
 			$label['bare_id'] = $line['id'];
 			$label['name'] = $line['caption'];
 			$label['fg_color'] = $line['fg_color'];
@@ -254,7 +254,7 @@ 
 		print "<div dojoType='fox.Toolbar'>";
 
 		print "<div dojoType='fox.form.DropDownButton'>".
-				"<span>" . __('Select')."</span>";
+				"<span>".__('Select')."</span>";
 		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 		print "<div onclick=\"dijit.byId('labelTree').model.setAllChecked(true)\"
 			dojoType=\"dijit.MenuItem\">".__('All')."</div>";

classes/pref/feeds.php

Indentation +2 added lines, -2 removed lines

@@ -1573,8 +1573,8 @@
 	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;
 			}
 		}
 

Switch Indentation +60 added lines, -60 removed lines

@@ -1066,70 +1066,70 @@
 				$qpart = "";
 
 				switch ($k) {
-					case "title":
-						$qpart = "title = " . $this->pdo->quote($feed_title);
-						break;
-
-					case "feed_url":
-						$qpart = "feed_url = " . $this->pdo->quote($feed_url);
-						break;
-
-					case "update_interval":
-						$qpart = "update_interval = " . $this->pdo->quote($upd_intl);
-						break;
-
-					case "purge_interval":
-						$qpart = "purge_interval =" . $this->pdo->quote($purge_intl);
-						break;
-
-					case "auth_login":
-						$qpart = "auth_login = " . $this->pdo->quote($auth_login);
-						break;
-
-					case "auth_pass":
-						$qpart = "auth_pass =" . $this->pdo->quote($auth_pass). ", auth_pass_encrypted = false";
-						break;
-
-					case "private":
-						$qpart = "private = " . $this->pdo->quote($private);
-						break;
-
-					case "include_in_digest":
-						$qpart = "include_in_digest = " . $this->pdo->quote($include_in_digest);
-						break;
-
-					case "always_display_enclosures":
-						$qpart = "always_display_enclosures = " . $this->pdo->quote($always_display_enclosures);
-						break;
-
-					case "mark_unread_on_update":
-						$qpart = "mark_unread_on_update = " . $this->pdo->quote($mark_unread_on_update);
-						break;
-
-					case "cache_images":
-						$qpart = "cache_images = " . $this->pdo->quote($cache_images);
-						break;
-
-					case "hide_images":
-						$qpart = "hide_images = " . $this->pdo->quote($hide_images);
-						break;
-
-					case "cat_id":
-						if (get_pref('ENABLE_FEED_CATS')) {
-							if ($cat_id) {
-								$qpart = "cat_id = " . $this->pdo->quote($cat_id);
-							} else {
-								$qpart = 'cat_id = NULL';
-							}
+				case "title":
+					$qpart = "title = " . $this->pdo->quote($feed_title);
+					break;
+
+				case "feed_url":
+					$qpart = "feed_url = " . $this->pdo->quote($feed_url);
+					break;
+
+				case "update_interval":
+					$qpart = "update_interval = " . $this->pdo->quote($upd_intl);
+					break;
+
+				case "purge_interval":
+					$qpart = "purge_interval =" . $this->pdo->quote($purge_intl);
+					break;
+
+				case "auth_login":
+					$qpart = "auth_login = " . $this->pdo->quote($auth_login);
+					break;
+
+				case "auth_pass":
+					$qpart = "auth_pass =" . $this->pdo->quote($auth_pass). ", auth_pass_encrypted = false";
+					break;
+
+				case "private":
+					$qpart = "private = " . $this->pdo->quote($private);
+					break;
+
+				case "include_in_digest":
+					$qpart = "include_in_digest = " . $this->pdo->quote($include_in_digest);
+					break;
+
+				case "always_display_enclosures":
+					$qpart = "always_display_enclosures = " . $this->pdo->quote($always_display_enclosures);
+					break;
+
+				case "mark_unread_on_update":
+					$qpart = "mark_unread_on_update = " . $this->pdo->quote($mark_unread_on_update);
+					break;
+
+				case "cache_images":
+					$qpart = "cache_images = " . $this->pdo->quote($cache_images);
+					break;
+
+				case "hide_images":
+					$qpart = "hide_images = " . $this->pdo->quote($hide_images);
+					break;
+
+				case "cat_id":
+					if (get_pref('ENABLE_FEED_CATS')) {
+						if ($cat_id) {
+							$qpart = "cat_id = " . $this->pdo->quote($cat_id);
 						} else {
-							$qpart = "";
+							$qpart = 'cat_id = NULL';
 						}
+					} else {
+						$qpart = "";
+					}
 
-						break;
+					break;
 
-					case "feed_language":
-						$qpart = "feed_language = " . $this->pdo->quote($feed_language);
-						break;
+				case "feed_language":
+					$qpart = "feed_language = " . $this->pdo->quote($feed_language);
+					break;
 
 				}
 

Spacing +81 added lines, -81 removed lines

@@ -60,8 +60,8 @@ 
 		while ($line = $sth->fetch()) {
 
 			$cat = array();
-			$cat['id'] = 'CAT:' . $line['id'];
-			$cat['bare_id'] = (int)$line['id'];
+			$cat['id'] = 'CAT:'.$line['id'];
+			$cat['bare_id'] = (int) $line['id'];
 			$cat['name'] = $line['title'];
 			$cat['items'] = array();
 			$cat['checkbox'] = false;
@@ -93,8 +93,8 @@ 
 
 		while ($feed_line = $fsth->fetch()) {
 			$feed = array();
-			$feed['id'] = 'FEED:' . $feed_line['id'];
-			$feed['bare_id'] = (int)$feed_line['id'];
+			$feed['id'] = 'FEED:'.$feed_line['id'];
+			$feed['bare_id'] = (int) $feed_line['id'];
 			$feed['auxcounter'] = -1;
 			$feed['name'] = $feed_line['title'];
 			$feed['checkbox'] = false;
@@ -103,7 +103,7 @@ 
 			$feed['icon'] = Feeds::getFeedIcon($feed_line['id']);
 			$feed['param'] = make_local_datetime(
 				$feed_line['last_updated'], true);
-			$feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
+			$feed['updates_disabled'] = (int) ($feed_line['update_interval'] < 0);
 
 			array_push($items, $feed);
 		}
@@ -151,8 +151,8 @@ 
 					$feed_id = PluginHost::pfeed_to_feed_id($feed['id']);
 
 					$item = array();
-					$item['id'] = 'FEED:' . $feed_id;
-					$item['bare_id'] = (int)$feed_id;
+					$item['id'] = 'FEED:'.$feed_id;
+					$item['bare_id'] = (int) $feed_id;
 					$item['auxcounter'] = -1;
 					$item['name'] = $feed['title'];
 					$item['checkbox'] = false;
@@ -216,8 +216,8 @@ 
 
 			while ($line = $sth->fetch()) {
 				$cat = array();
-				$cat['id'] = 'CAT:' . $line['id'];
-				$cat['bare_id'] = (int)$line['id'];
+				$cat['id'] = 'CAT:'.$line['id'];
+				$cat['bare_id'] = (int) $line['id'];
 				$cat['auxcounter'] = -1;
 				$cat['name'] = $line['title'];
 				$cat['items'] = array();
@@ -261,8 +261,8 @@ 
 
 			while ($feed_line = $fsth->fetch()) {
 				$feed = array();
-				$feed['id'] = 'FEED:' . $feed_line['id'];
-				$feed['bare_id'] = (int)$feed_line['id'];
+				$feed['id'] = 'FEED:'.$feed_line['id'];
+				$feed['bare_id'] = (int) $feed_line['id'];
 				$feed['auxcounter'] = -1;
 				$feed['name'] = $feed_line['title'];
 				$feed['checkbox'] = false;
@@ -272,7 +272,7 @@ 
 					$feed_line['last_updated'], true);
 				$feed['unread'] = -1;
 				$feed['type'] = 'feed';
-				$feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
+				$feed['updates_disabled'] = (int) ($feed_line['update_interval'] < 0);
 
 				array_push($cat['items'], $feed);
 			}
@@ -296,8 +296,8 @@ 
 
 			while ($feed_line = $fsth->fetch()) {
 				$feed = array();
-				$feed['id'] = 'FEED:' . $feed_line['id'];
-				$feed['bare_id'] = (int)$feed_line['id'];
+				$feed['id'] = 'FEED:'.$feed_line['id'];
+				$feed['bare_id'] = (int) $feed_line['id'];
 				$feed['auxcounter'] = -1;
 				$feed['name'] = $feed_line['title'];
 				$feed['checkbox'] = false;
@@ -307,7 +307,7 @@ 
 					$feed_line['last_updated'], true);
 				$feed['unread'] = -1;
 				$feed['type'] = 'feed';
-				$feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0);
+				$feed['updates_disabled'] = (int) ($feed_line['update_interval'] < 0);
 
 				array_push($root['items'], $feed);
 			}
@@ -348,11 +348,11 @@ 
 
 		Debug::log("$prefix C: $item_id P: $parent_id");
 
-		$bare_item_id = substr($item_id, strpos($item_id, ':')+1);
+		$bare_item_id = substr($item_id, strpos($item_id, ':') + 1);
 
 		if ($item_id != 'root') {
 			if ($parent_id && $parent_id != 'root') {
-				$parent_bare_id = substr($parent_id, strpos($parent_id, ':')+1);
+				$parent_bare_id = substr($parent_id, strpos($parent_id, ':') + 1);
 				$parent_qpart = $parent_bare_id;
 			} else {
 				$parent_qpart = null;
@@ -371,7 +371,7 @@ 
 		if ($cat && is_array($cat)) {
 			foreach ($cat as $item) {
 				$id = $item['_reference'];
-				$bare_id = substr($id, strpos($id, ':')+1);
+				$bare_id = substr($id, strpos($id, ':') + 1);
 
 				Debug::log("$prefix [$order_id] $id/$bare_id");
 
@@ -389,7 +389,7 @@ 
 
 					} else if (strpos($id, "CAT:") === 0) {
 						$this->process_category_order($data_map, $item['_reference'], $item_id,
-							$nest_level+1);
+							$nest_level + 1);
 
 						$sth = $this->pdo->prepare("UPDATE ttrss_feed_categories
 								SET order_id = ? WHERE id = ? AND
@@ -447,7 +447,7 @@ 
 		$sth->execute([$feed_id, $_SESSION['uid']]);
 
 		if ($row = $sth->fetch()) {
-			@unlink(ICONS_DIR . "/$feed_id.ico");
+			@unlink(ICONS_DIR."/$feed_id.ico");
 
 			$sth = $this->pdo->prepare("UPDATE ttrss_feeds SET favicon_avg_color = NULL
 				where id = ?");
@@ -459,7 +459,7 @@ 
 		header("Content-type: text/html");
 
 		if (is_uploaded_file($_FILES['icon_file']['tmp_name'])) {
-			$tmp_file = tempnam(CACHE_DIR . '/upload', 'icon');
+			$tmp_file = tempnam(CACHE_DIR.'/upload', 'icon');
 
 			$result = move_uploaded_file($_FILES['icon_file']['tmp_name'],
 				$tmp_file);
@@ -483,8 +483,8 @@ 
 				$sth->execute([$feed_id, $_SESSION['uid']]);
 
 				if ($row = $sth->fetch()) {
-					@unlink(ICONS_DIR . "/$feed_id.ico");
-					if (rename($icon_file, ICONS_DIR . "/$feed_id.ico")) {
+					@unlink(ICONS_DIR."/$feed_id.ico");
+					if (rename($icon_file, ICONS_DIR."/$feed_id.ico")) {
 
 						$sth = $this->pdo->prepare("UPDATE ttrss_feeds SET
 							favicon_avg_color = ''
@@ -545,7 +545,7 @@ 
 
 			print "<fieldset>";
 
-			print "<label>" . __('URL:') . "</label> ";
+			print "<label>".__('URL:')."</label> ";
 			print "<input dojoType='dijit.form.ValidationTextBox' required='1'
 				placeHolder=\"".__("Feed URL")."\"
 				regExp='^(http|https)://.*' style='width : 300px'
@@ -568,7 +568,7 @@ 
 
 				print "<fieldset>";
 
-				print "<label>" . __('Place in category:') . "</label> ";
+				print "<label>".__('Place in category:')."</label> ";
 
 				print_feed_cat_select("cat_id", $cat_id,
 					'dojoType="fox.form.Select"');
@@ -582,7 +582,7 @@ 
 
 			print "<fieldset>";
 
-			print "<label>" . __('Site URL:') . "</label> ";
+			print "<label>".__('Site URL:')."</label> ";
 			print "<input dojoType='dijit.form.ValidationTextBox' required='1'
 				placeHolder=\"".__("Site URL")."\"
 				regExp='^(http|https)://.*' style='width : 300px'
@@ -600,7 +600,7 @@ 
 
 				print "<fieldset>";
 
-				print "<label>" . __('Language:') . "</label> ";
+				print "<label>".__('Language:')."</label> ";
 				print_select("feed_language", $feed_language, $this::get_ts_languages(),
 					'dojoType="fox.form.Select"');
 
@@ -631,10 +631,10 @@ 
 
 			print "<fieldset>";
 
-			print "<label>" . __('Article purging:') . "</label> ";
+			print "<label>".__('Article purging:')."</label> ";
 
 			print_select_hash("purge_interval", $purge_interval, $purge_intervals,
-				'dojoType="fox.form.Select" ' .
+				'dojoType="fox.form.Select" '.
 				((FORCE_ARTICLE_PURGE == 0) ? "" : 'disabled="1"'));
 
 			print "</fieldset>";
@@ -741,7 +741,7 @@ 
 			print "<fieldset class='narrow'>";
 
 			print "<label class='checkbox'><input dojoType='dijit.form.CheckBox' type='checkbox' id='cache_images'
-				name='cache_images' $checked> ". __('Cache media')."</label>";
+				name='cache_images' $checked> ".__('Cache media')."</label>";
 
 			print "</fieldset>";
 
@@ -823,7 +823,7 @@ 
 
 			print "<fieldset>";
 
-			print "<label>" . __('Place in category:') . "</label> ";
+			print "<label>".__('Place in category:')."</label> ";
 
 			print_feed_cat_select("cat_id", false,
 				'disabled="1" dojoType="fox.form.Select"');
@@ -838,7 +838,7 @@ 
 		if (DB_TYPE == "pgsql") {
 			print "<fieldset>";
 
-			print "<label>" . __('Language:') . "</label> ";
+			print "<label>".__('Language:')."</label> ";
 			print_select("feed_language", "", $this::get_ts_languages(),
 				'disabled="1" dojoType="fox.form.Select"');
 
@@ -871,7 +871,7 @@ 
 
 			print "<fieldset>";
 
-			print "<label>" . __('Article purging:') . "</label> ";
+			print "<label>".__('Article purging:')."</label> ";
 
 			print_select_hash("purge_interval", "", $purge_intervals,
 				'disabled="1" dojoType="fox.form.Select"');
@@ -1031,12 +1031,12 @@ 
 					":purge_intl" => $purge_intl,
 					":auth_login" => $auth_login,
 					":auth_pass" => $auth_pass,
-					":private" => (int)$private,
-					":cache_images" => (int)$cache_images,
-					":hide_images" => (int)$hide_images,
-					":include_in_digest" => (int)$include_in_digest,
-					":always_display_enclosures" => (int)$always_display_enclosures,
-					":mark_unread_on_update" => (int)$mark_unread_on_update,
+					":private" => (int) $private,
+					":cache_images" => (int) $cache_images,
+					":hide_images" => (int) $hide_images,
+					":include_in_digest" => (int) $include_in_digest,
+					":always_display_enclosures" => (int) $always_display_enclosures,
+					":mark_unread_on_update" => (int) $mark_unread_on_update,
 					":feed_language" => $feed_language,
 					":id" => $feed_id,
 					":uid" => $_SESSION['uid']]);
@@ -1067,57 +1067,57 @@ 
 
 				switch ($k) {
 					case "title":
-						$qpart = "title = " . $this->pdo->quote($feed_title);
+						$qpart = "title = ".$this->pdo->quote($feed_title);
 						break;
 
 					case "feed_url":
-						$qpart = "feed_url = " . $this->pdo->quote($feed_url);
+						$qpart = "feed_url = ".$this->pdo->quote($feed_url);
 						break;
 
 					case "update_interval":
-						$qpart = "update_interval = " . $this->pdo->quote($upd_intl);
+						$qpart = "update_interval = ".$this->pdo->quote($upd_intl);
 						break;
 
 					case "purge_interval":
-						$qpart = "purge_interval =" . $this->pdo->quote($purge_intl);
+						$qpart = "purge_interval =".$this->pdo->quote($purge_intl);
 						break;
 
 					case "auth_login":
-						$qpart = "auth_login = " . $this->pdo->quote($auth_login);
+						$qpart = "auth_login = ".$this->pdo->quote($auth_login);
 						break;
 
 					case "auth_pass":
-						$qpart = "auth_pass =" . $this->pdo->quote($auth_pass). ", auth_pass_encrypted = false";
+						$qpart = "auth_pass =".$this->pdo->quote($auth_pass).", auth_pass_encrypted = false";
 						break;
 
 					case "private":
-						$qpart = "private = " . $this->pdo->quote($private);
+						$qpart = "private = ".$this->pdo->quote($private);
 						break;
 
 					case "include_in_digest":
-						$qpart = "include_in_digest = " . $this->pdo->quote($include_in_digest);
+						$qpart = "include_in_digest = ".$this->pdo->quote($include_in_digest);
 						break;
 
 					case "always_display_enclosures":
-						$qpart = "always_display_enclosures = " . $this->pdo->quote($always_display_enclosures);
+						$qpart = "always_display_enclosures = ".$this->pdo->quote($always_display_enclosures);
 						break;
 
 					case "mark_unread_on_update":
-						$qpart = "mark_unread_on_update = " . $this->pdo->quote($mark_unread_on_update);
+						$qpart = "mark_unread_on_update = ".$this->pdo->quote($mark_unread_on_update);
 						break;
 
 					case "cache_images":
-						$qpart = "cache_images = " . $this->pdo->quote($cache_images);
+						$qpart = "cache_images = ".$this->pdo->quote($cache_images);
 						break;
 
 					case "hide_images":
-						$qpart = "hide_images = " . $this->pdo->quote($hide_images);
+						$qpart = "hide_images = ".$this->pdo->quote($hide_images);
 						break;
 
 					case "cat_id":
 						if (get_pref('ENABLE_FEED_CATS')) {
 							if ($cat_id) {
-								$qpart = "cat_id = " . $this->pdo->quote($cat_id);
+								$qpart = "cat_id = ".$this->pdo->quote($cat_id);
 							} else {
 								$qpart = 'cat_id = NULL';
 							}
@@ -1128,7 +1128,7 @@ 
 						break;
 
 					case "feed_language":
-						$qpart = "feed_language = " . $this->pdo->quote($feed_language);
+						$qpart = "feed_language = ".$this->pdo->quote($feed_language);
 						break;
 
 				}
@@ -1189,14 +1189,14 @@ 
 
 			$error_button = "<button dojoType=\"dijit.form.Button\"
 			  		onclick=\"CommonDialogs.showFeedsWithErrors()\" id=\"errorButton\">" .
-				__("Feeds with errors") . "</button>";
+				__("Feeds with errors")."</button>";
 		}
 
 		$inactive_button = "<button dojoType=\"dijit.form.Button\"
 				id=\"pref_feeds_inactive_btn\"
 				style=\"display : none\"
 				onclick=\"dijit.byId('feedTree').showInactiveFeeds()\">" .
-				__("Inactive feeds") . "</button>";
+				__("Inactive feeds")."</button>";
 
 		$feed_search = clean($_REQUEST["search"]);
 
@@ -1218,7 +1218,7 @@ 
 			</div>";
 
 		print "<div dojoType=\"fox.form.DropDownButton\">".
-				"<span>" . __('Select')."</span>";
+				"<span>".__('Select')."</span>";
 		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 		print "<div onclick=\"dijit.byId('feedTree').model.setAllChecked(true)\"
 			dojoType=\"dijit.MenuItem\">".__('All')."</div>";
@@ -1227,7 +1227,7 @@ 
 		print "</div></div>";
 
 		print "<div dojoType=\"fox.form.DropDownButton\">".
-				"<span>" . __('Feeds')."</span>";
+				"<span>".__('Feeds')."</span>";
 		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 		print "<div onclick=\"CommonDialogs.quickAddFeed()\"
 			dojoType=\"dijit.MenuItem\">".__('Subscribe to feed')."</div>";
@@ -1243,7 +1243,7 @@ 
 
 		if (get_pref('ENABLE_FEED_CATS')) {
 			print "<div dojoType=\"fox.form.DropDownButton\">".
-					"<span>" . __('Categories')."</span>";
+					"<span>".__('Categories')."</span>";
 			print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 			print "<div onclick=\"dijit.byId('feedTree').createCategory()\"
 				dojoType=\"dijit.MenuItem\">".__('Add category')."</div>";
@@ -1310,7 +1310,7 @@ 
 		print "<div dojoType='dijit.layout.AccordionPane' 
 			title='<i class=\"material-icons\">import_export</i> ".__('OPML')."'>";
 
-		print "<h3>" . __("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.") . "</h3>";
+		print "<h3>".__("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.")."</h3>";
 
 		print_notice("Only main settings profile can be migrated using OPML.");
 
@@ -1327,7 +1327,7 @@ 
 			<input type='hidden' name='op' value='dlg'>
 			<input type='hidden' name='method' value='importOpml'>
 			<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return Helpers.OPML.import();\" type=\"submit\">" .
-			__('Import OPML') . "</button>";
+			__('Import OPML')."</button>";
 
 		print "</form>";
 
@@ -1335,22 +1335,22 @@ 
 
 		print "<button dojoType='dijit.form.Button'
 			onclick='Helpers.OPML.export()' >" .
-			__('Export OPML') . "</button>";
+			__('Export OPML')."</button>";
 
 		print " <label class='checkbox'>";
 		print_checkbox("include_settings", true, "1", "");
-		print " " . __("Include settings");
+		print " ".__("Include settings");
 		print "</label>";
 
 		print "</form>";
 
 		print "<p/>";
 
-		print "<h2>" . __("Published OPML") . "</h2>";
+		print "<h2>".__("Published OPML")."</h2>";
 
-		print "<p>" . __('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.') .
-			" " .
-			__("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.") . "</p>";
+		print "<p>".__('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.').
+			" ".
+			__("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.")."</p>";
 
 		print "<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return App.displayDlg('".__("Public OPML URL")."','pubOPMLUrl')\">".
 			__('Display published OPML URL')."</button> ";
@@ -1363,10 +1363,10 @@ 
 		print "<div dojoType=\"dijit.layout.AccordionPane\" 
 			title=\"<i class='material-icons'>share</i> ".__('Published & shared articles / Generated feeds')."\">";
 
-		print "<h3>" . __('Published articles can be subscribed by anyone who knows the following URL:') . "</h3>";
+		print "<h3>".__('Published articles can be subscribed by anyone who knows the following URL:')."</h3>";
 
-		$rss_url = '-2::' . htmlspecialchars(get_self_url_prefix() .
-				"/public.php?op=rss&id=-2&view-mode=all_articles");;
+		$rss_url = '-2::'.htmlspecialchars(get_self_url_prefix().
+				"/public.php?op=rss&id=-2&view-mode=all_articles"); ;
 
 		print "<button dojoType='dijit.form.Button' class='alt-primary' onclick=\"return App.displayDlg('".__("Show as feed")."','generatedFeed', '$rss_url')\">".
 			__('Display URL')."</button> ";
@@ -1395,7 +1395,7 @@ 
 			$cat_unread = Feeds::getCategoryUnread($cat_id);
 		}
 
-		$obj['id'] = 'CAT:' . $cat_id;
+		$obj['id'] = 'CAT:'.$cat_id;
 		$obj['items'] = array();
 		$obj['name'] = Feeds::getCategoryTitle($cat_id);
 		$obj['type'] = 'category';
@@ -1415,7 +1415,7 @@ 
 		if ($unread === false)
 			$unread = getFeedUnread($feed_id, false);
 
-		$obj['id'] = 'FEED:' . $feed_id;
+		$obj['id'] = 'FEED:'.$feed_id;
 		$obj['name'] = $title;
 		$obj['unread'] = (int) $unread;
 		$obj['type'] = 'feed';
@@ -1451,7 +1451,7 @@ 
 
 		print "<div dojoType='fox.Toolbar'>";
 		print "<div dojoType='fox.form.DropDownButton'>".
-				"<span>" . __('Select')."</span>";
+				"<span>".__('Select')."</span>";
 		print "<div dojoType='dijit.Menu' style='display: none'>";
 		print "<div onclick=\"Tables.select('inactive-feeds-list', true)\"
 			dojoType='dijit.MenuItem'>".__('All')."</div>";
@@ -1508,7 +1508,7 @@ 
 
 		print "<div dojoType=\"fox.Toolbar\">";
 		print "<div dojoType=\"fox.form.DropDownButton\">".
-				"<span>" . __('Select')."</span>";
+				"<span>".__('Select')."</span>";
 		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 		print "<div onclick=\"Tables.select('error-feeds-list', true)\"
 			dojoType=\"dijit.MenuItem\">".__('All')."</div>";
@@ -1572,7 +1572,7 @@ 
 
 	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)) {
+			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;
 			}
@@ -1604,7 +1604,7 @@ 
 					$res = $pdo->query("SELECT MAX(id) AS id FROM ttrss_archived_feeds");
 					$row = $res->fetch();
 
-					$new_feed_id = (int)$row['id'] + 1;
+					$new_feed_id = (int) $row['id'] + 1;
 
 					$sth = $pdo->prepare("INSERT INTO ttrss_archived_feeds
 						(id, owner_uid, title, feed_url, site_url, created)
@@ -1636,8 +1636,8 @@ 
 
 			$pdo->commit();
 
-			if (file_exists(ICONS_DIR . "/$id.ico")) {
-				unlink(ICONS_DIR . "/$id.ico");
+			if (file_exists(ICONS_DIR."/$id.ico")) {
+				unlink(ICONS_DIR."/$id.ico");
 			}
 
 			CCache::remove($id, $owner_uid);
@@ -1661,7 +1661,7 @@ 
 
 		if (get_pref('ENABLE_FEED_CATS')) {
 			print "<fieldset>";
-			print "<label>" . __('Place in category:') . "</label> ";
+			print "<label>".__('Place in category:')."</label> ";
 			print_feed_cat_select("cat", false, 'dojoType="fox.form.Select"');
 			print "</fieldset>";
 		}
@@ -1670,7 +1670,7 @@ 
 
 		print "<div id='feedDlg_loginContainer' style='display : none'>";
 
-		print "<header>" . __("Authentication") . "</header>";
+		print "<header>".__("Authentication")."</header>";
 		print "<section>";
 
 		print "<input dojoType='dijit.form.TextBox' name='login' placeHolder=\"".__("Login")."\">
@@ -1789,12 +1789,12 @@ 
 		$sth->execute([$_SESSION['uid']]);
 
 		if ($row = $sth->fetch()) {
-			print (int)$row["num_inactive"];
+			print (int) $row["num_inactive"];
 		}
 	}
 
 	static function subscribe_to_feed_url() {
-		$url_path = get_self_url_prefix() .
+		$url_path = get_self_url_prefix().
 			"/public.php?op=subscribe&feed_url=%s";
 		return $url_path;
 	}

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 @@ 
 
 	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']);
 
@@ -499,7 +506,9 @@ 
 			}
 		}
 
-		if (is_file($icon_file)) @unlink($icon_file);
+		if (is_file($icon_file)) {
+			@unlink($icon_file);
+		}
 
 		print $rc;
 		return;
@@ -595,8 +604,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>";
 
@@ -1409,11 +1419,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;
@@ -1743,7 +1755,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/filters.php

Indentation +44 added lines, -44 removed lines

@@ -78,17 +78,17 @@ 
 				$scope_inner_qparts = [];
 				foreach ($rule["feed_id"] as $feed_id) {
 
-                    if (strpos($feed_id, "CAT:") === 0) {
-                        $cat_id = (int) substr($feed_id, 4);
-                        array_push($scope_inner_qparts, "cat_id = " . $this->pdo->quote($cat_id));
-                    } else if ($feed_id > 0) {
-                        array_push($scope_inner_qparts, "feed_id = " . $this->pdo->quote($feed_id));
-                    }
-                }
-
-                if (count($scope_inner_qparts) > 0) {
-				    array_push($scope_qparts, "(" . implode(" OR ", $scope_inner_qparts) . ")");
-                }
+					if (strpos($feed_id, "CAT:") === 0) {
+						$cat_id = (int) substr($feed_id, 4);
+						array_push($scope_inner_qparts, "cat_id = " . $this->pdo->quote($cat_id));
+					} else if ($feed_id > 0) {
+						array_push($scope_inner_qparts, "feed_id = " . $this->pdo->quote($feed_id));
+					}
+				}
+
+				if (count($scope_inner_qparts) > 0) {
+					array_push($scope_qparts, "(" . implode(" OR ", $scope_inner_qparts) . ")");
+				}
 
 				array_push($filter["rules"], $rule);
 
@@ -196,32 +196,32 @@ 
 
 		while ($line = $sth->fetch()) {
 
-		    if ($line["match_on"]) {
-		        $feeds = json_decode($line["match_on"], true);
-		        $feeds_fmt = [];
+			if ($line["match_on"]) {
+				$feeds = json_decode($line["match_on"], true);
+				$feeds_fmt = [];
 
-                foreach ($feeds as $feed_id) {
+				foreach ($feeds as $feed_id) {
 
-                    if (strpos($feed_id, "CAT:") === 0) {
-                        $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 (strpos($feed_id, "CAT:") === 0) {
+						$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"));
+					}
+				}
 
-                $where = implode(", ", $feeds_fmt);
+				$where = implode(", ", $feeds_fmt);
 
-            } else {
+			} else {
 
-                $where = $line["cat_filter"] ?
-                    Feeds::getCategoryTitle($line["cat_id"]) :
-                    ($line["feed_id"] ?
-                        Feeds::getFeedTitle($line["feed_id"]) : __("All feeds"));
-            }
+				$where = $line["cat_filter"] ?
+					Feeds::getCategoryTitle($line["cat_id"]) :
+					($line["feed_id"] ?
+						Feeds::getFeedTitle($line["feed_id"]) : __("All feeds"));
+			}
 
 #			$where = $line["cat_id"] . "/" . $line["feed_id"];
 
@@ -527,18 +527,18 @@ 
 
 		foreach ($feeds as $feed_id) {
 
-            if (strpos($feed_id, "CAT:") === 0) {
-                $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"));
-            }
-        }
-
-        $feed = implode(", ", $feeds_fmt);
+			if (strpos($feed_id, "CAT:") === 0) {
+				$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"));
+			}
+		}
+
+		$feed = implode(", ", $feeds_fmt);
 
 		$sth = $this->pdo->prepare("SELECT description FROM ttrss_filter_types
 			WHERE id = ?");

Spacing +42 added lines, -43 removed lines

@@ -80,14 +80,14 @@ 
 
                     if (strpos($feed_id, "CAT:") === 0) {
                         $cat_id = (int) substr($feed_id, 4);
-                        array_push($scope_inner_qparts, "cat_id = " . $this->pdo->quote($cat_id));
+                        array_push($scope_inner_qparts, "cat_id = ".$this->pdo->quote($cat_id));
                     } else if ($feed_id > 0) {
-                        array_push($scope_inner_qparts, "feed_id = " . $this->pdo->quote($feed_id));
+                        array_push($scope_inner_qparts, "feed_id = ".$this->pdo->quote($feed_id));
                     }
                 }
 
                 if (count($scope_inner_qparts) > 0) {
-				    array_push($scope_qparts, "(" . implode(" OR ", $scope_inner_qparts) . ")");
+				    array_push($scope_qparts, "(".implode(" OR ", $scope_inner_qparts).")");
                 }
 
 				array_push($filter["rules"], $rule);
@@ -100,7 +100,7 @@ 
 
 		if (count($scope_qparts) == 0) $scope_qparts = ["true"];
 
-		$glue = $filter['match_any_rule'] ? " OR " :  " AND ";
+		$glue = $filter['match_any_rule'] ? " OR " : " AND ";
 		$scope_qpart = join($glue, $scope_qparts);
 
 		if (!$scope_qpart) $scope_qpart = "true";
@@ -146,9 +146,9 @@ 
 
 				$content_preview = $line["content_preview"];
 
-				$tmp = "<li><span class='title'>" . $line["title"] . "</span><br/>" .
-					"<span class='feed'>" . $line['feed_title'] . "</span>, <span class='date'>" . mb_substr($line["date_entered"], 0, 16) . "</span>" .
-					"<div class='preview text-muted'>" . $content_preview . "</div>" .
+				$tmp = "<li><span class='title'>".$line["title"]."</span><br/>".
+					"<span class='feed'>".$line['feed_title']."</span>, <span class='date'>".mb_substr($line["date_entered"], 0, 16)."</span>".
+					"<div class='preview text-muted'>".$content_preview."</div>".
 					"</li>";
 
 				array_push($rv, $tmp);
@@ -203,11 +203,11 @@ 
                 foreach ($feeds as $feed_id) {
 
                     if (strpos($feed_id, "CAT:") === 0) {
-                        $feed_id = (int)substr($feed_id, 4);
+                        $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));
+                            array_push($feeds_fmt, Feeds::getFeedTitle((int) $feed_id));
                         else
                             array_push($feeds_fmt, __("All feeds"));
                     }
@@ -218,8 +218,7 @@ 
             } else {
 
                 $where = $line["cat_filter"] ?
-                    Feeds::getCategoryTitle($line["cat_id"]) :
-                    ($line["feed_id"] ?
+                    Feeds::getCategoryTitle($line["cat_id"]) : ($line["feed_id"] ?
                         Feeds::getFeedTitle($line["feed_id"]) : __("All feeds"));
             }
 
@@ -227,11 +226,11 @@ 
 
 			$inverse = $line["inverse"] ? "inverse" : "";
 
-			$rv .= "<li class='$inverse'>" . T_sprintf("%s on %s in %s %s",
+			$rv .= "<li class='$inverse'>".T_sprintf("%s on %s in %s %s",
 				htmlspecialchars($line["reg_exp"]),
 				$line["field"],
 				$where,
-				$line["inverse"] ? __("(inverse)") : "") . "</li>";
+				$line["inverse"] ? __("(inverse)") : "")."</li>";
 		}
 
 		return $rv;
@@ -294,12 +293,12 @@ 
 					//$fg_color = $label_row["fg_color"];
 					$bg_color = $label_row["bg_color"];
 
-					$name[1] = "<i class=\"material-icons\" style='color : $bg_color; margin-right : 4px'>label</i>" . $name[1];
+					$name[1] = "<i class=\"material-icons\" style='color : $bg_color; margin-right : 4px'>label</i>".$name[1];
 				}
 			}
 
 			$filter = array();
-			$filter['id'] = 'FILTER:' . $line['id'];
+			$filter['id'] = 'FILTER:'.$line['id'];
 			$filter['bare_id'] = $line['id'];
 			$filter['name'] = $name[0];
 			$filter['param'] = $name[1];
@@ -357,7 +356,7 @@ 
 			print "<div dojoType=\"fox.Toolbar\">";
 
 			print "<div dojoType=\"fox.form.DropDownButton\">".
-				"<span>" . __('Select')."</span>";
+				"<span>".__('Select')."</span>";
 			print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 			print "<div onclick=\"dijit.byId('filterEditDlg').selectRules(true)\"
 			dojoType=\"dijit.MenuItem\">".__('All')."</div>";
@@ -384,12 +383,12 @@ 
 					$line["feed_id"] = json_decode($line["match_on"], true);
 				} else {
 					if ($line["cat_filter"]) {
-						$feed_id = "CAT:" . (int)$line["cat_id"];
+						$feed_id = "CAT:".(int) $line["cat_id"];
 					} else {
-						$feed_id = (int)$line["feed_id"];
+						$feed_id = (int) $line["feed_id"];
 					}
 
-					$line["feed_id"] = ["" . $feed_id]; // set item type to string for in_array()
+					$line["feed_id"] = ["".$feed_id]; // set item type to string for in_array()
 				}
 
 				unset($line["cat_filter"]);
@@ -417,7 +416,7 @@ 
 			print "<div dojoType=\"fox.Toolbar\">";
 
 			print "<div dojoType=\"fox.form.DropDownButton\">".
-				"<span>" . __('Select')."</span>";
+				"<span>".__('Select')."</span>";
 			print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 			print "<div onclick=\"dijit.byId('filterEditDlg').selectActions(true)\"
 			dojoType=\"dijit.MenuItem\">".__('All')."</div>";
@@ -528,11 +527,11 @@ 
 		foreach ($feeds as $feed_id) {
 
             if (strpos($feed_id, "CAT:") === 0) {
-                $feed_id = (int)substr($feed_id, 4);
+                $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));
+                    array_push($feeds_fmt, Feeds::getFeedTitle((int) $feed_id));
                 else
                     array_push($feeds_fmt, __("All feeds"));
             }
@@ -542,7 +541,7 @@ 
 
 		$sth = $this->pdo->prepare("SELECT description FROM ttrss_filter_types
 			WHERE id = ?");
-		$sth->execute([(int)$rule["filter_type"]]);
+		$sth->execute([(int) $rule["filter_type"]]);
 
 		if ($row = $sth->fetch()) {
 			$filter_type = $row["description"];
@@ -552,9 +551,9 @@ 
 
 		$inverse = isset($rule["inverse"]) ? "inverse" : "";
 
-		return "<span class='filterRule $inverse'>" .
+		return "<span class='filterRule $inverse'>".
 			T_sprintf("%s on %s in %s %s", htmlspecialchars($rule["reg_exp"]),
-			$filter_type, $feed, isset($rule["inverse"]) ? __("(inverse)") : "") . "</span>";
+			$filter_type, $feed, isset($rule["inverse"]) ? __("(inverse)") : "")."</span>";
 	}
 
 	function printRuleName() {
@@ -564,7 +563,7 @@ 
 	private function getActionName($action) {
 		$sth = $this->pdo->prepare("SELECT description FROM
 			ttrss_filter_actions WHERE id = ?");
-		$sth->execute([(int)$action["action_id"]]);
+		$sth->execute([(int) $action["action_id"]]);
 
 		$title = "";
 
@@ -574,7 +573,7 @@ 
 
 			if ($action["action_id"] == 4 || $action["action_id"] == 6 ||
 				$action["action_id"] == 7)
-				$title .= ": " . $action["action_param"];
+				$title .= ": ".$action["action_param"];
 
 			if ($action["action_id"] == 9) {
 				list ($pfclass, $pfaction) = explode(":", $action["action_param"]);
@@ -584,7 +583,7 @@ 
 				foreach ($filter_actions as $fclass => $factions) {
 					foreach ($factions as $faction) {
 						if ($pfaction == $faction["action"] && $pfclass == $fclass) {
-							$title .= ": " . $fclass . ": " . $faction["description"];
+							$title .= ": ".$fclass.": ".$faction["description"];
 							break;
 						}
 					}
@@ -681,7 +680,7 @@ 
 					$reg_exp = trim($rule["reg_exp"]);
 					$inverse = isset($rule["inverse"]) ? 1 : 0;
 
-					$filter_type = (int)trim($rule["filter_type"]);
+					$filter_type = (int) trim($rule["filter_type"]);
 					$match_on = json_encode($rule["feed_id"]);
 
 					$rsth->execute([$filter_id, $reg_exp, $filter_type, $match_on, $inverse]);
@@ -695,7 +694,7 @@ 
 			foreach ($actions as $action) {
 				if ($action) {
 
-					$action_id = (int)$action["action_id"];
+					$action_id = (int) $action["action_id"];
 					$action_param = $action["action_param"];
 					$action_param_label = $action["action_param_label"];
 
@@ -704,7 +703,7 @@ 
 					}
 
 					if ($action_id == 6) {
-						$action_param = (int)str_replace("+", "", $action_param);
+						$action_param = (int) str_replace("+", "", $action_param);
 					}
 
 					$asth->execute([$filter_id, $action_id, $action_param]);
@@ -773,7 +772,7 @@ 
 			</div>";
 
 		print "<div dojoType=\"fox.form.DropDownButton\">".
-				"<span>" . __('Select')."</span>";
+				"<span>".__('Select')."</span>";
 		print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 		print "<div onclick=\"dijit.byId('filterTree').model.setAllChecked(true)\"
 			dojoType=\"dijit.MenuItem\">".__('All')."</div>";
@@ -859,7 +858,7 @@ 
 		print "<div dojoType='fox.Toolbar'>";
 
 		print "<div dojoType='fox.form.DropDownButton'>".
-				"<span>" . __('Select')."</span>";
+				"<span>".__('Select')."</span>";
 		print "<div dojoType='dijit.Menu' style='display: none'>";
 		print "<div onclick=\"dijit.byId('filterEditDlg').selectRules(true)\"
 			dojoType='dijit.MenuItem'>".__('All')."</div>";
@@ -888,7 +887,7 @@ 
 		print "<div dojoType='fox.Toolbar'>";
 
 		print "<div dojoType='fox.form.DropDownButton'>".
-				"<span>" . __('Select')."</span>";
+				"<span>".__('Select')."</span>";
 		print "<div dojoType='dijit.Menu' style='display: none'>";
 		print "<div onclick=\"dijit.byId('filterEditDlg').selectActions(true)\"
 			dojoType='dijit.MenuItem'>".__('All')."</div>";
@@ -992,10 +991,10 @@ 
 		print "</fieldset>";
 
 		print "<fieldset>";
-		print "<label style='display : inline'>".  __("on field") . "</label> ";
+		print "<label style='display : inline'>".__("on field")."</label> ";
 		print_select_hash("filter_type", $filter_type, $filter_types,
 			'dojoType="fox.form.Select"');
-		print "<label style='padding-left : 10px; display : inline'>" . __("in") . "</label> ";
+		print "<label style='padding-left : 10px; display : inline'>".__("in")."</label> ";
 
 		print "</fieldset>";
 
@@ -1031,7 +1030,7 @@ 
 
 		if ($action) {
 			$action_param = $action["action_param"];
-			$action_id = (int)$action["action_id"];
+			$action_id = (int) $action["action_id"];
 		} else {
 			$action_param = "";
 			$action_id = 0;
@@ -1062,8 +1061,8 @@ 
 		$param_hidden = ($action_id == 4 || $action_id == 6) ?
 			"" : "display : none";
 
-		$label_param_hidden = ($action_id == 7) ?	"" : "display : none";
-		$plugin_param_hidden = ($action_id == 9) ?	"" : "display : none";
+		$label_param_hidden = ($action_id == 7) ? "" : "display : none";
+		$plugin_param_hidden = ($action_id == 9) ? "" : "display : none";
 
 		print "<span id='filterDlg_paramBox' style=\"$param_box_hidden\">";
 		print " ";
@@ -1082,8 +1081,8 @@ 
 		foreach ($filter_actions as $fclass => $factions) {
 			foreach ($factions as $faction) {
 
-				$filter_action_hash[$fclass . ":" . $faction["action"]] =
-					$fclass . ": " . $faction["description"];
+				$filter_action_hash[$fclass.":".$faction["action"]] =
+					$fclass.": ".$faction["description"];
 			}
 		}
 
@@ -1153,8 +1152,8 @@ 
 				$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);

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 @@ 
 
 	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];
 		}