codysnider / tt-rss

include/controls.php

Braces +54 added lines, -32 removed lines

@@ -1,14 +1,17 @@ 
 <?php
 
 function print_select($id, $default, $values, $attributes = "", $name = "") {
-	if (!$name) $name = $id;
+	if (!$name) {
+	    $name = $id;
+	}
 
 	print "<select name=\"$name\" id=\"$id\" $attributes>";
 	foreach ($values as $v) {
-		if ($v == $default)
-			$sel = "selected=\"1\"";
-		else
-			$sel = "";
+		if ($v == $default) {
+					$sel = "selected=\"1\"";
+		} else {
+					$sel = "";
+		}
 
 		$v = trim($v);
 
@@ -18,14 +21,17 @@ 
 }
 
 function print_select_hash($id, $default, $values, $attributes = "", $name = "") {
-	if (!$name) $name = $id;
+	if (!$name) {
+	    $name = $id;
+	}
 
 	print "<select name=\"$name\" id='$id' $attributes>";
 	foreach (array_keys($values) as $v) {
-		if ($v == $default)
-			$sel = 'selected="selected"';
-		else
-			$sel = "";
+		if ($v == $default) {
+					$sel = 'selected="selected"';
+		} else {
+					$sel = "";
+		}
 
 		$v = trim($v);
 
@@ -53,10 +59,11 @@ 
 function print_radio($id, $default, $true_is, $values, $attributes = "") {
 	foreach ($values as $v) {
 
-		if ($v == $default)
-			$sel = "checked";
-		else
-			$sel = "";
+		if ($v == $default) {
+					$sel = "checked";
+		} else {
+					$sel = "";
+		}
 
 		if ($v == $true_is) {
 			$sel .= " value=\"1\"";
@@ -88,7 +95,9 @@ 
 
 	if (get_pref('ENABLE_FEED_CATS')) {
 
-		if (!$root_id) $root_id = null;
+		if (!$root_id) {
+		    $root_id = null;
+		}
 
 		$sth = $pdo->prepare("SELECT id,title,
 				(SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE
@@ -101,17 +110,19 @@ 
 
 		while ($line = $sth->fetch()) {
 
-			for ($i = 0; $i < $nest_level; $i++)
-				$line["title"] = " - " . $line["title"];
+			for ($i = 0; $i < $nest_level; $i++) {
+							$line["title"] = " - " . $line["title"];
+			}
 
 			$is_selected = in_array("CAT:".$line["id"], $default_ids) ? "selected=\"1\"" : "";
 
 			printf("<option $is_selected value='CAT:%d'>%s</option>",
 				$line["id"], htmlspecialchars($line["title"]));
 
-			if ($line["num_children"] > 0)
-				print_feed_multi_select($id, $default_ids, $attributes,
+			if ($line["num_children"] > 0) {
+							print_feed_multi_select($id, $default_ids, $attributes,
 					$include_all_feeds, $line["id"], $nest_level+1);
+			}
 
 			$f_sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
 					WHERE cat_id = ? AND owner_uid = ? ORDER BY title");
@@ -123,8 +134,9 @@ 
 
 				$fline["title"] = " + " . $fline["title"];
 
-				for ($i = 0; $i < $nest_level; $i++)
-					$fline["title"] = " - " . $fline["title"];
+				for ($i = 0; $i < $nest_level; $i++) {
+									$fline["title"] = " - " . $fline["title"];
+				}
 
 				printf("<option $is_selected value='%d'>%s</option>",
 					$fline["id"], htmlspecialchars($fline["title"]));
@@ -146,8 +158,9 @@ 
 
 				$fline["title"] = " + " . $fline["title"];
 
-				for ($i = 0; $i < $nest_level; $i++)
-					$fline["title"] = " - " . $fline["title"];
+				for ($i = 0; $i < $nest_level; $i++) {
+									$fline["title"] = " - " . $fline["title"];
+				}
 
 				printf("<option $is_selected value='%d'>%s</option>",
 					$fline["id"], htmlspecialchars($fline["title"]));
@@ -182,7 +195,9 @@ 
 
 	$pdo = DB::pdo();
 
-	if (!$root_id) $root_id = null;
+	if (!$root_id) {
+	    $root_id = null;
+	}
 
 	$sth = $pdo->prepare("SELECT id,title,
 				(SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE
@@ -203,16 +218,19 @@ 
 			$is_selected = "";
 		}
 
-		for ($i = 0; $i < $nest_level; $i++)
-			$line["title"] = " - " . $line["title"];
+		for ($i = 0; $i < $nest_level; $i++) {
+					$line["title"] = " - " . $line["title"];
+		}
 
-		if ($line["title"])
-			printf("<option $is_selected value='%d'>%s</option>",
+		if ($line["title"]) {
+					printf("<option $is_selected value='%d'>%s</option>",
 				$line["id"], htmlspecialchars($line["title"]));
+		}
 
-		if ($line["num_children"] > 0)
-			print_feed_cat_select($id, $default_id, $attributes,
+		if ($line["num_children"] > 0) {
+					print_feed_cat_select($id, $default_id, $attributes,
 				$include_all_cats, $line["id"], $nest_level+1);
+		}
 	}
 
 	if (!$root_id) {
@@ -251,7 +269,9 @@ 
 
 	$timestamp = filemtime($filename);
 
-	if ($query) $timestamp .= "&$query";
+	if ($query) {
+	    $timestamp .= "&$query";
+	}
 
 	return "<script type=\"text/javascript\" charset=\"utf-8\" src=\"$filename?$timestamp\"></script>\n";
 }
@@ -299,8 +319,10 @@ 
 
 		}
 
-		if ($entry) $entry .= "<a target=\"_blank\" rel=\"noopener noreferrer\"
+		if ($entry) {
+		    $entry .= "<a target=\"_blank\" rel=\"noopener noreferrer\"
 				href=\"$url\">" . basename($url) . "</a>";
+		}
 
 		$entry .= "</div>";
 

include/errorhandler.php

Braces +16 added lines, -8 removed lines

@@ -32,16 +32,19 @@ 
 }
 
 function ttrss_error_handler($errno, $errstr, $file, $line, $context) {
-	if (error_reporting() == 0 || !$errno) return false;
+	if (error_reporting() == 0 || !$errno) {
+	    return false;
+	}
 
 	$file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
 
 	$context = format_backtrace(debug_backtrace());
 	$errstr = truncate_middle($errstr, 16384, " (...) ");
 
-	if (class_exists("Logger"))
-		return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
-}
+	if (class_exists("Logger")) {
+			return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
+	}
+	}
 
 function ttrss_fatal_handler() {
 	global $last_query;
@@ -54,16 +57,21 @@ 
 		$line = $error["line"];
 		$errstr  = $error["message"];
 
-		if (!$errno) return false;
+		if (!$errno) {
+		    return false;
+		}
 
 		$context = format_backtrace(debug_backtrace());
 
 		$file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
 
-		if ($last_query) $errstr .= " [Last query: $last_query]";
+		if ($last_query) {
+		    $errstr .= " [Last query: $last_query]";
+		}
 
-		if (class_exists("Logger"))
-			return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
+		if (class_exists("Logger")) {
+					return Logger::get()->log_error($errno, $errstr, $file, $line, $context);
+		}
 	}
 
 	return false;

include/functions.php

Braces +128 added lines, -65 removed lines

@@ -18,7 +18,9 @@ 
 libxml_use_internal_errors(true);
 
 // separate test because this is included before sanity checks
-if (function_exists("mb_internal_encoding")) mb_internal_encoding("UTF-8");
+if (function_exists("mb_internal_encoding")) {
+    mb_internal_encoding("UTF-8");
+}
 
 date_default_timezone_set('UTC');
 if (defined('E_DEPRECATED')) {
@@ -195,8 +197,9 @@ 
     $fetch_last_modified = "";
     $fetch_effective_url = "";
 
-    if (!is_array($fetch_domain_hits))
-        $fetch_domain_hits = [];
+    if (!is_array($fetch_domain_hits)) {
+            $fetch_domain_hits = [];
+    }
 
     if (!is_array($options)) {
 
@@ -227,8 +230,9 @@ 
     $url = ltrim($url, ' ');
     $url = str_replace(' ', '%20', $url);
 
-    if (strpos($url, "//") === 0)
-        $url = 'http:' . $url;
+    if (strpos($url, "//") === 0) {
+            $url = 'http:' . $url;
+    }
 
     $url_host = parse_url($url, PHP_URL_HOST);
     $fetch_domain_hits[$url_host] += 1;
@@ -246,14 +250,17 @@ 
 
         $curl_http_headers = [];
 
-        if ($last_modified && !$post_query)
-            array_push($curl_http_headers, "If-Modified-Since: $last_modified");
+        if ($last_modified && !$post_query) {
+                    array_push($curl_http_headers, "If-Modified-Since: $last_modified");
+        }
 
-        if ($http_accept)
-            array_push($curl_http_headers, "Accept: " . $http_accept);
+        if ($http_accept) {
+                    array_push($curl_http_headers, "Accept: " . $http_accept);
+        }
 
-        if (count($curl_http_headers) > 0)
-            curl_setopt($ch, CURLOPT_HTTPHEADER, $curl_http_headers);
+        if (count($curl_http_headers) > 0) {
+                    curl_setopt($ch, CURLOPT_HTTPHEADER, $curl_http_headers);
+        }
 
         curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout ? $timeout : FILE_FETCH_CONNECT_TIMEOUT);
         curl_setopt($ch, CURLOPT_TIMEOUT, $timeout ? $timeout : FILE_FETCH_TIMEOUT);
@@ -267,8 +274,9 @@ 
             SELF_USER_AGENT);
         curl_setopt($ch, CURLOPT_ENCODING, "");
 
-        if  ($http_referrer)
-            curl_setopt($ch, CURLOPT_REFERER, $http_referrer);
+        if  ($http_referrer) {
+                    curl_setopt($ch, CURLOPT_REFERER, $http_referrer);
+        }
 
         if ($max_size) {
             curl_setopt($ch, CURLOPT_NOPROGRESS, false);
@@ -297,8 +305,9 @@ 
             curl_setopt($ch, CURLOPT_POSTFIELDS, $post_query);
         }
 
-        if ($login && $pass)
-            curl_setopt($ch, CURLOPT_USERPWD, "$login:$pass");
+        if ($login && $pass) {
+                    curl_setopt($ch, CURLOPT_USERPWD, "$login:$pass");
+        }
 
         $ret = @curl_exec($ch);
 
@@ -357,7 +366,9 @@ 
         if ($is_gzipped) {
             $tmp = @gzdecode($contents);
 
-            if ($tmp) $contents = $tmp;
+            if ($tmp) {
+                $contents = $tmp;
+            }
         }
 
         return $contents;
@@ -390,14 +401,17 @@ 
                     'protocol_version'=> 1.1)
               );
 
-        if (!$post_query && $last_modified)
-            array_push($context_options['http']['header'], "If-Modified-Since: $last_modified");
+        if (!$post_query && $last_modified) {
+                    array_push($context_options['http']['header'], "If-Modified-Since: $last_modified");
+        }
 
-        if ($http_accept)
-            array_push($context_options['http']['header'], "Accept: $http_accept");
+        if ($http_accept) {
+                    array_push($context_options['http']['header'], "Accept: $http_accept");
+        }
 
-        if ($http_referrer)
-            array_push($context_options['http']['header'], "Referer: $http_referrer");
+        if ($http_referrer) {
+                    array_push($context_options['http']['header'], "Referer: $http_referrer");
+        }
 
         if (defined('_HTTP_PROXY')) {
             $context_options['http']['request_fulluri'] = true;
@@ -454,7 +468,9 @@ 
         if ($is_gzipped) {
             $tmp = @gzdecode($data);
 
-            if ($tmp) $data = $tmp;
+            if ($tmp) {
+                $data = $tmp;
+            }
         }
 
         return $data;
@@ -464,7 +480,9 @@ 
 
 function initialize_user_prefs($uid, $profile = false) {
 
-    if (get_schema_version() < 63) $profile_qpart = "";
+    if (get_schema_version() < 63) {
+        $profile_qpart = "";
+    }
 
     $pdo = DB::pdo();
     $in_nested_tr = false;
@@ -477,7 +495,9 @@ 
 
     $sth = $pdo->query("SELECT pref_name,def_value FROM ttrss_prefs");
 
-    if (!is_numeric($profile) || !$profile || get_schema_version() < 63) $profile = null;
+    if (!is_numeric($profile) || !$profile || get_schema_version() < 63) {
+        $profile = null;
+    }
 
     $u_sth = $pdo->prepare("SELECT pref_name
         FROM ttrss_user_prefs WHERE owner_uid = :uid AND
@@ -510,7 +530,9 @@ 
         }
     }
 
-    if (!$in_nested_tr) $pdo->commit();
+    if (!$in_nested_tr) {
+        $pdo->commit();
+    }
 
 }
 
@@ -670,7 +692,9 @@ 
 
 function load_user_plugins($owner_uid, $pluginhost = false) {
 
-    if (!$pluginhost) $pluginhost = PluginHost::getInstance();
+    if (!$pluginhost) {
+        $pluginhost = PluginHost::getInstance();
+    }
 
     if ($owner_uid && SCHEMA_VERSION >= 100) {
         $plugins = get_pref("_ENABLED_PLUGINS", $owner_uid);
@@ -692,7 +716,9 @@ 
         startup_gettext();
         load_user_plugins($_SESSION["uid"]);
     } else {
-        if (!validate_session()) $_SESSION["uid"] = false;
+        if (!validate_session()) {
+            $_SESSION["uid"] = false;
+        }
 
         if (!$_SESSION["uid"]) {
 
@@ -787,13 +813,19 @@ 
 function make_local_datetime($timestamp, $long, $owner_uid = false,
                 $no_smart_dt = false, $eta_min = false) {
 
-    if (!$owner_uid) $owner_uid = $_SESSION['uid'];
-    if (!$timestamp) $timestamp = '1970-01-01 0:00';
+    if (!$owner_uid) {
+        $owner_uid = $_SESSION['uid'];
+    }
+    if (!$timestamp) {
+        $timestamp = '1970-01-01 0:00';
+    }
 
     global $utc_tz;
     global $user_tz;
 
-    if (!$utc_tz) $utc_tz = new DateTimeZone('UTC');
+    if (!$utc_tz) {
+        $utc_tz = new DateTimeZone('UTC');
+    }
 
     $timestamp = substr($timestamp, 0, 19);
 
@@ -805,7 +837,9 @@ 
     if ($user_tz_string != 'Automatic') {
 
         try {
-            if (!$user_tz) $user_tz = new DateTimeZone($user_tz_string);
+            if (!$user_tz) {
+                $user_tz = new DateTimeZone($user_tz_string);
+            }
         } catch (Exception $e) {
             $user_tz = $utc_tz;
         }
@@ -821,26 +855,30 @@ 
         return smart_date_time($user_timestamp,
             $tz_offset, $owner_uid, $eta_min);
     } else {
-        if ($long)
-            $format = get_pref('LONG_DATE_FORMAT', $owner_uid);
-        else
-            $format = get_pref('SHORT_DATE_FORMAT', $owner_uid);
+        if ($long) {
+                    $format = get_pref('LONG_DATE_FORMAT', $owner_uid);
+        } else {
+                    $format = get_pref('SHORT_DATE_FORMAT', $owner_uid);
+        }
 
         return date($format, $user_timestamp);
     }
 }
 
 function smart_date_time($timestamp, $tz_offset = 0, $owner_uid = false, $eta_min = false) {
-    if (!$owner_uid) $owner_uid = $_SESSION['uid'];
+    if (!$owner_uid) {
+        $owner_uid = $_SESSION['uid'];
+    }
 
     if ($eta_min && time() + $tz_offset - $timestamp < 3600) {
         return T_sprintf("%d min", date("i", time() + $tz_offset - $timestamp));
     } else if (date("Y.m.d", $timestamp) == date("Y.m.d", time() + $tz_offset)) {
         $format = get_pref('SHORT_DATE_FORMAT', $owner_uid);
-        if (strpos((strtolower($format)), "a") === false)
-            return date("G:i", $timestamp);
-        else
-            return date("g:i a", $timestamp);
+        if (strpos((strtolower($format)), "a") === false) {
+                    return date("G:i", $timestamp);
+        } else {
+                    return date("g:i a", $timestamp);
+        }
     } else if (date("Y", $timestamp) == date("Y", time() + $tz_offset)) {
         $format = get_pref('SHORT_DATE_FORMAT', $owner_uid);
         return date($format, $timestamp);
@@ -1250,8 +1288,9 @@ 
 
     if ($src) {
         foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_IFRAME_WHITELISTED) as $plugin) {
-            if ($plugin->hook_iframe_whitelisted($src))
-                return true;
+            if ($plugin->hook_iframe_whitelisted($src)) {
+                            return true;
+            }
         }
     }
 
@@ -1259,9 +1298,13 @@ 
 }
 
 function sanitize($str, $force_remove_images = false, $owner = false, $site_url = false, $highlight_words = false, $article_id = false) {
-    if (!$owner) $owner = $_SESSION["uid"];
+    if (!$owner) {
+        $owner = $_SESSION["uid"];
+    }
 
-    $res = trim($str); if (!$res) return '';
+    $res = trim($str); if (!$res) {
+        return '';
+    }
 
     $doc = new DOMDocument();
     $doc->loadHTML('<?xml encoding="UTF-8">' . $res);
@@ -1323,13 +1366,15 @@ 
 
             if ($entry->nodeName == 'source') {
 
-                if ($entry->parentNode && $entry->parentNode->parentNode)
-                    $entry->parentNode->parentNode->replaceChild($p, $entry->parentNode);
+                if ($entry->parentNode && $entry->parentNode->parentNode) {
+                                    $entry->parentNode->parentNode->replaceChild($p, $entry->parentNode);
+                }
 
             } else if ($entry->nodeName == 'img') {
 
-                if ($entry->parentNode)
-                    $entry->parentNode->replaceChild($p, $entry);
+                if ($entry->parentNode) {
+                                    $entry->parentNode->replaceChild($p, $entry);
+                }
 
             }
         }
@@ -1365,7 +1410,9 @@ 
         'sup', 'table', 'tbody', 'td', 'tfoot', 'th', 'thead', 'time',
         'tr', 'track', 'tt', 'u', 'ul', 'var', 'wbr', 'video', 'xml:namespace' );
 
-    if ($_SESSION['hasSandbox']) $allowed_elements[] = 'iframe';
+    if ($_SESSION['hasSandbox']) {
+        $allowed_elements[] = 'iframe';
+    }
 
     $disallowed_attributes = array('id', 'style', 'class');
 
@@ -1405,7 +1452,9 @@ 
                     $text = mb_substr($text, $pos + mb_strlen($word));
                 }
 
-                if (!empty($text)) $fragment->appendChild(new DomText($text));
+                if (!empty($text)) {
+                    $fragment->appendChild(new DomText($text));
+                }
 
                 $child->parentNode->replaceChild($fragment, $child);
             }
@@ -1596,8 +1645,9 @@ 
     } else {
         $output = "";
 
-        for ($i = 0; $i < $length; $i++)
-            $output .= chr(mt_rand(0, 255));
+        for ($i = 0; $i < $length; $i++) {
+                    $output .= chr(mt_rand(0, 255));
+        }
 
         return $output;
     }
@@ -1667,15 +1717,20 @@ 
 }
 
 function get_theme_path($theme) {
-    if ($theme == "default.php")
-        return "css/default.css";
+    if ($theme == "default.php") {
+            return "css/default.css";
+    }
 
     $check = "themes/$theme";
-    if (file_exists($check)) return $check;
+    if (file_exists($check)) {
+        return $check;
+    }
 
     $check = "themes.local/$theme";
-    if (file_exists($check)) return $check;
-}
+    if (file_exists($check)) {
+        return $check;
+    }
+    }
 
 function theme_exists($theme) {
     return file_exists("themes/$theme") || file_exists("themes.local/$theme");
@@ -1731,7 +1786,9 @@ 
 function send_local_file($filename) {
     if (file_exists($filename)) {
 
-        if (is_writable($filename)) touch($filename);
+        if (is_writable($filename)) {
+            touch($filename);
+        }
 
         $tmppluginhost = new PluginHost();
 
@@ -1739,7 +1796,9 @@ 
         $tmppluginhost->load_data();
 
         foreach ($tmppluginhost->get_hooks(PluginHost::HOOK_SEND_LOCAL_FILE) as $plugin) {
-            if ($plugin->hook_send_local_file($filename)) return true;
+            if ($plugin->hook_send_local_file($filename)) {
+                return true;
+            }
         }
 
         $mimetype = mime_content_type($filename);
@@ -1747,8 +1806,9 @@ 
         // this is hardly ideal but 1) only media is cached in images/ and 2) seemingly only mp4
         // video files are detected as octet-stream by mime_content_type()
 
-        if ($mimetype == "application/octet-stream")
-            $mimetype = "video/mp4";
+        if ($mimetype == "application/octet-stream") {
+                    $mimetype = "video/mp4";
+        }
 
         header("Content-type: $mimetype");
 
@@ -1771,7 +1831,9 @@ 
 
     foreach ($files as $file) {
         $file_ts = filemtime($file);
-        if ($file_ts > $ts) $ts = $file_ts;
+        if ($file_ts > $ts) {
+            $ts = $file_ts;
+        }
     }
 
     return $ts;
@@ -1784,8 +1846,9 @@ 
 function get_version(&$git_commit = false, &$git_timestamp = false) {
     global $ttrss_version;
 
-    if (isset($ttrss_version))
-        return $ttrss_version;
+    if (isset($ttrss_version)) {
+            return $ttrss_version;
+    }
 
     $ttrss_version = "UNKNOWN (Unsupported)";
 

include/sessions.php

Braces +3 added lines, -1 removed lines

@@ -35,7 +35,9 @@
 }
 
 function validate_session() {
-    if (SINGLE_USER_MODE) return true;
+    if (SINGLE_USER_MODE) {
+        return true;
+    }
 
     if (isset($_SESSION["ref_schema_version"]) && $_SESSION["ref_schema_version"] != session_get_schema_version()) {
         $_SESSION["login_error_msg"] =

update.php

Braces +32 added lines, -19 removed lines

@@ -59,8 +59,9 @@ 
 		return $tags_deleted;
 	}
 
-	if (!defined('PHP_EXECUTABLE'))
-		define('PHP_EXECUTABLE', '/usr/bin/php');
+	if (!defined('PHP_EXECUTABLE')) {
+			define('PHP_EXECUTABLE', '/usr/bin/php');
+	}
 
 	$pdo = Db::pdo();
 
@@ -249,8 +250,9 @@ 
 
 		RSSUtils::update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT);
 
-		if (!isset($options["pidlock"]) || $options["task"] == 0)
-			RSSUtils::housekeeping_common(true);
+		if (!isset($options["pidlock"]) || $options["task"] == 0) {
+					RSSUtils::housekeeping_common(true);
+		}
 
 		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
 	}
@@ -264,8 +266,9 @@ 
 		Debug::log("PLEASE BACKUP YOUR DATABASE BEFORE PROCEEDING!");
 		Debug::log("Type 'yes' to continue.");
 
-		if (read_stdin() != 'yes')
-			exit;
+		if (read_stdin() != 'yes') {
+					exit;
+		}
 
 		Debug::log("clearing existing indexes...");
 
@@ -319,8 +322,9 @@ 
 		Debug::log("WARNING: this will remove all existing type2 filters.");
 		Debug::log("Type 'yes' to continue.");
 
-		if (read_stdin() != 'yes')
-			exit;
+		if (read_stdin() != 'yes') {
+					exit;
+		}
 
 		Debug::log("converting filters...");
 
@@ -374,16 +378,18 @@ 
 		if ($updater->isUpdateRequired()) {
 			Debug::log("Schema update required, version " . $updater->getSchemaVersion() . " to " . SCHEMA_VERSION);
 
-			if (DB_TYPE == "mysql")
-				Debug::Log("READ THIS: Due to MySQL limitations, your database is not completely protected while updating.\n".
+			if (DB_TYPE == "mysql") {
+							Debug::Log("READ THIS: Due to MySQL limitations, your database is not completely protected while updating.\n".
 					"Errors may put it in an inconsistent state requiring manual rollback.\nBACKUP YOUR DATABASE BEFORE CONTINUING.");
-			else
-				Debug::log("WARNING: please backup your database before continuing.");
+			} else {
+							Debug::log("WARNING: please backup your database before continuing.");
+			}
 
 			Debug::log("Type 'yes' to continue.");
 
-			if (read_stdin() != 'yes')
-				exit;
+			if (read_stdin() != 'yes') {
+							exit;
+			}
 
 			Debug::log("Performing updates to version " . SCHEMA_VERSION);
 
@@ -456,7 +462,9 @@ 
 
 			$status = $about[3] ? "system" : "user";
 
-			if (in_array($name, $enabled)) $name .= "*";
+			if (in_array($name, $enabled)) {
+			    $name .= "*";
+			}
 
 			printf("%-50s %-10s v%.2f (by %s)\n%s\n\n",
 				$name, $status, $about[0], $about[2], $about[1]);
@@ -469,8 +477,12 @@ 
 	if (isset($options["debug-feed"])) {
 		$feed = $options["debug-feed"];
 
-		if (isset($options["force-refetch"])) $_REQUEST["force_refetch"] = true;
-		if (isset($options["force-rehash"])) $_REQUEST["force_rehash"] = true;
+		if (isset($options["force-refetch"])) {
+		    $_REQUEST["force_refetch"] = true;
+		}
+		if (isset($options["force-rehash"])) {
+		    $_REQUEST["force_rehash"] = true;
+		}
 
 		Debug::set_loglevel(Debug::$LOG_EXTENDED);
 
@@ -485,7 +497,8 @@ 
 
 	PluginHost::getInstance()->run_commands($options);
 
-	if (file_exists(LOCK_DIRECTORY . "/$lock_filename"))
-		if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')
+	if (file_exists(LOCK_DIRECTORY . "/$lock_filename")) {
+			if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')
 			fclose($lock_handle);
+	}
 		unlink(LOCK_DIRECTORY . "/$lock_filename");

api/index.php

Braces +6 added lines, -2 removed lines

@@ -38,7 +38,9 @@ 
     // fallback on HTTP parameters
     if ($input) {
         $input = json_decode($input, true);
-        if ($input) $_REQUEST = $input;
+        if ($input) {
+            $_REQUEST = $input;
+        }
     }
 } else {
     // Accept JSON only
@@ -55,7 +57,9 @@ 
 
 startup_gettext();
 
-if (!init_plugins()) return;
+if (!init_plugins()) {
+    return;
+}
 
 if ($_SESSION["uid"]) {
     if (!validate_session()) {

public.php

Braces +3 added lines, -1 removed lines

@@ -14,7 +14,9 @@
 
 	$script_started = microtime(true);
 
-	if (!init_plugins()) return;
+	if (!init_plugins()) {
+	    return;
+	}
 
 	if (ENABLE_GZIP_OUTPUT && function_exists("ob_gzhandler")) {
 		ob_start("ob_gzhandler");

register.php

Braces +12 added lines, -4 removed lines

@@ -18,7 +18,9 @@ 
 
 	$action = $_REQUEST["action"];
 
-	if (!init_plugins()) return;
+	if (!init_plugins()) {
+	    return;
+	}
 
 	if ($_REQUEST["format"] == "feed") {
 		header("Content-Type: text/xml");
@@ -35,7 +37,9 @@ 
 			$num_users = db_fetch_result($result, 0, "cu");
 
 			$num_users = REG_MAX_USERS - $num_users;
-			if ($num_users < 0) $num_users = 0;
+			if ($num_users < 0) {
+			    $num_users = 0;
+			}
 			$reg_suffix = "enabled";
 		} else {
 			$num_users = 0;
@@ -310,7 +314,9 @@ 
 						"subject" => "Registration information for Tiny Tiny RSS",
 						"message" => $reg_text]);
 
-					if (!$rc) print_error($mailer->error());
+					if (!$rc) {
+					    print_error($mailer->error());
+					}
 
 					$reg_text = "Hi!\n".
 						"\n".
@@ -324,7 +330,9 @@ 
 						"subject" => "Registration notice for Tiny Tiny RSS",
 						"message" => $reg_text]);
 
-					if (!$rc) print_error($mailer->error());
+					if (!$rc) {
+					    print_error($mailer->error());
+					}
 
 					print_notice(__("Account created successfully."));
 

opml.php

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
 	require_once "db.php";
 	require_once "db-prefs.php";
 
-	if (!init_plugins()) return;
+	if (!init_plugins()) {
+	    return;
+	}
 
 	$op = $_REQUEST['op'];