codysnider / tt-rss

register.php

Spacing +17 added lines, -17 removed lines

@@ -4,7 +4,7 @@ 
 	// 1) templates/register_notice.txt - displayed above the registration form
 	// 2) register_expire_do.php - contains user expiration queries when necessary
 
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+	set_include_path(dirname(__FILE__)."/include".PATH_SEPARATOR.
 		get_include_path());
 
 	require_once "autoload.php";
@@ -25,13 +25,13 @@ 
 
 		print '<?xml version="1.0" encoding="utf-8"?>';
 		print "<feed xmlns=\"http://www.w3.org/2005/Atom\">
-			<id>".htmlspecialchars(SELF_URL_PATH . "/register.php")."</id>
+			<id>".htmlspecialchars(SELF_URL_PATH."/register.php")."</id>
 			<title>Tiny Tiny RSS registration slots</title>
-			<link rel=\"self\" href=\"".htmlspecialchars(SELF_URL_PATH . "/register.php?format=feed")."\"/>
+			<link rel=\"self\" href=\"".htmlspecialchars(SELF_URL_PATH."/register.php?format=feed")."\"/>
 			<link rel=\"alternate\" href=\"".htmlspecialchars(SELF_URL_PATH)."\"/>";
 
 		if (ENABLE_REGISTRATION) {
-			$result = db_query( "SELECT COUNT(*) AS cu FROM ttrss_users");
+			$result = db_query("SELECT COUNT(*) AS cu FROM ttrss_users");
 			$num_users = db_fetch_result($result, 0, "cu");
 
 			$num_users = REG_MAX_USERS - $num_users;
@@ -44,7 +44,7 @@ 
 
 		print "<entry>
 			<id>".htmlspecialchars(SELF_URL_PATH)."/register.php?$num_users"."</id>
-			<link rel=\"alternate\" href=\"".htmlspecialchars(SELF_URL_PATH . "/register.php")."\"/>";
+			<link rel=\"alternate\" href=\"".htmlspecialchars(SELF_URL_PATH."/register.php")."\"/>";
 
 		print "<title>$num_users slots are currently available, registration $reg_suffix</title>";
 		print "<summary>$num_users slots are currently available, registration $reg_suffix</summary>";
@@ -59,10 +59,10 @@ 
 	/* Remove users which didn't login after receiving their registration information */
 
 	if (DB_TYPE == "pgsql") {
-		db_query( "DELETE FROM ttrss_users WHERE last_login IS NULL
+		db_query("DELETE FROM ttrss_users WHERE last_login IS NULL
 				AND created < NOW() - INTERVAL '1 day' AND access_level = 0");
 	} else {
-		db_query( "DELETE FROM ttrss_users WHERE last_login IS NULL
+		db_query("DELETE FROM ttrss_users WHERE last_login IS NULL
 				AND created < DATE_SUB(NOW(), INTERVAL 1 DAY) AND access_level = 0");
 	}
 
@@ -73,9 +73,9 @@ 
 	if ($action == "check") {
 		header("Content-Type: application/xml");
 
-		$login = trim(db_escape_string( $_REQUEST['login']));
+		$login = trim(db_escape_string($_REQUEST['login']));
 
-		$result = db_query( "SELECT id FROM ttrss_users WHERE
+		$result = db_query("SELECT id FROM ttrss_users WHERE
 			LOWER(login) = LOWER('$login')");
 
 		$is_registered = db_num_rows($result) > 0;
@@ -197,7 +197,7 @@ 
 ?>
 
 <?php if (REG_MAX_USERS > 0) {
-		$result = db_query( "SELECT COUNT(*) AS cu FROM ttrss_users");
+		$result = db_query("SELECT COUNT(*) AS cu FROM ttrss_users");
 		$num_users = db_fetch_result($result, 0, "cu");
 } ?>
 
@@ -241,9 +241,9 @@ 
 	<?php } else if ($action == "do_register") { ?>
 
 	<?php
-		$login = mb_strtolower(trim(db_escape_string( $_REQUEST["login"])));
-		$email = trim(db_escape_string( $_REQUEST["email"]));
-		$test = trim(db_escape_string( $_REQUEST["turing_test"]));
+		$login = mb_strtolower(trim(db_escape_string($_REQUEST["login"])));
+		$email = trim(db_escape_string($_REQUEST["email"]));
+		$test = trim(db_escape_string($_REQUEST["turing_test"]));
 
 		if (!$login || !$email || !$test) {
 			print_error(__("Your registration information is incomplete."));
@@ -255,7 +255,7 @@ 
 
 		if ($test == "four" || $test == "4") {
 
-			$result = db_query( "SELECT id FROM ttrss_users WHERE
+			$result = db_query("SELECT id FROM ttrss_users WHERE
 				login = '$login'");
 
 			$is_registered = db_num_rows($result) > 0;
@@ -272,11 +272,11 @@ 
 				$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
 				$pwd_hash = encrypt_password($password, $salt, true);
 
-				db_query( "INSERT INTO ttrss_users
+				db_query("INSERT INTO ttrss_users
 					(login,pwd_hash,access_level,last_login, email, created, salt)
 					VALUES ('$login', '$pwd_hash', 0, null, '$email', NOW(), '$salt')");
 
-				$result = db_query( "SELECT id FROM ttrss_users WHERE
+				$result = db_query("SELECT id FROM ttrss_users WHERE
 					login = '$login' AND pwd_hash = '$pwd_hash'");
 
 				if (db_num_rows($result) != 1) {
@@ -288,7 +288,7 @@ 
 
 					$new_uid = db_fetch_result($result, 0, "id");
 
-					initialize_user( $new_uid);
+					initialize_user($new_uid);
 
 					$reg_text = "Hi!\n".
 						"\n".

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

update.php

Indentation +9 added lines, -9 removed lines

@@ -165,18 +165,18 @@ 
 	Debug::set_enabled(true);
 
 	if (isset($options["log-level"])) {
-	    Debug::set_loglevel((int)$options["log-level"]);
-    }
+		Debug::set_loglevel((int)$options["log-level"]);
+	}
 
 	if (isset($options["log"])) {
 		Debug::set_quiet(isset($options['quiet']));
 		Debug::set_logfile($options["log"]);
-        Debug::log("Logging to " . $options["log"]);
-    } else {
-	    if (isset($options['quiet'])) {
+		Debug::log("Logging to " . $options["log"]);
+	} else {
+		if (isset($options['quiet'])) {
 			Debug::set_loglevel(Debug::$LOG_DISABLED);
-        }
-    }
+		}
+	}
 
 	if (!isset($options["daemon"])) {
 		$lock_filename = "update.lock";
@@ -229,8 +229,8 @@ 
 	if (isset($options["daemon"])) {
 		while (true) {
 			$quiet = (isset($options["quiet"])) ? "--quiet" : "";
-            $log = isset($options['log']) ? '--log '.$options['log'] : '';
-            $log_level = isset($options['log-level']) ? '--log-level '.$options['log-level'] : '';
+			$log = isset($options['log']) ? '--log '.$options['log'] : '';
+			$log_level = isset($options['log-level']) ? '--log-level '.$options['log-level'] : '';
 
 			passthru(PHP_EXECUTABLE . " " . $argv[0] ." --daemon-loop $quiet $log $log_level");
 

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

Spacing +23 added lines, -23 removed lines

@@ -1,6 +1,6 @@ 
 #!/usr/bin/env php
 <?php
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+	set_include_path(dirname(__FILE__)."/include".PATH_SEPARATOR.
 		get_include_path());
 
 	define('DISABLE_SESSIONS', true);
@@ -88,7 +88,7 @@ 
 			"help");
 
 	foreach (PluginHost::getInstance()->get_commands() as $command => $data) {
-		array_push($longopts, $command . $data["suffix"]);
+		array_push($longopts, $command.$data["suffix"]);
 	}
 
 	$options = getopt("", $longopts);
@@ -119,7 +119,7 @@ 
 		exit;
 	}
 
-	if (count($options) == 0 || isset($options["help"]) ) {
+	if (count($options) == 0 || isset($options["help"])) {
 		print "Tiny Tiny RSS data update script.\n\n";
 		print "Options:\n";
 		print "  --feeds              - update feeds\n";
@@ -165,13 +165,13 @@ 
 	Debug::set_enabled(true);
 
 	if (isset($options["log-level"])) {
-	    Debug::set_loglevel((int)$options["log-level"]);
+	    Debug::set_loglevel((int) $options["log-level"]);
     }
 
 	if (isset($options["log"])) {
 		Debug::set_quiet(isset($options['quiet']));
 		Debug::set_logfile($options["log"]);
-        Debug::log("Logging to " . $options["log"]);
+        Debug::log("Logging to ".$options["log"]);
     } else {
 	    if (isset($options['quiet'])) {
 			Debug::set_loglevel(Debug::$LOG_DISABLED);
@@ -185,8 +185,8 @@ 
 	}
 
 	if (isset($options["task"])) {
-		Debug::log("Using task id " . $options["task"]);
-		$lock_filename = $lock_filename . "-task_" . $options["task"];
+		Debug::log("Using task id ".$options["task"]);
+		$lock_filename = $lock_filename."-task_".$options["task"];
 	}
 
 	if (isset($options["pidlock"])) {
@@ -215,7 +215,7 @@ 
 	if (isset($options["force-update"])) {
 		Debug::log("marking all feeds as needing update...");
 
-		$pdo->query( "UPDATE ttrss_feeds SET
+		$pdo->query("UPDATE ttrss_feeds SET
           last_update_started = '1970-01-01', last_updated = '1970-01-01'");
 	}
 
@@ -232,7 +232,7 @@ 
             $log = isset($options['log']) ? '--log '.$options['log'] : '';
             $log_level = isset($options['log-level']) ? '--log-level '.$options['log-level'] : '';
 
-			passthru(PHP_EXECUTABLE . " " . $argv[0] ." --daemon-loop $quiet $log $log_level");
+			passthru(PHP_EXECUTABLE." ".$argv[0]." --daemon-loop $quiet $log $log_level");
 
 			// let's enforce a minimum spawn interval as to not forkbomb the host
 			$spawn_interval = max(60, DAEMON_SLEEP_INTERVAL);
@@ -256,7 +256,7 @@ 
 	}
 
 	if (isset($options["cleanup-tags"])) {
-		$rc = cleanup_tags( 14, 50000);
+		$rc = cleanup_tags(14, 50000);
 		Debug::log("$rc tags deleted.\n");
 	}
 
@@ -270,18 +270,18 @@ 
 		Debug::log("clearing existing indexes...");
 
 		if (DB_TYPE == "pgsql") {
-			$sth = $pdo->query( "SELECT relname FROM
+			$sth = $pdo->query("SELECT relname FROM
 				pg_catalog.pg_class WHERE relname LIKE 'ttrss_%'
 					AND relname NOT LIKE '%_pkey'
 				AND relkind = 'i'");
 		} else {
-			$sth = $pdo->query( "SELECT index_name,table_name FROM
+			$sth = $pdo->query("SELECT index_name,table_name FROM
 				information_schema.statistics WHERE index_name LIKE 'ttrss_%'");
 		}
 
 		while ($line = $sth->fetch()) {
 			if (DB_TYPE == "pgsql") {
-				$statement = "DROP INDEX " . $line["relname"];
+				$statement = "DROP INDEX ".$line["relname"];
 				Debug::log($statement);
 			} else {
 				$statement = "ALTER TABLE ".
@@ -291,9 +291,9 @@ 
 			$pdo->query($statement);
 		}
 
-		Debug::log("reading indexes from schema for: " . DB_TYPE);
+		Debug::log("reading indexes from schema for: ".DB_TYPE);
 
-		$fp = fopen("schema/ttrss_schema_" . DB_TYPE . ".sql", "r");
+		$fp = fopen("schema/ttrss_schema_".DB_TYPE.".sql", "r");
 		if ($fp) {
 			while ($line = fgets($fp)) {
 				$matches = array();
@@ -336,9 +336,9 @@ 
 				$filter = array();
 
 				if (sql_bool_to_bool($line["cat_filter"])) {
-					$feed_id = "CAT:" . (int)$line["cat_id"];
+					$feed_id = "CAT:".(int) $line["cat_id"];
 				} else {
-					$feed_id = (int)$line["feed_id"];
+					$feed_id = (int) $line["feed_id"];
 				}
 
 				$filter["enabled"] = $line["enabled"] ? "on" : "off";
@@ -367,12 +367,12 @@ 
 	}
 
 	if (isset($options["update-schema"])) {
-		Debug::log("Checking for updates (" . DB_TYPE . ")...");
+		Debug::log("Checking for updates (".DB_TYPE.")...");
 
 		$updater = new DbUpdater(DB_TYPE, SCHEMA_VERSION);
 
 		if ($updater->isUpdateRequired()) {
-			Debug::log("Schema update required, version " . $updater->getSchemaVersion() . " to " . SCHEMA_VERSION);
+			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".
@@ -385,7 +385,7 @@ 
 			if (read_stdin() != 'yes')
 				exit;
 
-			Debug::log("Performing updates to version " . SCHEMA_VERSION);
+			Debug::log("Performing updates to version ".SCHEMA_VERSION);
 
 			for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
 				Debug::log("* Updating to version $i...");
@@ -428,7 +428,7 @@ 
 		while (true) {
 
 			while ($line = $sth->fetch()) {
-				$tsvector_combined = mb_substr(strip_tags($line["title"] . " " . $line["content"]), 0, 1000000);
+				$tsvector_combined = mb_substr(strip_tags($line["title"]." ".$line["content"]), 0, 1000000);
 
 				$usth->execute([$tsvector_combined, $line['id']]);
 
@@ -485,7 +485,7 @@ 
 
 	PluginHost::getInstance()->run_commands($options);
 
-	if (file_exists(LOCK_DIRECTORY . "/$lock_filename"))
+	if (file_exists(LOCK_DIRECTORY."/$lock_filename"))
 		if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')
 			fclose($lock_handle);
-		unlink(LOCK_DIRECTORY . "/$lock_filename");
+		unlink(LOCK_DIRECTORY."/$lock_filename");

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -435,7 +435,7 @@
 				$processed++;
 			}
 
-			print "Processed $processed articles...\n";
+			print "processed $processed articles...\n";
 
 			if ($processed < $limit) {
 				echo "All done.\n";

backend.php

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+	set_include_path(dirname(__FILE__)."/include".PATH_SEPARATOR.
 		get_include_path());
 
 	$op = $_REQUEST["op"];
@@ -16,7 +16,7 @@ 
 		"fbexport", "logout", "pubsub");
 
 	if (array_search($op, $public_calls) !== false) {
-		header("Location: public.php?" . $_SERVER['QUERY_STRING']);
+		header("Location: public.php?".$_SERVER['QUERY_STRING']);
 		return;
 	}
 
@@ -42,7 +42,7 @@ 
 	}
 
 	if (SINGLE_USER_MODE) {
-		authenticate_user( "admin", null);
+		authenticate_user("admin", null);
 	}
 
 	if ($_SESSION["uid"]) {
@@ -51,7 +51,7 @@ 
 			print error_json(6);
 			return;
 		}
-		load_user_plugins( $_SESSION["uid"]);
+		load_user_plugins($_SESSION["uid"]);
 	}
 
 	$purge_intervals = array(

Braces +8 added lines, -5 removed lines

@@ -5,10 +5,11 @@ 
 	$op = $_REQUEST["op"];
 	@$method = $_REQUEST['subop'] ? $_REQUEST['subop'] : $_REQUEST["method"];
 
-	if (!$method)
-		$method = 'index';
-	else
-		$method = strtolower($method);
+	if (!$method) {
+			$method = 'index';
+	} else {
+			$method = strtolower($method);
+	}
 
 	/* Public calls compatibility shim */
 
@@ -33,7 +34,9 @@ 
 
 	$script_started = microtime(true);
 
-	if (!init_plugins()) return;
+	if (!init_plugins()) {
+		return;
+	}
 
 	header("Content-Type: text/json; charset=utf-8");
 

public.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+	set_include_path(dirname(__FILE__)."/include".PATH_SEPARATOR.
 		get_include_path());
 
 	require_once "autoload.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");

include/db.php

Spacing +1 added lines, -1 removed lines

@@ -33,6 +33,6 @@
 	return Db::get()->last_query_error();
 }
 
-function db_quote($str){
+function db_quote($str) {
 	return Db::get()->quote($str);
 }

include/sanity_check.php

Spacing +9 added lines, -9 removed lines

@@ -17,12 +17,12 @@ 
 	function make_self_url() {
 		$proto = is_server_https() ? 'https' : 'http';
 
-		return $proto . '://' . $_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"];
+		return $proto.'://'.$_SERVER["HTTP_HOST"].$_SERVER["REQUEST_URI"];
 	}
 
 	function make_self_url_path() {
 		$proto = is_server_https() ? 'https' : 'http';
-		$url_path = $proto . '://' . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
+		$url_path = $proto.'://'.$_SERVER["HTTP_HOST"].parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
 
 		return $url_path;
 	}
@@ -69,7 +69,7 @@ 
 			}
 
 			if (version_compare(PHP_VERSION, '5.6.0', '<')) {
-				array_push($errors, "PHP version 5.6.0 or newer required. You're using " . PHP_VERSION . ".");
+				array_push($errors, "PHP version 5.6.0 or newer required. You're using ".PHP_VERSION.".");
 			}
 
 			if (!class_exists("UConverter")) {
@@ -80,15 +80,15 @@ 
 				array_push($errors, "Configuration file (config.php) has incorrect version. Update it with new options from config.php-dist and set CONFIG_VERSION to the correct value.");
 			}
 
-			if (!is_writable(CACHE_DIR . "/images")) {
+			if (!is_writable(CACHE_DIR."/images")) {
 				array_push($errors, "Image cache is not writable (chmod -R 777 ".CACHE_DIR."/images)");
 			}
 
-			if (!is_writable(CACHE_DIR . "/upload")) {
+			if (!is_writable(CACHE_DIR."/upload")) {
 				array_push($errors, "Upload cache is not writable (chmod -R 777 ".CACHE_DIR."/upload)");
 			}
 
-			if (!is_writable(CACHE_DIR . "/export")) {
+			if (!is_writable(CACHE_DIR."/export")) {
 				array_push($errors, "Data export cache is not writable (chmod -R 777 ".CACHE_DIR."/export)");
 			}
 
@@ -124,7 +124,7 @@ 
 
 			if (isset($_SERVER["HTTP_HOST"]) &&
 				(!defined('_SKIP_SELF_URL_PATH_CHECKS') || !_SKIP_SELF_URL_PATH_CHECKS) &&
-				SELF_URL_PATH != $ref_self_url_path && SELF_URL_PATH != mb_substr($ref_self_url_path, 0, mb_strlen($ref_self_url_path)-1)) {
+				SELF_URL_PATH != $ref_self_url_path && SELF_URL_PATH != mb_substr($ref_self_url_path, 0, mb_strlen($ref_self_url_path) - 1)) {
 				array_push($errors,
 					"Please set SELF_URL_PATH to the correct value detected for your server: <b>$ref_self_url_path</b>");
 			}
@@ -187,8 +187,8 @@ 
 						array_push($bad_tables_fmt, sprintf("%s (%s)", $bt['table_name'], $bt['engine']));
 					}
 
-					$msg = "<p>The following tables use an unsupported MySQL engine: <b>" .
-						implode(", ", $bad_tables_fmt) . "</b>.</p>";
+					$msg = "<p>The following tables use an unsupported MySQL engine: <b>".
+						implode(", ", $bad_tables_fmt)."</b>.</p>";
 
 					$msg .= "<p>The only supported engine on MySQL is InnoDB. MyISAM lacks functionality to run
 						tt-rss.

Indentation +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
 			}
 
 			if (SINGLE_USER_MODE && class_exists("PDO")) {
-			    $pdo = DB::pdo();
+				$pdo = DB::pdo();
 
 				$res = $pdo->query("SELECT id FROM ttrss_users WHERE id = 1");
 

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 				array_push($errors, "Please copy config.php-dist to config.php or run the installer in install/");
 			}
 
-			if (strpos(PLUGINS, "auth_") === FALSE) {
+			if (strpos(PLUGINS, "auth_") === false) {
 				array_push($errors, "Please enable at least one authentication module via PLUGINS constant in config.php");
 			}
 

include/autoload.php

Spacing +2 added lines, -2 removed lines

@@ -15,9 +15,9 @@
 		// 3. plugin classes are loaded by PluginHandler from plugins.local/ and plugins/ (TODO: use generic autoloader?)
 
 		if ($namespace && $class_name) {
-			$class_file = "$root_dir/vendor/$namespace/" . str_replace('\\', '/', $class_name) . ".php";
+			$class_file = "$root_dir/vendor/$namespace/".str_replace('\\', '/', $class_name).".php";
 		} else {
-			$class_file = "$root_dir/classes/" . str_replace("_", "/", strtolower($class)) . ".php";
+			$class_file = "$root_dir/classes/".str_replace("_", "/", strtolower($class)).".php";
 		}
 
 		if (file_exists($class_file))

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

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 		$namespace = '';
 		$class_name = $class;
 
-		if (strpos($class, '\\') !== FALSE)
+		if (strpos($class, '\\') !== false)
 			list ($namespace, $class_name) = explode('\\', $class, 2);
 
 		$root_dir = dirname(__DIR__); // we're in tt-rss/include

include/sanity_config.php

Spacing +1 added lines, -1 removed lines

@@ -1,3 +1,3 @@
 <?php # This file has been generated at:  Thu Nov 22 22:14:43 MSK 2018
 define('GENERATED_CONFIG_CHECK', 26);
-$required_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'SINGLE_USER_MODE', 'SIMPLE_UPDATE_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'SPHINX_SERVER', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'CHECK_FOR_UPDATES', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'LOG_DESTINATION', 'CONFIG_VERSION'); ?>
+$required_defines = array('DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'SINGLE_USER_MODE', 'SIMPLE_UPDATE_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'SPHINX_SERVER', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'CHECK_FOR_UPDATES', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'LOG_DESTINATION', 'CONFIG_VERSION'); ?>

include/controls.php

Spacing +13 added lines, -13 removed lines

@@ -76,7 +76,7 @@ 
 
 	$pdo = DB::pdo();
 
-	print_r(in_array("CAT:6",$default_ids));
+	print_r(in_array("CAT:6", $default_ids));
 
 	if (!$root_id) {
 		print "<select multiple=\true\" id=\"$id\" name=\"$id\" $attributes>";
@@ -102,7 +102,7 @@ 
 		while ($line = $sth->fetch()) {
 
 			for ($i = 0; $i < $nest_level; $i++)
-				$line["title"] = " - " . $line["title"];
+				$line["title"] = " - ".$line["title"];
 
 			$is_selected = in_array("CAT:".$line["id"], $default_ids) ? "selected=\"1\"" : "";
 
@@ -111,7 +111,7 @@ 
 
 			if ($line["num_children"] > 0)
 				print_feed_multi_select($id, $default_ids, $attributes,
-					$include_all_feeds, $line["id"], $nest_level+1);
+					$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");
@@ -121,10 +121,10 @@ 
 			while ($fline = $f_sth->fetch()) {
 				$is_selected = (in_array($fline["id"], $default_ids)) ? "selected=\"1\"" : "";
 
-				$fline["title"] = " + " . $fline["title"];
+				$fline["title"] = " + ".$fline["title"];
 
 				for ($i = 0; $i < $nest_level; $i++)
-					$fline["title"] = " - " . $fline["title"];
+					$fline["title"] = " - ".$fline["title"];
 
 				printf("<option $is_selected value='%d'>%s</option>",
 					$fline["id"], htmlspecialchars($fline["title"]));
@@ -144,10 +144,10 @@ 
 			while ($fline = $f_sth->fetch()) {
 				$is_selected = in_array($fline["id"], $default_ids) ? "selected=\"1\"" : "";
 
-				$fline["title"] = " + " . $fline["title"];
+				$fline["title"] = " + ".$fline["title"];
 
 				for ($i = 0; $i < $nest_level; $i++)
-					$fline["title"] = " - " . $fline["title"];
+					$fline["title"] = " - ".$fline["title"];
 
 				printf("<option $is_selected value='%d'>%s</option>",
 					$fline["id"], htmlspecialchars($fline["title"]));
@@ -204,7 +204,7 @@ 
 		}
 
 		for ($i = 0; $i < $nest_level; $i++)
-			$line["title"] = " - " . $line["title"];
+			$line["title"] = " - ".$line["title"];
 
 		if ($line["title"])
 			printf("<option $is_selected value='%d'>%s</option>",
@@ -212,7 +212,7 @@ 
 
 		if ($line["num_children"] > 0)
 			print_feed_cat_select($id, $default_id, $attributes,
-				$include_all_cats, $line["id"], $nest_level+1);
+				$include_all_cats, $line["id"], $nest_level + 1);
 	}
 
 	if (!$root_id) {
@@ -245,7 +245,7 @@ 
 	$query = "";
 
 	if (!(strpos($filename, "?") === FALSE)) {
-		$query = substr($filename, strpos($filename, "?")+1);
+		$query = substr($filename, strpos($filename, "?") + 1);
 		$filename = substr($filename, 0, strpos($filename, "?"));
 	}
 
@@ -300,7 +300,7 @@ 
 		}
 
 		if ($entry) $entry .= "<a target=\"_blank\" rel=\"noopener noreferrer\"
-				href=\"$url\">" . basename($url) . "</a>";
+				href=\"$url\">".basename($url)."</a>";
 
 		$entry .= "</div>";
 
@@ -319,7 +319,7 @@ 
 			WHERE owner_uid = ? ORDER BY caption");
 	$sth->execute([$_SESSION['uid']]);
 
-	print "<select default=\"$value\" name=\"" . htmlspecialchars($name) .
+	print "<select default=\"$value\" name=\"".htmlspecialchars($name).
 		"\" $attributes>";
 
 	while ($line = $sth->fetch()) {
@@ -327,7 +327,7 @@ 
 		$issel = ($line["caption"] == $value) ? "selected=\"1\"" : "";
 
 		print "<option value=\"".htmlspecialchars($line["caption"])."\"
-				$issel>" . htmlspecialchars($line["caption"]) . "</option>";
+				$issel>".htmlspecialchars($line["caption"])."</option>";
 
 	}
 

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

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -244,7 +244,7 @@
 function javascript_tag($filename) {
 	$query = "";
 
-	if (!(strpos($filename, "?") === FALSE)) {
+	if (!(strpos($filename, "?") === false)) {
 		$query = substr($filename, strpos($filename, "?")+1);
 		$filename = substr($filename, 0, strpos($filename, "?"));
 	}