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

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(

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

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.

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

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

include/errorhandler.php

Spacing +3 added lines, -3 removed lines

@@ -13,12 +13,12 @@ 
 						if (!is_object($a)) {
 							array_push($fmt_args, $a);
 						} else {
-							array_push($fmt_args, "[" . get_class($a) . "]");
+							array_push($fmt_args, "[".get_class($a)."]");
 						}
 					}
 				}
 
-				$filename = str_replace(dirname(__DIR__) . "/", "", $e["file"]);
+				$filename = str_replace(dirname(__DIR__)."/", "", $e["file"]);
 
 				$rv .= sprintf("%d. %s(%s): %s(%s)\n",
 					$idx, $filename, $e["line"], $e["function"], implode(", ", $fmt_args));
@@ -52,7 +52,7 @@ 
 		$errno = $error["type"];
 		$file = $error["file"];
 		$line = $error["line"];
-		$errstr  = $error["message"];
+		$errstr = $error["message"];
 
 		if (!$errno) return false;