codysnider / tt-rss

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

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

Braces +6 added lines, -3 removed lines

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

classes/rssutils.php

Braces +73 added lines, -46 removed lines

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

classes/ccache.php

Braces +9 added lines, -5 removed lines

@@ -66,8 +66,9 @@ 
 
 		// "" (null) is valid and should be cast to 0 (uncategorized)
 		// everything else i.e. tags are not
-		if (!is_numeric($feed_id) && $feed_id)
-			return;
+		if (!is_numeric($feed_id) && $feed_id) {
+					return;
+		}
 
 		$feed_id = (int) $feed_id;
 
@@ -102,8 +103,9 @@ 
 
 		// "" (null) is valid and should be cast to 0 (uncategorized)
 		// everything else i.e. tags are not
-		if (!is_numeric($feed_id) && $feed_id)
-			return;
+		if (!is_numeric($feed_id) && $feed_id) {
+					return;
+		}
 
 		$feed_id = (int) $feed_id;
 
@@ -182,7 +184,9 @@ 
 			$sth->execute([$feed_id, $unread, $owner_uid]);
 		}
 
-		if (!$tr_in_progress) $pdo->commit();
+		if (!$tr_in_progress) {
+			$pdo->commit();
+		}
 
 		if ($feed_id > 0 && $prev_unread != $unread) {
 

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

classes/handler/public.php

Braces +24 added lines, -10 removed lines

@@ -12,7 +12,9 @@ 
 			"padding : 5px; border-style : dashed; border-color : #e7d796;".
 			"margin-bottom : 1em; color : #9a8c59;";
 
-		if (!$limit) $limit = 60;
+		if (!$limit) {
+			$limit = 60;
+		}
 
 		$date_sort_field = "date_entered DESC, updated DESC";
 
@@ -77,7 +79,9 @@ 
 			"/public.php?op=rss&id=$feed&key=" .
 			Feeds::get_feed_access_key($feed, false, $owner_uid);
 
-		if (!$feed_site_url) $feed_site_url = get_self_url_prefix();
+		if (!$feed_site_url) {
+			$feed_site_url = get_self_url_prefix();
+		}
 
 		if ($format == 'atom') {
 			$tpl = new MiniTemplator;
@@ -207,8 +211,12 @@ 
 				$article['content'] = sanitize($line["content"], false, $owner_uid, $feed_site_url, false, $line["id"]);
 				$article['updated'] = date('c', strtotime($line["updated"]));
 
-				if ($line['note']) $article['note'] = $line['note'];
-				if ($article['author']) $article['author'] = $line['author'];
+				if ($line['note']) {
+					$article['note'] = $line['note'];
+				}
+				if ($article['author']) {
+					$article['author'] = $line['author'];
+				}
 
 				$tags = Article::get_article_tags($line["id"], $owner_uid);
 
@@ -459,7 +467,9 @@ 
 		$format = clean($_REQUEST['format']);
 		$orig_guid = clean($_REQUEST["orig_guid"]);
 
-		if (!$format) $format = 'atom';
+		if (!$format) {
+			$format = 'atom';
+		}
 
 		if (SINGLE_USER_MODE) {
 			authenticate_user("admin", null);
@@ -472,8 +482,9 @@ 
 				ttrss_access_keys WHERE access_key = ? AND feed_id = ?");
 			$sth->execute([$key, $feed]);
 
-			if ($row = $sth->fetch())
-				$owner_id = $row["owner_uid"];
+			if ($row = $sth->fetch()) {
+							$owner_id = $row["owner_uid"];
+			}
 		}
 
 		if ($owner_id) {
@@ -683,8 +694,9 @@ 
 				// start an empty session to deliver login error message
 				@session_start();
 
-				if (!isset($_SESSION["login_error_msg"]))
-					$_SESSION["login_error_msg"] = __("Incorrect username or password");
+				if (!isset($_SESSION["login_error_msg"])) {
+									$_SESSION["login_error_msg"] = __("Incorrect username or password");
+				}
 
 				user_error("Failed login attempt for $login from {$_SERVER['REMOTE_ADDR']}", E_USER_WARNING);
 			}
@@ -1007,7 +1019,9 @@ 
 							"subject" => __("[tt-rss] Password reset request"),
 							"message" => $message]);
 
-						if (!$rc) print_error($mailer->error());
+						if (!$rc) {
+							print_error($mailer->error());
+						}
 
 						$resetpass_token_full = time() . ":" . $resetpass_token;
 

classes/feedparser.php

Braces +29 added lines, -17 removed lines

@@ -26,8 +26,10 @@ 
 		if ($error) {
 			foreach (libxml_get_errors() as $error) {
 				if ($error->level == LIBXML_ERR_FATAL) {
-					if(!isset($this->error)) //currently only the first error is reported
+					if(!isset($this->error)) {
+						//currently only the first error is reported
 						$this->error = $this->format_error($error);
+					}
 					$this->libxml_errors [] = $this->format_error($error);
 				}
 			}
@@ -81,8 +83,9 @@ 
 
 				$title = $xpath->query("//atom:feed/atom:title")->item(0);
 
-				if (!$title)
-					$title = $xpath->query("//atom03:feed/atom03:title")->item(0);
+				if (!$title) {
+									$title = $xpath->query("//atom03:feed/atom03:title")->item(0);
+				}
 
 
 				if ($title) {
@@ -91,14 +94,17 @@ 
 
 				$link = $xpath->query("//atom:feed/atom:link[not(@rel)]")->item(0);
 
-				if (!$link)
-					$link = $xpath->query("//atom:feed/atom:link[@rel='alternate']")->item(0);
+				if (!$link) {
+									$link = $xpath->query("//atom:feed/atom:link[@rel='alternate']")->item(0);
+				}
 
-				if (!$link)
-					$link = $xpath->query("//atom03:feed/atom03:link[not(@rel)]")->item(0);
+				if (!$link) {
+									$link = $xpath->query("//atom03:feed/atom03:link[not(@rel)]")->item(0);
+				}
 
-				if (!$link)
-					$link = $xpath->query("//atom03:feed/atom03:link[@rel='alternate']")->item(0);
+				if (!$link) {
+									$link = $xpath->query("//atom03:feed/atom03:link[@rel='alternate']")->item(0);
+				}
 
 				if ($link && $link->hasAttributes()) {
 					$this->link = $link->getAttribute("href");
@@ -106,8 +112,9 @@ 
 
 				$articles = $xpath->query("//atom:entry");
 
-				if (!$articles || $articles->length == 0)
-					$articles = $xpath->query("//atom03:entry");
+				if (!$articles || $articles->length == 0) {
+									$articles = $xpath->query("//atom03:entry");
+				}
 
 				foreach ($articles as $article) {
 					array_push($this->items, new FeedItem_Atom($article, $this->doc, $this->xpath));
@@ -124,10 +131,11 @@ 
 				$link = $xpath->query("//channel/link")->item(0);
 
 				if ($link) {
-					if ($link->getAttribute("href"))
-						$this->link = $link->getAttribute("href");
-					else if ($link->nodeValue)
-						$this->link = $link->nodeValue;
+					if ($link->getAttribute("href")) {
+											$this->link = $link->getAttribute("href");
+					} else if ($link->nodeValue) {
+											$this->link = $link->nodeValue;
+					}
 				}
 
 				$articles = $xpath->query("//channel/item");
@@ -162,8 +170,12 @@ 
 
 			}
 
-			if ($this->title) $this->title = trim($this->title);
-			if ($this->link) $this->link = trim($this->link);
+			if ($this->title) {
+				$this->title = trim($this->title);
+			}
+			if ($this->link) {
+				$this->link = trim($this->link);
+			}
 
 		} else {
 			if( !isset($this->error) ){

classes/counters.php

Braces +20 added lines, -14 removed lines

@@ -95,10 +95,11 @@ 
 
 			$count = getFeedUnread($i);
 
-			if ($i == 0 || $i == -1 || $i == -2)
-				$auxctr = Feeds::getFeedArticles($i, false);
-			else
-				$auxctr = 0;
+			if ($i == 0 || $i == -1 || $i == -2) {
+							$auxctr = Feeds::getFeedArticles($i, false);
+			} else {
+							$auxctr = 0;
+			}
 
 			$cv = array("id" => $i,
 				"counter" => (int) $count,
@@ -117,8 +118,9 @@ 
 				$cv = array("id" => PluginHost::pfeed_to_feed_id($feed['id']),
 					"counter" => $feed['sender']->get_unread($feed['id']));
 
-				if (method_exists($feed['sender'], 'get_total'))
-					$cv["auxcounter"] = $feed['sender']->get_total($feed['id']);
+				if (method_exists($feed['sender'], 'get_total')) {
+									$cv["auxcounter"] = $feed['sender']->get_total($feed['id']);
+				}
 
 				array_push($ret_arr, $cv);
 			}
@@ -150,8 +152,9 @@ 
 				"counter" => (int) $line["unread"],
 				"auxcounter" => (int) $line["total"]);
 
-			if ($descriptions)
-				$cv["description"] = $line["caption"];
+			if ($descriptions) {
+							$cv["description"] = $line["caption"];
+			}
 
 			array_push($ret_arr, $cv);
 		}
@@ -189,22 +192,25 @@ 
 				$has_img = false;
 			}
 
-			if (date('Y') - date('Y', strtotime($line['last_updated'])) > 2)
-				$last_updated = '';
+			if (date('Y') - date('Y', strtotime($line['last_updated'])) > 2) {
+							$last_updated = '';
+			}
 
 			$cv = array("id" => $id,
 				"updated" => $last_updated,
 				"counter" => (int) $count,
 				"has_img" => (int) $has_img);
 
-			if ($last_error)
-				$cv["error"] = $last_error;
+			if ($last_error) {
+							$cv["error"] = $last_error;
+			}
 
 //			if (get_pref('EXTENDED_FEEDLIST'))
 //				$cv["xmsg"] = getFeedArticles($id)." ".__("total");
 
-			if ($active_feed && $id == $active_feed)
-				$cv["title"] = truncate_string($line["title"], 30);
+			if ($active_feed && $id == $active_feed) {
+							$cv["title"] = truncate_string($line["title"], 30);
+			}
 
 			array_push($ret_arr, $cv);