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

api/index.php

Spacing +5 added lines, -5 removed lines

@@ -3,9 +3,9 @@ 
 
 	require_once "../config.php";
 
-	set_include_path(dirname(__FILE__) . PATH_SEPARATOR .
-		dirname(dirname(__FILE__)) . PATH_SEPARATOR .
-		dirname(dirname(__FILE__)) . "/include" . PATH_SEPARATOR .
+	set_include_path(dirname(__FILE__).PATH_SEPARATOR.
+		dirname(dirname(__FILE__)).PATH_SEPARATOR.
+		dirname(dirname(__FILE__))."/include".PATH_SEPARATOR.
   		get_include_path());
 
 	chdir("..");
@@ -67,7 +67,7 @@ 
 			return;
 		}
 
-		load_user_plugins( $_SESSION["uid"]);
+		load_user_plugins($_SESSION["uid"]);
 	}
 
 	$method = strtolower($_REQUEST["op"]);
@@ -83,6 +83,6 @@ 
 		$handler->after();
 	}
 
-	header("Api-Content-Length: " . ob_get_length());
+	header("Api-Content-Length: ".ob_get_length());
 
 	ob_end_flush();

update.php

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::pdo(), 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");

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

Spacing +53 added lines, -54 removed lines

@@ -5,7 +5,7 @@ 
 	define('LABEL_BASE_INDEX', -1024);
 	define('PLUGIN_FEED_BASE_INDEX', -128);
 
-	define('COOKIE_LIFETIME_LONG', 86400*365);
+	define('COOKIE_LIFETIME_LONG', 86400 * 365);
 
 	$fetch_last_error = false;
 	$fetch_last_error_code = false;
@@ -57,13 +57,13 @@ 
 	// feed limit for one update batch
 	define_default('DAEMON_SLEEP_INTERVAL', 120);
 	// default sleep interval between feed updates (sec)
-	define_default('MAX_CACHE_FILE_SIZE', 64*1024*1024);
+	define_default('MAX_CACHE_FILE_SIZE', 64 * 1024 * 1024);
 	// do not cache files larger than that (bytes)
-	define_default('MAX_DOWNLOAD_FILE_SIZE', 16*1024*1024);
+	define_default('MAX_DOWNLOAD_FILE_SIZE', 16 * 1024 * 1024);
 	// do not download general files larger than that (bytes)
 	define_default('CACHE_MAX_DAYS', 7);
 	// max age in days for various automatically cached (temporary) files
-	define_default('MAX_CONDITIONAL_INTERVAL', 3600*12);
+	define_default('MAX_CONDITIONAL_INTERVAL', 3600 * 12);
 	// max interval between forced unconditional updates for servers
 	// not complying with http if-modified-since (seconds)
 	define_default('MAX_FETCH_REQUESTS_PER_HOST', 25);
@@ -156,7 +156,7 @@ 
 	require_once 'db-prefs.php';
 	require_once 'controls.php';
 
-	define('SELF_USER_AGENT', 'Tiny Tiny RSS/' . get_version() . ' (http://tt-rss.org/)');
+	define('SELF_USER_AGENT', 'Tiny Tiny RSS/'.get_version().' (http://tt-rss.org/)');
 	ini_set('user_agent', SELF_USER_AGENT);
 
 	$schema_version = false;
@@ -200,7 +200,7 @@ 
 		if (!is_array($options)) {
 
 			// falling back on compatibility shim
-			$option_names = [ "url", "type", "login", "pass", "post_query", "timeout", "last_modified", "useragent" ];
+			$option_names = ["url", "type", "login", "pass", "post_query", "timeout", "last_modified", "useragent"];
 			$tmp = [];
 
 			for ($i = 0; $i < func_num_args(); $i++) {
@@ -238,13 +238,13 @@ 
 		$url = str_replace(' ', '%20', $url);
 
 		if (strpos($url, "//") === 0)
-			$url = 'http:' . $url;
+			$url = 'http:'.$url;
 
 		$url_host = parse_url($url, PHP_URL_HOST);
 		$fetch_domain_hits[$url_host] += 1;
 
 		if ($fetch_domain_hits[$url_host] > MAX_FETCH_REQUESTS_PER_HOST) {
-			user_error("Exceeded fetch request quota for $url_host: " . $fetch_domain_hits[$url_host], E_USER_WARNING);
+			user_error("Exceeded fetch request quota for $url_host: ".$fetch_domain_hits[$url_host], E_USER_WARNING);
 			#return false;
 		}
 
@@ -260,7 +260,7 @@ 
 				array_push($curl_http_headers, "If-Modified-Since: $last_modified");
 
 			if ($http_accept)
-				array_push($curl_http_headers, "Accept: " . $http_accept);
+				array_push($curl_http_headers, "Accept: ".$http_accept);
 
 			if (count($curl_http_headers) > 0)
 				curl_setopt($ch, CURLOPT_HTTPHEADER, $curl_http_headers);
@@ -273,11 +273,10 @@ 
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 			curl_setopt($ch, CURLOPT_HEADER, true);
 			curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
-			curl_setopt($ch, CURLOPT_USERAGENT, $useragent ? $useragent :
-				SELF_USER_AGENT);
+			curl_setopt($ch, CURLOPT_USERAGENT, $useragent ? $useragent : SELF_USER_AGENT);
 			curl_setopt($ch, CURLOPT_ENCODING, "");
 
-			if  ($http_referrer)
+			if ($http_referrer)
 				curl_setopt($ch, CURLOPT_REFERER, $http_referrer);
 
 			if ($max_size) {
@@ -286,7 +285,7 @@ 
 
 				// holy shit closures in php
 				// download & upload are *expected* sizes respectively, could be zero
-				curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function($curl_handle, $download_size, $downloaded, $upload_size, $uploaded) use( &$max_size) {
+				curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function($curl_handle, $download_size, $downloaded, $upload_size, $uploaded) use(&$max_size) {
 					Debug::log("[curl progressfunction] $downloaded $max_size", Debug::$LOG_EXTENDED);
 
 					return ($downloaded > $max_size) ? 1 : 0; // if max size is set, abort when exceeding it
@@ -346,7 +345,7 @@ 
 			if ($http_code != 200 || $type && strpos($fetch_last_content_type, "$type") === false) {
 
 				if (curl_errno($ch) != 0) {
-					$fetch_last_error .=  "; " . curl_errno($ch) . " " . curl_error($ch);
+					$fetch_last_error .= "; ".curl_errno($ch)." ".curl_error($ch);
 				}
 
 				$fetch_last_error_content = $contents;
@@ -355,7 +354,7 @@ 
 			}
 
 			if (!$contents) {
-				$fetch_last_error = curl_errno($ch) . " " . curl_error($ch);
+				$fetch_last_error = curl_errno($ch)." ".curl_error($ch);
 				curl_close($ch);
 				return false;
 			}
@@ -375,7 +374,7 @@ 
 
 			$fetch_curl_used = false;
 
-			if ($login && $pass){
+			if ($login && $pass) {
 				$url_parts = array();
 
 				preg_match("/(^[^:]*):\/\/(.*)/", $url, $url_parts);
@@ -383,7 +382,7 @@ 
 				$pass = urlencode($pass);
 
 				if ($url_parts[1] && $url_parts[2]) {
-					$url = $url_parts[1] . "://$login:$pass@" . $url_parts[2];
+					$url = $url_parts[1]."://$login:$pass@".$url_parts[2];
 				}
 			}
 
@@ -451,7 +450,7 @@ 
 				$error = error_get_last();
 
 				if ($error['message'] != $old_error['message']) {
-					$fetch_last_error .= "; " . $error["message"];
+					$fetch_last_error .= "; ".$error["message"];
 				}
 
 				$fetch_last_error_content = $data;
@@ -526,15 +525,15 @@ 
 
 	function get_ssl_certificate_id() {
 		if ($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"]) {
-			return sha1($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"] .
-				$_SERVER["REDIRECT_SSL_CLIENT_V_START"] .
-				$_SERVER["REDIRECT_SSL_CLIENT_V_END"] .
+			return sha1($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"].
+				$_SERVER["REDIRECT_SSL_CLIENT_V_START"].
+				$_SERVER["REDIRECT_SSL_CLIENT_V_END"].
 				$_SERVER["REDIRECT_SSL_CLIENT_S_DN"]);
 		}
 		if ($_SERVER["SSL_CLIENT_M_SERIAL"]) {
-			return sha1($_SERVER["SSL_CLIENT_M_SERIAL"] .
-				$_SERVER["SSL_CLIENT_V_START"] .
-				$_SERVER["SSL_CLIENT_V_END"] .
+			return sha1($_SERVER["SSL_CLIENT_M_SERIAL"].
+				$_SERVER["SSL_CLIENT_V_START"].
+				$_SERVER["SSL_CLIENT_V_END"].
 				$_SERVER["SSL_CLIENT_S_DN"]);
 		}
 		return "";
@@ -669,7 +668,7 @@ 
 	function logout_user() {
 		@session_destroy();
 		if (isset($_COOKIE[session_name()])) {
-		   setcookie(session_name(), '', time()-42000, '/');
+		   setcookie(session_name(), '', time() - 42000, '/');
 		}
 		session_commit();
 	}
@@ -753,7 +752,7 @@ 
 
 	function truncate_string($str, $max_len, $suffix = '&hellip;') {
 		if (mb_strlen($str, "utf-8") > $max_len) {
-			return mb_substr($str, 0, $max_len, "utf-8") . $suffix;
+			return mb_substr($str, 0, $max_len, "utf-8").$suffix;
 		} else {
 			return $str;
 		}
@@ -763,7 +762,7 @@ 
 		$startString = mb_substr($original, 0, $position, "UTF-8");
 		$endString = mb_substr($original, $position + $length, mb_strlen($original), "UTF-8");
 
-		$out = $startString . $replacement . $endString;
+		$out = $startString.$replacement.$endString;
 
 		return $out;
 	}
@@ -901,9 +900,9 @@ 
 	}
 
 	function file_is_locked($filename) {
-		if (file_exists(LOCK_DIRECTORY . "/$filename")) {
+		if (file_exists(LOCK_DIRECTORY."/$filename")) {
 			if (function_exists('flock')) {
-				$fp = @fopen(LOCK_DIRECTORY . "/$filename", "r");
+				$fp = @fopen(LOCK_DIRECTORY."/$filename", "r");
 				if ($fp) {
 					if (flock($fp, LOCK_EX | LOCK_NB)) {
 						flock($fp, LOCK_UN);
@@ -924,11 +923,11 @@ 
 
 
 	function make_lockfile($filename) {
-		$fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
+		$fp = fopen(LOCK_DIRECTORY."/$filename", "w");
 
 		if ($fp && flock($fp, LOCK_EX | LOCK_NB)) {
 			$stat_h = fstat($fp);
-			$stat_f = stat(LOCK_DIRECTORY . "/$filename");
+			$stat_f = stat(LOCK_DIRECTORY."/$filename");
 
 			if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
 				if ($stat_h["ino"] != $stat_f["ino"] ||
@@ -939,7 +938,7 @@ 
 			}
 
 			if (function_exists('posix_getpid')) {
-				fwrite($fp, posix_getpid() . "\n");
+				fwrite($fp, posix_getpid()."\n");
 			}
 			return $fp;
 		} else {
@@ -948,10 +947,10 @@ 
 	}
 
 	function make_stampfile($filename) {
-		$fp = fopen(LOCK_DIRECTORY . "/$filename", "w");
+		$fp = fopen(LOCK_DIRECTORY."/$filename", "w");
 
 		if (flock($fp, LOCK_EX | LOCK_NB)) {
-			fwrite($fp, time() . "\n");
+			fwrite($fp, time()."\n");
 			flock($fp, LOCK_UN);
 			fclose($fp);
 			return true;
@@ -1001,7 +1000,7 @@ 
 		$params["is_default_pw"] = Pref_Prefs::isdefaultpassword();
 		$params["label_base_index"] = (int) LABEL_BASE_INDEX;
 
-		$theme = get_pref( "USER_CSS_THEME", false, false);
+		$theme = get_pref("USER_CSS_THEME", false, false);
 		$params["theme"] = theme_exists($theme) ? $theme : "";
 
 		$params["plugins"] = implode(", ", PluginHost::getInstance()->get_plugin_names());
@@ -1226,13 +1225,13 @@ 
 			}
 		}
 
-		if (file_exists(LOCK_DIRECTORY . "/update_daemon.lock")) {
+		if (file_exists(LOCK_DIRECTORY."/update_daemon.lock")) {
 
 			$data['daemon_is_running'] = (int) file_is_locked("update_daemon.lock");
 
 			if (time() - $_SESSION["daemon_stamp_check"] > 30) {
 
-				$stamp = (int) @file_get_contents(LOCK_DIRECTORY . "/update_daemon.stamp");
+				$stamp = (int) @file_get_contents(LOCK_DIRECTORY."/update_daemon.stamp");
 
 				if ($stamp) {
 					$stamp_delta = time() - $stamp;
@@ -1275,7 +1274,7 @@ 
 		$res = trim($str); if (!$res) return '';
 
 		$doc = new DOMDocument();
-		$doc->loadHTML('<?xml encoding="UTF-8">' . $res);
+		$doc->loadHTML('<?xml encoding="UTF-8">'.$res);
 		$xpath = new DOMXPath($doc);
 
 		$rewrite_base_url = $site_url ? $site_url : get_self_url_prefix();
@@ -1374,7 +1373,7 @@ 
 			'ol', 'p', 'picture', 'pre', 'q', 'ruby', 'rp', 'rt', 's', 'samp', 'section',
 			'small', 'source', 'span', 'strike', 'strong', 'sub', 'summary',
 			'sup', 'table', 'tbody', 'td', 'tfoot', 'th', 'thead', 'time',
-			'tr', 'track', 'tt', 'u', 'ul', 'var', 'wbr', 'video', 'xml:namespace' );
+			'tr', 'track', 'tt', 'u', 'ul', 'var', 'wbr', 'video', 'xml:namespace');
 
 		if ($_SESSION['hasSandbox']) $allowed_elements[] = 'iframe';
 
@@ -1509,8 +1508,8 @@ 
 
 	// this returns SELF_URL_PATH sans ending slash
 	function get_self_url_prefix() {
-		if (strrpos(SELF_URL_PATH, "/") === strlen(SELF_URL_PATH)-1) {
-			return substr(SELF_URL_PATH, 0, strlen(SELF_URL_PATH)-1);
+		if (strrpos(SELF_URL_PATH, "/") === strlen(SELF_URL_PATH) - 1) {
+			return substr(SELF_URL_PATH, 0, strlen(SELF_URL_PATH) - 1);
 		} else {
 			return SELF_URL_PATH;
 		}
@@ -1519,11 +1518,11 @@ 
 	/* TODO: This needs to use bcrypt */
 	function encrypt_password($pass, $salt = '', $mode2 = false) {
 		if ($salt && $mode2) {
-			return "MODE2:" . hash('sha256', $salt . $pass);
+			return "MODE2:".hash('sha256', $salt.$pass);
 		} else if ($salt) {
-			return "SHA1X:" . sha1("$salt:$pass");
+			return "SHA1X:".sha1("$salt:$pass");
 		} else {
-			return "SHA1:" . sha1($pass);
+			return "SHA1:".sha1($pass);
 		}
 	} // function encrypt_password
 
@@ -1534,7 +1533,7 @@ 
 	}
 
 	function build_url($parts) {
-		return $parts['scheme'] . "://" . $parts['host'] . $parts['path'];
+		return $parts['scheme']."://".$parts['host'].$parts['path'];
 	}
 
 	function cleanup_url_path($path) {
@@ -1578,7 +1577,7 @@ 
 				$dir = dirname($parts['path']);
 				$dir !== '/' && $dir .= '/';
 			}
-			$parts['path'] = $dir . $rel_url;
+			$parts['path'] = $dir.$rel_url;
 			$parts['path'] = cleanup_url_path($parts['path']);
 
 			return build_url($parts);
@@ -1755,12 +1754,12 @@ 
 
 			for ($i = 0; $i < $l10n->total; $i++) {
 				$orig = $l10n->get_original_string($i);
-				if(strpos($orig, "\000") !== FALSE) { // Plural forms
+				if (strpos($orig, "\000") !== FALSE) { // Plural forms
 					$key = explode(chr(0), $orig);
 					print T_js_decl($key[0], _ngettext($key[0], $key[1], 1)); // Singular
 					print T_js_decl($key[1], _ngettext($key[0], $key[1], 2)); // Plural
 				} else {
-					$translation = _dgettext($domain,$orig);
+					$translation = _dgettext($domain, $orig);
 					print T_js_decl($orig, $translation);
 				}
 			}
@@ -1824,7 +1823,7 @@ 
 		if (file_exists($filename)) {
 			$ext = pathinfo($filename, PATHINFO_EXTENSION);
 
-			return "data:image/$ext;base64," . base64_encode(file_get_contents($filename));
+			return "data:image/$ext;base64,".base64_encode(file_get_contents($filename));
 		} else {
 			return "";
 		}
@@ -1861,7 +1860,7 @@ 
 
 			header("Content-type: $mimetype");
 
-			$stamp = gmdate("D, d M Y H:i:s", filemtime($filename)) . " GMT";
+			$stamp = gmdate("D, d M Y H:i:s", filemtime($filename))." GMT";
 			header("Last-Modified: $stamp", true);
 
 			return readfile($filename);
@@ -1871,7 +1870,7 @@ 
 	}
 
 	function arr_qmarks($arr) {
-		return str_repeat('?,', count($arr) - 1) . '?';
+		return str_repeat('?,', count($arr) - 1).'?';
 	}
 
 	function get_scripts_timestamp() {
@@ -1906,7 +1905,7 @@ 
 		} else if (PHP_OS === "Darwin") {
 			$ttrss_version = "UNKNOWN (Unsupported, Darwin)";
 		} else if (file_exists("$root_dir/version_static.txt")) {
-			$ttrss_version = trim(file_get_contents("$root_dir/version_static.txt")) . " (Unsupported)";
+			$ttrss_version = trim(file_get_contents("$root_dir/version_static.txt"))." (Unsupported)";
 		} else if (is_dir("$root_dir/.git")) {
 			$rc = 0;
 			$output = [];
@@ -1924,10 +1923,10 @@ 
 					$git_commit = $commit;
 					$git_timestamp = $timestamp;
 
-					$ttrss_version = strftime("%y.%m", $timestamp) . "-$commit";
+					$ttrss_version = strftime("%y.%m", $timestamp)."-$commit";
 				}
 			} else {
-				user_error("Unable to determine version (using $root_dir): " . implode("\n", $output), E_USER_WARNING);
+				user_error("Unable to determine version (using $root_dir): ".implode("\n", $output), E_USER_WARNING);
 			}
 		}
 

include/colors.php

Spacing +29 added lines, -29 removed lines

@@ -5,7 +5,7 @@ 
 }
 
 function _resolve_htmlcolor($color) {
-	$htmlcolors = array ("aliceblue" => "#f0f8ff",
+	$htmlcolors = array("aliceblue" => "#f0f8ff",
 		"antiquewhite" => "#faebd7",
 		"aqua" => "#00ffff",
 		"aquamarine" => "#7fffd4",
@@ -181,7 +181,7 @@ 
 ### HSL >> RGB
 function _color_hsl2rgb($hsl) {
   $h = $hsl[0]; $s = $hsl[1]; $l = $hsl[2];
-  $m2 = ($l <= 0.5) ? $l * ($s + 1) : $l + $s - $l*$s;
+  $m2 = ($l <= 0.5) ? $l * ($s + 1) : $l + $s - $l * $s;
   $m1 = $l * 2 - $m2;
   return array(_color_hue2rgb($m1, $m2, $h + 0.33333),
                _color_hue2rgb($m1, $m2, $h),
@@ -206,7 +206,7 @@ 
   	$hex = substr($hex, 1);
 
   if (strlen($hex) == 4) {
-    $hex = $hex[1] . $hex[1] . $hex[2] . $hex[2] . $hex[3] . $hex[3];
+    $hex = $hex[1].$hex[1].$hex[2].$hex[2].$hex[3].$hex[3];
   }
   $c = hexdec($hex);
   for ($i = 16; $i >= 0; $i -= 8) {
@@ -218,7 +218,7 @@ 
 function _color_pack($rgb, $normalize = false) {
   foreach ($rgb as $k => $v) {
     $out |= (($v * ($normalize ? 255 : 1)) << (16 - $k * 8));
-  }return '#'. str_pad(dechex($out), 6, 0, STR_PAD_LEFT);
+  }return '#'.str_pad(dechex($out), 6, 0, STR_PAD_LEFT);
 }
 
 function rgb2hsl($arr) {
@@ -242,13 +242,13 @@ 
    } else {
       $s = $del_Max / $var_Max;
 
-      $del_R = ((($var_Max - $var_R ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
-      $del_G = ((($var_Max - $var_G ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
-      $del_B = ((($var_Max - $var_B ) / 6 ) + ($del_Max / 2 ) ) / $del_Max;
+      $del_R = ((($var_Max - $var_R) / 6) + ($del_Max / 2)) / $del_Max;
+      $del_G = ((($var_Max - $var_G) / 6) + ($del_Max / 2)) / $del_Max;
+      $del_B = ((($var_Max - $var_B) / 6) + ($del_Max / 2)) / $del_Max;
 
-      if      ($var_R == $var_Max) $h = $del_B - $del_G;
-      else if ($var_G == $var_Max) $h = (1 / 3 ) + $del_R - $del_B;
-      else if ($var_B == $var_Max) $h = (2 / 3 ) + $del_G - $del_R;
+      if ($var_R == $var_Max) $h = $del_B - $del_G;
+      else if ($var_G == $var_Max) $h = (1 / 3) + $del_R - $del_B;
+      else if ($var_B == $var_Max) $h = (2 / 3) + $del_G - $del_R;
 
       if ($h < 0) $h++;
       if ($h > 1) $h--;
@@ -262,21 +262,21 @@ 
 	$s = $arr[1];
 	$v = $arr[2];
 
-    if($s == 0) {
+    if ($s == 0) {
         $r = $g = $B = $v * 255;
     } else {
         $var_H = $h * 6;
-        $var_i = floor($var_H );
-        $var_1 = $v * (1 - $s );
-        $var_2 = $v * (1 - $s * ($var_H - $var_i ) );
-        $var_3 = $v * (1 - $s * (1 - ($var_H - $var_i ) ) );
-
-        if       ($var_i == 0) { $var_R = $v     ; $var_G = $var_3  ; $var_B = $var_1 ; }
-        else if  ($var_i == 1) { $var_R = $var_2 ; $var_G = $v      ; $var_B = $var_1 ; }
-        else if  ($var_i == 2) { $var_R = $var_1 ; $var_G = $v      ; $var_B = $var_3 ; }
-        else if  ($var_i == 3) { $var_R = $var_1 ; $var_G = $var_2  ; $var_B = $v     ; }
-        else if  ($var_i == 4) { $var_R = $var_3 ; $var_G = $var_1  ; $var_B = $v     ; }
-        else                   { $var_R = $v     ; $var_G = $var_1  ; $var_B = $var_2 ; }
+        $var_i = floor($var_H);
+        $var_1 = $v * (1 - $s);
+        $var_2 = $v * (1 - $s * ($var_H - $var_i));
+        $var_3 = $v * (1 - $s * (1 - ($var_H - $var_i)));
+
+        if ($var_i == 0) { $var_R = $v; $var_G = $var_3; $var_B = $var_1; }
+        else if ($var_i == 1) { $var_R = $var_2; $var_G = $v; $var_B = $var_1; }
+        else if ($var_i == 2) { $var_R = $var_1; $var_G = $v; $var_B = $var_3; }
+        else if ($var_i == 3) { $var_R = $var_1; $var_G = $var_2; $var_B = $v; }
+        else if ($var_i == 4) { $var_R = $var_3; $var_G = $var_1; $var_B = $v; }
+        else { $var_R = $v; $var_G = $var_1; $var_B = $var_2; }
 
         $r = $var_R * 255;
         $g = $var_G * 255;
@@ -286,7 +286,7 @@ 
 }
 
 	function colorPalette($imageFile, $numColors, $granularity = 5) {
-	   $granularity = max(1, abs((int)$granularity));
+	   $granularity = max(1, abs((int) $granularity));
 	   $colors = array();
 
 		$size = @getimagesize($imageFile);
@@ -299,10 +299,10 @@ 
 				$ico = new floIcon();
 				@$ico->readICO($imageFile);
 
-				if(count($ico->images)==0)
+				if (count($ico->images) == 0)
 					return false;
 				else
-					$img = @$ico->images[count($ico->images)-1]->getImageResource();
+					$img = @$ico->images[count($ico->images) - 1]->getImageResource();
 
 			} else {
 				return false;
@@ -314,17 +314,17 @@ 
 
 		if (!$img) return false;
 
-	   for($x = 0; $x < $size[0]; $x += $granularity) {
-	      for($y = 0; $y < $size[1]; $y += $granularity) {
+	   for ($x = 0; $x < $size[0]; $x += $granularity) {
+	      for ($y = 0; $y < $size[1]; $y += $granularity) {
 	         $thisColor = imagecolorat($img, $x, $y);
 	         $rgb = imagecolorsforindex($img, $thisColor);
 	         $red = round(round(($rgb['red'] / 0x33)) * 0x33);
 	         $green = round(round(($rgb['green'] / 0x33)) * 0x33);
 	         $blue = round(round(($rgb['blue'] / 0x33)) * 0x33);
 	         $thisRGB = sprintf('%02X%02X%02X', $red, $green, $blue);
-	         if(array_key_exists($thisRGB, $colors)) {
+	         if (array_key_exists($thisRGB, $colors)) {
 	            $colors[$thisRGB]++;
-	         } else{
+	         } else {
 	            $colors[$thisRGB] = 1;
 	         }
 	      }