codysnider / tt-rss

include/autoload.php

Braces +6 added lines, -4 removed lines

@@ -5,8 +5,9 @@ 
 		$namespace = '';
 		$class_name = $class;
 
-		if (strpos($class, '\\') !== FALSE)
-			list ($namespace, $class_name) = explode('\\', $class, 2);
+		if (strpos($class, '\\') !== FALSE) {
+					list ($namespace, $class_name) = explode('\\', $class, 2);
+		}
 
 		$root_dir = dirname(__DIR__); // we're in tt-rss/include
 
@@ -20,7 +21,8 @@ 
 			$class_file = "$root_dir/classes/" . str_replace("_", "/", strtolower($class)) . ".php";
 		}
 
-		if (file_exists($class_file))
-			include $class_file;
+		if (file_exists($class_file)) {
+					include $class_file;
+		}
 
 	});

classes/db.php

Switch Indentation +8 added lines, -8 removed lines

@@ -24,14 +24,14 @@
 		$er = error_reporting(E_ALL);
 
 		switch (DB_TYPE) {
-			case "mysql":
-				$this->adapter = new Db_Mysqli();
-				break;
-			case "pgsql":
-				$this->adapter = new Db_Pgsql();
-				break;
-			default:
-				die("Unknown DB_TYPE: " . DB_TYPE);
+		case "mysql":
+			$this->adapter = new Db_Mysqli();
+			break;
+		case "pgsql":
+			$this->adapter = new Db_Pgsql();
+			break;
+		default:
+			die("Unknown DB_TYPE: " . DB_TYPE);
 		}
 
 		if (!$this->adapter) {

Braces +9 added lines, -6 removed lines

@@ -86,15 +86,17 @@ 
 	}
 
 	public static function instance() {
-		if (self::$instance == null)
-			self::$instance = new self();
+		if (self::$instance == null) {
+					self::$instance = new self();
+		}
 
 		return self::$instance;
 	}
 
 	public static function get() {
-		if (self::$instance == null)
-			self::$instance = new self();
+		if (self::$instance == null) {
+					self::$instance = new self();
+		}
 
 		if (!self::$instance->adapter) {
 			self::$instance->legacy_connect();
@@ -104,8 +106,9 @@ 
 	}
 
 	public static function pdo() {
-		if (self::$instance == null)
-			self::$instance = new self();
+		if (self::$instance == null) {
+					self::$instance = new self();
+		}
 
 		if (!self::$instance->pdo) {
 			self::$instance->pdo = self::$instance->pdo_connect();

classes/mailer.php

Braces +9 added lines, -6 removed lines

@@ -19,8 +19,9 @@ 
 		$from_combined = $from_name ? "$from_name <$from_address>" : $from_address;
 		$to_combined = $to_name ? "$to_name <$to_address>" : $to_address;
 
-		if (defined('_LOG_SENT_MAIL') && _LOG_SENT_MAIL)
-			Logger::get()->log("Sending mail from $from_combined to $to_combined [$subject]: $message");
+		if (defined('_LOG_SENT_MAIL') && _LOG_SENT_MAIL) {
+					Logger::get()->log("Sending mail from $from_combined to $to_combined [$subject]: $message");
+		}
 
 		// HOOK_SEND_MAIL plugin instructions:
 		// 1. return 1 or true if mail is handled
@@ -31,11 +32,13 @@ 
 		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_SEND_MAIL) as $p) {
 			$rc = $p->hook_send_mail($this, $params);
 
-			if ($rc == 1)
-				return $rc;
+			if ($rc == 1) {
+							return $rc;
+			}
 
-			if ($rc == -1)
-				return 0;
+			if ($rc == -1) {
+							return 0;
+			}
 		}
 
 		$headers = [ "From: $from_combined", "Content-Type: text/plain; charset=UTF-8" ];

classes/api.php

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

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;

Braces +6 added lines, -2 removed lines

@@ -30,7 +30,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);
 			}
@@ -40,7 +42,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/prefs.php

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

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

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

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

Switch Indentation +26 added lines, -26 removed lines

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

Braces +73 added lines, -46 removed lines

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

classes/feeditem/atom.php

Braces +8 added lines, -6 removed lines

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