codysnider / tt-rss

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

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

Braces +28 added lines, -16 removed lines

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

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

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

classes/pref/users.php

Braces +17 added lines, -10 removed lines

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

classes/rpc.php

Braces +15 added lines, -6 removed lines

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

classes/logger.php

Braces +16 added lines, -11 removed lines

@@ -22,19 +22,23 @@ 
 		32767		=> 'E_ALL');
 
 	function log_error($errno, $errstr, $file, $line, $context) {
-		if ($errno == E_NOTICE) return false;
-
-		if ($this->adapter)
-			return $this->adapter->log_error($errno, $errstr, $file, $line, $context);
-		else
+		if ($errno == E_NOTICE) {
 			return false;
+		}
+
+		if ($this->adapter) {
+					return $this->adapter->log_error($errno, $errstr, $file, $line, $context);
+		} else {
+					return false;
+		}
 	}
 
 	function log($string, $context = "") {
-		if ($this->adapter)
-			return $this->adapter->log_error(E_USER_NOTICE, $string, '', 0, $context);
-		else
-			return false;
+		if ($this->adapter) {
+					return $this->adapter->log_error(E_USER_NOTICE, $string, '', 0, $context);
+		} else {
+					return false;
+		}
 	}
 
 	private function __clone() {
@@ -58,8 +62,9 @@ 
 	}
 
 	public static function get() {
-		if (self::$instance == null)
-			self::$instance = new self();
+		if (self::$instance == null) {
+					self::$instance = new self();
+		}
 
 		return self::$instance;
 	}

classes/labels.php

Braces +24 added lines, -10 removed lines

@@ -56,11 +56,13 @@ 
 	static function update_cache($owner_uid, $id, $labels = false, $force = false) {
 		$pdo = Db::pdo();
 
-		if ($force)
-			Labels::clear_cache($id);
+		if ($force) {
+					Labels::clear_cache($id);
+		}
 
-		if (!$labels)
-			$labels = Article::get_article_labels($id);
+		if (!$labels) {
+					$labels = Article::get_article_labels($id);
+		}
 
 		$labels = json_encode($labels);
 
@@ -84,7 +86,9 @@ 
 
 		$label_id = Labels::find_id($label, $owner_uid);
 
-		if (!$label_id) return;
+		if (!$label_id) {
+			return;
+		}
 
 		$pdo = Db::pdo();
 
@@ -102,7 +106,9 @@ 
 
 		$label_id = Labels::find_id($label, $owner_uid);
 
-		if (!$label_id) return;
+		if (!$label_id) {
+			return;
+		}
 
 		$pdo = Db::pdo();
 
@@ -128,7 +134,9 @@ 
 	}
 
 	static function remove($id, $owner_uid) {
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+		if (!$owner_uid) {
+			$owner_uid = $_SESSION["uid"];
+		}
 
 		$pdo = Db::pdo();
 		$tr_in_progress = false;
@@ -168,12 +176,16 @@ 
 
 		}
 
-		if (!$tr_in_progress) $pdo->commit();
+		if (!$tr_in_progress) {
+			$pdo->commit();
+		}
 	}
 
 	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();
 
@@ -198,7 +210,9 @@ 
 			$result = $sth->rowCount();
 		}
 
-		if (!$tr_in_progress) $pdo->commit();
+		if (!$tr_in_progress) {
+			$pdo->commit();
+		}
 
 		return $result;
 	}