codysnider / tt-rss

classes/pref/filters.php

Spacing +8 added lines, -9 removed lines

@@ -81,14 +81,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);
@@ -206,11 +206,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"));
 					}
@@ -221,8 +221,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"));
 			}
 
@@ -537,11 +536,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"));
 			}

Braces +28 added lines, -16 removed lines

@@ -99,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();
 
@@ -209,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"));
+						}
 					}
 				}
 
@@ -540,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"));
+				}
 			}
 		}
 
@@ -582,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"]);
@@ -1168,11 +1175,16 @@ 
 				$num_actions -= 1;
 			}
 
-			if ($match_any_rule) $title .= " (".__("matches any rule").")";
-			if ($inverse) $title .= " (".__("inverse").")";
+			if ($match_any_rule) {
+				$title .= " (".__("matches any rule").")";
+			}
+			if ($inverse) {
+				$title .= " (".__("inverse").")";
+			}
 
-			if ($num_actions > 0)
-				$actions = sprintf(_ngettext("%s (+%d action)", "%s (+%d actions)", (int) $num_actions), $actions, $num_actions);
+			if ($num_actions > 0) {
+							$actions = sprintf(_ngettext("%s (+%d action)", "%s (+%d actions)", (int) $num_actions), $actions, $num_actions);
+			}
 
 			return [$title, $actions];
 		}

classes/logger.php

Switch Indentation +8 added lines, -8 removed lines

@@ -52,14 +52,14 @@
 
 	public function __construct() {
 		switch (LOG_DESTINATION) {
-			case "sql":
-				$this->adapter = new Logger_SQL();
-				break;
-			case "syslog":
-				$this->adapter = new Logger_Syslog();
-				break;
-			default:
-				$this->adapter = false;
+		case "sql":
+			$this->adapter = new Logger_SQL();
+			break;
+		case "syslog":
+			$this->adapter = new Logger_Syslog();
+			break;
+		default:
+			$this->adapter = false;
 		}
 	}
 

classes/dlg.php

Spacing +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
 			$tags[$line["tag_name"]] = $line["count"];
 		}
 
-		if(count($tags) == 0 ){ return; }
+		if (count($tags) == 0) { return; }
 
 		ksort($tags);
 

classes/logger/sql.php

Braces +3 added lines, -2 removed lines

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

classes/backend.php

Spacing +3 added lines, -3 removed lines

@@ -45,7 +45,7 @@ 
 				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) {
@@ -65,10 +65,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;

classes/labels.php

Braces +6 added lines, -2 removed lines

@@ -176,12 +176,16 @@
 
 		}
 
-		if (!$tr_in_progress) $pdo->commit();
+		if (!$tr_in_progress) {
+			$pdo->commit();
+		}
 	}
 
 	public static function create($caption, $fg_color = '', $bg_color = '', $owner_uid = false) {
 
-		if (!$owner_uid) $owner_uid = $_SESSION['uid'];
+		if (!$owner_uid) {
+			$owner_uid = $_SESSION['uid'];
+		}
 
 		$pdo = Db::pdo();
 

classes/debug.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
 
 		$ts = strftime("%H:%M:%S", time());
 		if (function_exists('posix_getpid')) {
-			$ts = "$ts/" . posix_getpid();
+			$ts = "$ts/".posix_getpid();
 		}
 
 		if (Debug::$logfile) {
@@ -60,7 +60,7 @@ 
 
 					if (!$locked) {
 						fclose($fp);
-						user_error("Unable to lock debugging log file: " . Debug::$logfile, E_USER_WARNING);
+						user_error("Unable to lock debugging log file: ".Debug::$logfile, E_USER_WARNING);
 						return;
 					}
 				}
@@ -77,7 +77,7 @@ 
 					return;
 
 			} else {
-				user_error("Unable to open debugging log file: " . Debug::$logfile, E_USER_WARNING);
+				user_error("Unable to open debugging log file: ".Debug::$logfile, E_USER_WARNING);
 			}
 		}
 

Braces +6 added lines, -3 removed lines

@@ -36,7 +36,9 @@ 
 
 	public static function log($message, $level = 0) {
 
-		if (!Debug::$enabled || Debug::$loglevel < $level) return false;
+		if (!Debug::$enabled || Debug::$loglevel < $level) {
+			return false;
+		}
 
 		$ts = strftime("%H:%M:%S", time());
 		if (function_exists('posix_getpid')) {
@@ -73,8 +75,9 @@ 
 
 				fclose($fp);
 
-				if (Debug::$quiet)
-					return;
+				if (Debug::$quiet) {
+									return;
+				}
 
 			} else {
 				user_error("Unable to open debugging log file: " . Debug::$logfile, E_USER_WARNING);

classes/feeditem/common.php

Braces +3 added lines, -2 removed lines

@@ -186,8 +186,9 @@
 			$cat = clean(trim(mb_strtolower($srccat)));
 
 			// we don't support numeric tags
-			if (is_numeric($cat))
-				$cat = 't:'.$cat;
+			if (is_numeric($cat)) {
+							$cat = 't:'.$cat;
+			}
 
 			$cat = preg_replace('/[,\'\"]/', "", $cat);
 

classes/opml.php

Spacing +5 added lines, -5 removed lines

@@ -221,7 +221,7 @@ 
 						foreach (json_decode($tmp_line["match_on"], true) as $feed_id) {
 
 							if (strpos($feed_id, "CAT:") === 0) {
-								$feed_id = (int)substr($feed_id, 4);
+								$feed_id = (int) substr($feed_id, 4);
 								if ($feed_id) {
 									array_push($match, [Feeds::getCategoryTitle($feed_id), true, false]);
 								} else {
@@ -229,7 +229,7 @@ 
 								}
 							} else {
 								if ($feed_id) {
-									array_push($match, [Feeds::getFeedTitle((int)$feed_id), false, false]);
+									array_push($match, [Feeds::getFeedTitle((int) $feed_id), false, false]);
 								} else {
 									array_push($match, [0, false, true]);
 								}
@@ -429,7 +429,7 @@ 
 								list ($name, $is_cat, $is_id) = $match;
 
 								if ($is_id) {
-									array_push($match_on, ($is_cat ? "CAT:" : "") . $name);
+									array_push($match_on, ($is_cat ? "CAT:" : "").$name);
 								} else {
 
 									if (!$is_cat) {
@@ -458,7 +458,7 @@ 
 							}
 
 							$reg_exp = $rule["reg_exp"];
-							$filter_type = (int)$rule["filter_type"];
+							$filter_type = (int) $rule["filter_type"];
 							$inverse = bool_to_sql_bool($rule["inverse"]);
 							$match_on = json_encode($match_on);
 
@@ -492,7 +492,7 @@ 
 
 							$cat_filter = bool_to_sql_bool($rule["cat_filter"]);
 							$reg_exp = $rule["reg_exp"];
-							$filter_type = (int)$rule["filter_type"];
+							$filter_type = (int) $rule["filter_type"];
 							$inverse = bool_to_sql_bool($rule["inverse"]);
 
 							$usth = $this->pdo->prepare("INSERT INTO ttrss_filters2_rules