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

Indentation +140 added lines, -140 removed lines

@@ -1,93 +1,93 @@ 
 <?php
-	// This file uses two additional include files:
-	//
-	// 1) templates/register_notice.txt - displayed above the registration form
-	// 2) register_expire_do.php - contains user expiration queries when necessary
+    // This file uses two additional include files:
+    //
+    // 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 .
-		get_include_path());
+    set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+        get_include_path());
 
-	require_once "autoload.php";
-	require_once "functions.php";
-	require_once "sessions.php";
-	require_once "sanity_check.php";
-	require_once "config.php";
-	require_once "db.php";
+    require_once "autoload.php";
+    require_once "functions.php";
+    require_once "sessions.php";
+    require_once "sanity_check.php";
+    require_once "config.php";
+    require_once "db.php";
 
-	startup_gettext();
+    startup_gettext();
 
-	$action = $_REQUEST["action"];
+    $action = $_REQUEST["action"];
 
-	if (!init_plugins()) return;
+    if (!init_plugins()) return;
 
-	if ($_REQUEST["format"] == "feed") {
-		header("Content-Type: text/xml");
+    if ($_REQUEST["format"] == "feed") {
+        header("Content-Type: text/xml");
 
-		print '<?xml version="1.0" encoding="utf-8"?>';
-		print "<feed xmlns=\"http://www.w3.org/2005/Atom\">
+        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>
 			<title>Tiny Tiny RSS registration slots</title>
 			<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");
-			$num_users = db_fetch_result($result, 0, "cu");
+        if (ENABLE_REGISTRATION) {
+            $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;
-			if ($num_users < 0) $num_users = 0;
-			$reg_suffix = "enabled";
-		} else {
-			$num_users = 0;
-			$reg_suffix = "disabled";
-		}
+            $num_users = REG_MAX_USERS - $num_users;
+            if ($num_users < 0) $num_users = 0;
+            $reg_suffix = "enabled";
+        } else {
+            $num_users = 0;
+            $reg_suffix = "disabled";
+        }
 
-		print "<entry>
+        print "<entry>
 			<id>".htmlspecialchars(SELF_URL_PATH)."/register.php?$num_users"."</id>
 			<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>";
+        print "<title>$num_users slots are currently available, registration $reg_suffix</title>";
+        print "<summary>$num_users slots are currently available, registration $reg_suffix</summary>";
 
-		print "</entry>";
+        print "</entry>";
 
-		print "</feed>";
+        print "</feed>";
 
-		return;
-	}
+        return;
+    }
 
-	/* Remove users which didn't login after receiving their registration information */
+    /* 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
+    if (DB_TYPE == "pgsql") {
+        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
+    } else {
+        db_query( "DELETE FROM ttrss_users WHERE last_login IS NULL
 				AND created < DATE_SUB(NOW(), INTERVAL 1 DAY) AND access_level = 0");
-	}
+    }
 
-	if (file_exists("register_expire_do.php")) {
-		require_once "register_expire_do.php";
-	}
+    if (file_exists("register_expire_do.php")) {
+        require_once "register_expire_do.php";
+    }
 
-	if ($action == "check") {
-		header("Content-Type: application/xml");
+    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;
+        $is_registered = db_num_rows($result) > 0;
 
-		print "<result>";
+        print "<result>";
 
-		printf("%d", $is_registered);
+        printf("%d", $is_registered);
 
-		print "</result>";
+        print "</result>";
 
-		return;
-	}
+        return;
+    }
 ?>
 <!DOCTYPE html>
 <html>
@@ -185,20 +185,20 @@ 
 <div class="content">
 
 <?php
-		if (!ENABLE_REGISTRATION) {
-			print_error(__("New user registrations are administratively disabled."));
+        if (!ENABLE_REGISTRATION) {
+            print_error(__("New user registrations are administratively disabled."));
 
-			print "<p><form method=\"GET\" action=\"backend.php\">
+            print "<p><form method=\"GET\" action=\"backend.php\">
 				<input type=\"hidden\" name=\"op\" value=\"logout\">
 				<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
 				</form>";
-			return;
-		}
+            return;
+        }
 ?>
 
 <?php if (REG_MAX_USERS > 0) {
-		$result = db_query( "SELECT COUNT(*) AS cu FROM ttrss_users");
-		$num_users = db_fetch_result($result, 0, "cu");
+        $result = db_query( "SELECT COUNT(*) AS cu FROM ttrss_users");
+        $num_users = db_fetch_result($result, 0, "cu");
 } ?>
 
 <?php if (!REG_MAX_USERS || $num_users < REG_MAX_USERS) { ?>
@@ -206,8 +206,8 @@ 
 	<!-- If you have any rules or ToS you'd like to display, enter them here -->
 
 	<?php	if (file_exists("templates/register_notice.txt")) {
-			require_once "templates/register_notice.txt";
-	} ?>
+            require_once "templates/register_notice.txt";
+    } ?>
 
 	<?php if (!$action) { ?>
 
@@ -241,110 +241,110 @@ 
 	<?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."));
-			print "<p><form method=\"GET\" action=\"index.php\">
+        if (!$login || !$email || !$test) {
+            print_error(__("Your registration information is incomplete."));
+            print "<p><form method=\"GET\" action=\"index.php\">
 				<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
 				</form>";
-			return;
-		}
+            return;
+        }
 
-		if ($test == "four" || $test == "4") {
+        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;
+            $is_registered = db_num_rows($result) > 0;
 
-			if ($is_registered) {
-				print_error(__('Sorry, this username is already taken.'));
-				print "<p><form method=\"GET\" action=\"index.php\">
+            if ($is_registered) {
+                print_error(__('Sorry, this username is already taken.'));
+                print "<p><form method=\"GET\" action=\"index.php\">
 				<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
 				</form>";
-			} else {
+            } else {
 
-				$password = make_password();
+                $password = make_password();
 
-				$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
-				$pwd_hash = encrypt_password($password, $salt, true);
+                $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) {
-					print_error(__('Registration failed.'));
-					print "<p><form method=\"GET\" action=\"index.php\">
+                if (db_num_rows($result) != 1) {
+                    print_error(__('Registration failed.'));
+                    print "<p><form method=\"GET\" action=\"index.php\">
 					<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
 					</form>";
-				} else {
-
-					$new_uid = db_fetch_result($result, 0, "id");
-
-					initialize_user( $new_uid);
-
-					$reg_text = "Hi!\n".
-						"\n".
-						"You are receiving this message, because you (or somebody else) have opened\n".
-						"an account at Tiny Tiny RSS.\n".
-						"\n".
-						"Your login information is as follows:\n".
-						"\n".
-						"Login: $login\n".
-						"Password: $password\n".
-						"\n".
-						"Don't forget to login at least once to your new account, otherwise\n".
-						"it will be deleted in 24 hours.\n".
-						"\n".
-						"If that wasn't you, just ignore this message. Thanks.";
-
-					$mailer = new Mailer();
-					$rc = $mailer->mail(["to_address" => $email,
-						"subject" => "Registration information for Tiny Tiny RSS",
-						"message" => $reg_text]);
-
-					if (!$rc) print_error($mailer->error());
-
-					$reg_text = "Hi!\n".
-						"\n".
-						"New user had registered at your Tiny Tiny RSS installation.\n".
-						"\n".
-						"Login: $login\n".
-						"Email: $email\n";
-
-					$mailer = new Mailer();
-					$rc = $mailer->mail(["to_address" => REG_NOTIFY_ADDRESS,
-						"subject" => "Registration notice for Tiny Tiny RSS",
-						"message" => $reg_text]);
-
-					if (!$rc) print_error($mailer->error());
-
-					print_notice(__("Account created successfully."));
-
-					print "<p><form method=\"GET\" action=\"index.php\">
+                } else {
+
+                    $new_uid = db_fetch_result($result, 0, "id");
+
+                    initialize_user( $new_uid);
+
+                    $reg_text = "Hi!\n".
+                        "\n".
+                        "You are receiving this message, because you (or somebody else) have opened\n".
+                        "an account at Tiny Tiny RSS.\n".
+                        "\n".
+                        "Your login information is as follows:\n".
+                        "\n".
+                        "Login: $login\n".
+                        "Password: $password\n".
+                        "\n".
+                        "Don't forget to login at least once to your new account, otherwise\n".
+                        "it will be deleted in 24 hours.\n".
+                        "\n".
+                        "If that wasn't you, just ignore this message. Thanks.";
+
+                    $mailer = new Mailer();
+                    $rc = $mailer->mail(["to_address" => $email,
+                        "subject" => "Registration information for Tiny Tiny RSS",
+                        "message" => $reg_text]);
+
+                    if (!$rc) print_error($mailer->error());
+
+                    $reg_text = "Hi!\n".
+                        "\n".
+                        "New user had registered at your Tiny Tiny RSS installation.\n".
+                        "\n".
+                        "Login: $login\n".
+                        "Email: $email\n";
+
+                    $mailer = new Mailer();
+                    $rc = $mailer->mail(["to_address" => REG_NOTIFY_ADDRESS,
+                        "subject" => "Registration notice for Tiny Tiny RSS",
+                        "message" => $reg_text]);
+
+                    if (!$rc) print_error($mailer->error());
+
+                    print_notice(__("Account created successfully."));
+
+                    print "<p><form method=\"GET\" action=\"index.php\">
 					<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
 					</form>";
 
-				}
+                }
 
-			}
+            }
 
-			} else {
-				print_error('Plese check the form again, you have failed the robot test.');
-				print "<p><form method=\"GET\" action=\"index.php\">
+            } else {
+                print_error('Plese check the form again, you have failed the robot test.');
+                print "<p><form method=\"GET\" action=\"index.php\">
 				<input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
 				</form>";
 
-			}
-		}
-	?>
+            }
+        }
+    ?>
 
 <?php } else { ?>
 

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(

Indentation +129 added lines, -129 removed lines

@@ -1,130 +1,130 @@
 <?php
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
-		get_include_path());
-
-	$op = $_REQUEST["op"];
-	@$method = $_REQUEST['subop'] ? $_REQUEST['subop'] : $_REQUEST["method"];
-
-	if (!$method)
-		$method = 'index';
-	else
-		$method = strtolower($method);
-
-	/* Public calls compatibility shim */
-
-	$public_calls = array("globalUpdateFeeds", "rss", "getUnread", "getProfiles", "share",
-		"fbexport", "logout", "pubsub");
-
-	if (array_search($op, $public_calls) !== false) {
-		header("Location: public.php?" . $_SERVER['QUERY_STRING']);
-		return;
-	}
-
-	@$csrf_token = $_REQUEST['csrf_token'];
-
-	require_once "autoload.php";
-	require_once "sessions.php";
-	require_once "functions.php";
-	require_once "config.php";
-	require_once "db.php";
-	require_once "db-prefs.php";
-
-	startup_gettext();
-
-	$script_started = microtime(true);
-
-	if (!init_plugins()) return;
-
-	header("Content-Type: text/json; charset=utf-8");
-
-	if (ENABLE_GZIP_OUTPUT && function_exists("ob_gzhandler")) {
-		ob_start("ob_gzhandler");
-	}
-
-	if (SINGLE_USER_MODE) {
-		authenticate_user( "admin", null);
-	}
-
-	if ($_SESSION["uid"]) {
-		if (!validate_session()) {
-			header("Content-Type: text/json");
-			print error_json(6);
-			return;
-		}
-		load_user_plugins( $_SESSION["uid"]);
-	}
-
-	$purge_intervals = array(
-		0  => __("Use default"),
-		-1 => __("Never purge"),
-		5  => __("1 week old"),
-		14 => __("2 weeks old"),
-		31 => __("1 month old"),
-		60 => __("2 months old"),
-		90 => __("3 months old"));
-
-	$update_intervals = array(
-		0   => __("Default interval"),
-		-1  => __("Disable updates"),
-		15  => __("15 minutes"),
-		30  => __("30 minutes"),
-		60  => __("Hourly"),
-		240 => __("4 hours"),
-		720 => __("12 hours"),
-		1440 => __("Daily"),
-		10080 => __("Weekly"));
-
-	$update_intervals_nodefault = array(
-		-1  => __("Disable updates"),
-		15  => __("15 minutes"),
-		30  => __("30 minutes"),
-		60  => __("Hourly"),
-		240 => __("4 hours"),
-		720 => __("12 hours"),
-		1440 => __("Daily"),
-		10080 => __("Weekly"));
-
-	$access_level_names = array(
-		0 => __("User"),
-		5 => __("Power User"),
-		10 => __("Administrator"));
-
-	$op = str_replace("-", "_", $op);
-
-	$override = PluginHost::getInstance()->lookup_handler($op, $method);
-
-	if (class_exists($op) || $override) {
-
-		if ($override) {
-			$handler = $override;
-		} else {
-			$handler = new $op($_REQUEST);
-		}
-
-		if ($handler && implements_interface($handler, 'IHandler')) {
-			if (validate_csrf($csrf_token) || $handler->csrf_ignore($method)) {
-				if ($handler->before($method)) {
-					if ($method && method_exists($handler, $method)) {
-						$handler->$method();
-					} else {
-						if (method_exists($handler, "catchall")) {
-							$handler->catchall($method);
-						}
-					}
-					$handler->after();
-					return;
-				} else {
-					header("Content-Type: text/json");
-					print error_json(6);
-					return;
-				}
-			} else {
-				header("Content-Type: text/json");
-				print error_json(6);
-				return;
-			}
-		}
-	}
-
-	header("Content-Type: text/json");
-	print error_json(13);
+    set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+        get_include_path());
+
+    $op = $_REQUEST["op"];
+    @$method = $_REQUEST['subop'] ? $_REQUEST['subop'] : $_REQUEST["method"];
+
+    if (!$method)
+        $method = 'index';
+    else
+        $method = strtolower($method);
+
+    /* Public calls compatibility shim */
+
+    $public_calls = array("globalUpdateFeeds", "rss", "getUnread", "getProfiles", "share",
+        "fbexport", "logout", "pubsub");
+
+    if (array_search($op, $public_calls) !== false) {
+        header("Location: public.php?" . $_SERVER['QUERY_STRING']);
+        return;
+    }
+
+    @$csrf_token = $_REQUEST['csrf_token'];
+
+    require_once "autoload.php";
+    require_once "sessions.php";
+    require_once "functions.php";
+    require_once "config.php";
+    require_once "db.php";
+    require_once "db-prefs.php";
+
+    startup_gettext();
+
+    $script_started = microtime(true);
+
+    if (!init_plugins()) return;
+
+    header("Content-Type: text/json; charset=utf-8");
+
+    if (ENABLE_GZIP_OUTPUT && function_exists("ob_gzhandler")) {
+        ob_start("ob_gzhandler");
+    }
+
+    if (SINGLE_USER_MODE) {
+        authenticate_user( "admin", null);
+    }
+
+    if ($_SESSION["uid"]) {
+        if (!validate_session()) {
+            header("Content-Type: text/json");
+            print error_json(6);
+            return;
+        }
+        load_user_plugins( $_SESSION["uid"]);
+    }
+
+    $purge_intervals = array(
+        0  => __("Use default"),
+        -1 => __("Never purge"),
+        5  => __("1 week old"),
+        14 => __("2 weeks old"),
+        31 => __("1 month old"),
+        60 => __("2 months old"),
+        90 => __("3 months old"));
+
+    $update_intervals = array(
+        0   => __("Default interval"),
+        -1  => __("Disable updates"),
+        15  => __("15 minutes"),
+        30  => __("30 minutes"),
+        60  => __("Hourly"),
+        240 => __("4 hours"),
+        720 => __("12 hours"),
+        1440 => __("Daily"),
+        10080 => __("Weekly"));
+
+    $update_intervals_nodefault = array(
+        -1  => __("Disable updates"),
+        15  => __("15 minutes"),
+        30  => __("30 minutes"),
+        60  => __("Hourly"),
+        240 => __("4 hours"),
+        720 => __("12 hours"),
+        1440 => __("Daily"),
+        10080 => __("Weekly"));
+
+    $access_level_names = array(
+        0 => __("User"),
+        5 => __("Power User"),
+        10 => __("Administrator"));
+
+    $op = str_replace("-", "_", $op);
+
+    $override = PluginHost::getInstance()->lookup_handler($op, $method);
+
+    if (class_exists($op) || $override) {
+
+        if ($override) {
+            $handler = $override;
+        } else {
+            $handler = new $op($_REQUEST);
+        }
+
+        if ($handler && implements_interface($handler, 'IHandler')) {
+            if (validate_csrf($csrf_token) || $handler->csrf_ignore($method)) {
+                if ($handler->before($method)) {
+                    if ($method && method_exists($handler, $method)) {
+                        $handler->$method();
+                    } else {
+                        if (method_exists($handler, "catchall")) {
+                            $handler->catchall($method);
+                        }
+                    }
+                    $handler->after();
+                    return;
+                } else {
+                    header("Content-Type: text/json");
+                    print error_json(6);
+                    return;
+                }
+            } else {
+                header("Content-Type: text/json");
+                print error_json(6);
+                return;
+            }
+        }
+    }
+
+    header("Content-Type: text/json");
+    print error_json(13);

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

Indentation +33 added lines, -33 removed lines

@@ -1,44 +1,44 @@
 <?php
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
-		get_include_path());
+    set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+        get_include_path());
 
-	require_once "autoload.php";
-	require_once "sessions.php";
-	require_once "functions.php";
-	require_once "sanity_check.php";
-	require_once "config.php";
-	require_once "db.php";
-	require_once "db-prefs.php";
+    require_once "autoload.php";
+    require_once "sessions.php";
+    require_once "functions.php";
+    require_once "sanity_check.php";
+    require_once "config.php";
+    require_once "db.php";
+    require_once "db-prefs.php";
 
-	startup_gettext();
+    startup_gettext();
 
-	$script_started = microtime(true);
+    $script_started = microtime(true);
 
-	if (!init_plugins()) return;
+    if (!init_plugins()) return;
 
-	if (ENABLE_GZIP_OUTPUT && function_exists("ob_gzhandler")) {
-		ob_start("ob_gzhandler");
-	}
+    if (ENABLE_GZIP_OUTPUT && function_exists("ob_gzhandler")) {
+        ob_start("ob_gzhandler");
+    }
 
-	$method = $_REQUEST["op"];
+    $method = $_REQUEST["op"];
 
-	$override = PluginHost::getInstance()->lookup_handler("public", $method);
+    $override = PluginHost::getInstance()->lookup_handler("public", $method);
 
-	if ($override) {
-		$handler = $override;
-	} else {
-		$handler = new Handler_Public($_REQUEST);
-	}
+    if ($override) {
+        $handler = $override;
+    } else {
+        $handler = new Handler_Public($_REQUEST);
+    }
 
-	if (implements_interface($handler, "IHandler") && $handler->before($method)) {
-		if ($method && method_exists($handler, $method)) {
-			$handler->$method();
-		} else if (method_exists($handler, 'index')) {
-			$handler->index();
-		}
-		$handler->after();
-		return;
-	}
+    if (implements_interface($handler, "IHandler") && $handler->before($method)) {
+        if ($method && method_exists($handler, $method)) {
+            $handler->$method();
+        } else if (method_exists($handler, 'index')) {
+            $handler->index();
+        }
+        $handler->after();
+        return;
+    }
 
-	header("Content-Type: text/plain");
-	print error_json(13);
+    header("Content-Type: text/plain");
+    print error_json(13);

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

Indentation +9 added lines, -9 removed lines

@@ -1,38 +1,38 @@
 <?php
 
 function db_escape_string($s, $strip_tags = true) {
-	return Db::get()->escape_string($s, $strip_tags);
+    return Db::get()->escape_string($s, $strip_tags);
 }
 
 function db_query($query, $die_on_error = true) {
-	return Db::get()->query($query, $die_on_error);
+    return Db::get()->query($query, $die_on_error);
 }
 
 function db_fetch_assoc($result) {
-	return Db::get()->fetch_assoc($result);
+    return Db::get()->fetch_assoc($result);
 }
 
 
 function db_num_rows($result) {
-	return Db::get()->num_rows($result);
+    return Db::get()->num_rows($result);
 }
 
 function db_fetch_result($result, $row, $param) {
-	return Db::get()->fetch_result($result, $row, $param);
+    return Db::get()->fetch_result($result, $row, $param);
 }
 
 function db_affected_rows($result) {
-	return Db::get()->affected_rows($result);
+    return Db::get()->affected_rows($result);
 }
 
 function db_last_error() {
-	return Db::get()->last_error();
+    return Db::get()->last_error();
 }
 
 function db_last_query_error() {
-	return Db::get()->last_query_error();
+    return Db::get()->last_query_error();
 }
 
 function db_quote($str){
-	return Db::get()->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 +145 added lines, -145 removed lines

@@ -1,190 +1,190 @@ 
 <?php
 
-	function make_self_url() {
-		$proto = is_server_https() ? 'https' : 'http';
+    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);
+    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);
 
-		return $url_path;
-	}
+        return $url_path;
+    }
 
-	function check_mysql_tables() {
-		$pdo = Db::pdo();
+    function check_mysql_tables() {
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare("SELECT engine, table_name FROM information_schema.tables WHERE
+        $sth = $pdo->prepare("SELECT engine, table_name FROM information_schema.tables WHERE
 				table_schema = ? AND table_name LIKE 'ttrss_%' AND engine != 'InnoDB'");
-		$sth->execute([DB_NAME]);
+        $sth->execute([DB_NAME]);
 
-		$bad_tables = [];
+        $bad_tables = [];
 
-		while ($line = $sth->fetch()) {
-			array_push($bad_tables, $line);
-		}
+        while ($line = $sth->fetch()) {
+            array_push($bad_tables, $line);
+        }
 
-		return $bad_tables;
-	}
+        return $bad_tables;
+    }
 
-	function initial_sanity_check() {
+    function initial_sanity_check() {
 
-		$errors = array();
+        $errors = array();
 
-		if (!file_exists("config.php")) {
-			array_push($errors, "Configuration file not found. Looks like you forgot to copy config.php-dist to config.php and edit it.");
-		} else {
+        if (!file_exists("config.php")) {
+            array_push($errors, "Configuration file not found. Looks like you forgot to copy config.php-dist to config.php and edit it.");
+        } else {
 
-			require_once "sanity_config.php";
+            require_once "sanity_config.php";
 
-			if (file_exists("install") && !file_exists("config.php")) {
-				array_push($errors, "Please copy config.php-dist to config.php or run the installer in install/");
-			}
+            if (file_exists("install") && !file_exists("config.php")) {
+                array_push($errors, "Please copy config.php-dist to config.php or run the installer in install/");
+            }
 
-			if (strpos(PLUGINS, "auth_") === false) {
-				array_push($errors, "Please enable at least one authentication module via PLUGINS constant in config.php");
-			}
+            if (strpos(PLUGINS, "auth_") === false) {
+                array_push($errors, "Please enable at least one authentication module via PLUGINS constant in config.php");
+            }
 
-			if (function_exists('posix_getuid') && posix_getuid() == 0) {
-				array_push($errors, "Please don't run this script as root.");
-			}
+            if (function_exists('posix_getuid') && posix_getuid() == 0) {
+                array_push($errors, "Please don't run this script as root.");
+            }
 
-			if (version_compare(PHP_VERSION, '5.6.0', '<')) {
-				array_push($errors, "PHP version 5.6.0 or newer required. You're using " . PHP_VERSION . ".");
-			}
+            if (version_compare(PHP_VERSION, '5.6.0', '<')) {
+                array_push($errors, "PHP version 5.6.0 or newer required. You're using " . PHP_VERSION . ".");
+            }
 
-			if (!class_exists("UConverter")) {
-				array_push($errors, "PHP UConverter class is missing, it's provided by the Internationalization (intl) module.");
-			}
+            if (!class_exists("UConverter")) {
+                array_push($errors, "PHP UConverter class is missing, it's provided by the Internationalization (intl) module.");
+            }
 
-			if (CONFIG_VERSION != EXPECTED_CONFIG_VERSION) {
-				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 (CONFIG_VERSION != EXPECTED_CONFIG_VERSION) {
+                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")) {
-				array_push($errors, "Image cache is not writable (chmod -R 777 ".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")) {
-				array_push($errors, "Upload cache is not writable (chmod -R 777 ".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")) {
-				array_push($errors, "Data export cache is not writable (chmod -R 777 ".CACHE_DIR."/export)");
-			}
+            if (!is_writable(CACHE_DIR . "/export")) {
+                array_push($errors, "Data export cache is not writable (chmod -R 777 ".CACHE_DIR."/export)");
+            }
 
-			if (GENERATED_CONFIG_CHECK != EXPECTED_CONFIG_VERSION) {
-				array_push($errors,
-					"Configuration option checker sanity_config.php is outdated, please recreate it using ./utils/regen_config_checks.sh");
-			}
+            if (GENERATED_CONFIG_CHECK != EXPECTED_CONFIG_VERSION) {
+                array_push($errors,
+                    "Configuration option checker sanity_config.php is outdated, please recreate it using ./utils/regen_config_checks.sh");
+            }
 
-			foreach ($required_defines as $d) {
-				if (!defined($d)) {
-					array_push($errors,
-						"Required configuration file parameter $d is not defined in config.php. You might need to copy it from config.php-dist.");
-				}
-			}
+            foreach ($required_defines as $d) {
+                if (!defined($d)) {
+                    array_push($errors,
+                        "Required configuration file parameter $d is not defined in config.php. You might need to copy it from config.php-dist.");
+                }
+            }
 
-			if (SINGLE_USER_MODE && class_exists("PDO")) {
-			    $pdo = DB::pdo();
+            if (SINGLE_USER_MODE && class_exists("PDO")) {
+                $pdo = DB::pdo();
 
-				$res = $pdo->query("SELECT id FROM ttrss_users WHERE id = 1");
+                $res = $pdo->query("SELECT id FROM ttrss_users WHERE id = 1");
 
-				if (!$res->fetch()) {
-					array_push($errors, "SINGLE_USER_MODE is enabled in config.php but default admin account is not found.");
-				}
-			}
+                if (!$res->fetch()) {
+                    array_push($errors, "SINGLE_USER_MODE is enabled in config.php but default admin account is not found.");
+                }
+            }
 
-			$ref_self_url_path = make_self_url_path();
-			$ref_self_url_path = preg_replace("/\w+\.php$/", "", $ref_self_url_path);
+            $ref_self_url_path = make_self_url_path();
+            $ref_self_url_path = preg_replace("/\w+\.php$/", "", $ref_self_url_path);
 
-			if (SELF_URL_PATH == "http://example.org/tt-rss/") {
-				array_push($errors,
-						"Please set SELF_URL_PATH to the correct value for your server (possible value: <b>$ref_self_url_path</b>)");
-			}
+            if (SELF_URL_PATH == "http://example.org/tt-rss/") {
+                array_push($errors,
+                        "Please set SELF_URL_PATH to the correct value for your server (possible value: <b>$ref_self_url_path</b>)");
+            }
 
-			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)) {
-				array_push($errors,
-					"Please set SELF_URL_PATH to the correct value detected for your server: <b>$ref_self_url_path</b>");
-			}
+            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)) {
+                array_push($errors,
+                    "Please set SELF_URL_PATH to the correct value detected for your server: <b>$ref_self_url_path</b>");
+            }
 
-			if (!is_writable(ICONS_DIR)) {
-				array_push($errors, "ICONS_DIR defined in config.php is not writable (chmod -R 777 ".ICONS_DIR.").\n");
-			}
+            if (!is_writable(ICONS_DIR)) {
+                array_push($errors, "ICONS_DIR defined in config.php is not writable (chmod -R 777 ".ICONS_DIR.").\n");
+            }
 
-			if (!is_writable(LOCK_DIRECTORY)) {
-				array_push($errors, "LOCK_DIRECTORY defined in config.php is not writable (chmod -R 777 ".LOCK_DIRECTORY.").\n");
-			}
+            if (!is_writable(LOCK_DIRECTORY)) {
+                array_push($errors, "LOCK_DIRECTORY defined in config.php is not writable (chmod -R 777 ".LOCK_DIRECTORY.").\n");
+            }
 
-			if (!function_exists("curl_init") && !ini_get("allow_url_fopen")) {
-				array_push($errors, "PHP configuration option allow_url_fopen is disabled, and CURL functions are not present. Either enable allow_url_fopen or install PHP extension for CURL.");
-			}
+            if (!function_exists("curl_init") && !ini_get("allow_url_fopen")) {
+                array_push($errors, "PHP configuration option allow_url_fopen is disabled, and CURL functions are not present. Either enable allow_url_fopen or install PHP extension for CURL.");
+            }
 
-			if (!function_exists("json_encode")) {
-				array_push($errors, "PHP support for JSON is required, but was not found.");
-			}
+            if (!function_exists("json_encode")) {
+                array_push($errors, "PHP support for JSON is required, but was not found.");
+            }
 
-			if (DB_TYPE == "mysql" && !function_exists("mysqli_connect")) {
-				array_push($errors, "PHP support for MySQL is required for configured DB_TYPE in config.php.");
-			}
+            if (DB_TYPE == "mysql" && !function_exists("mysqli_connect")) {
+                array_push($errors, "PHP support for MySQL is required for configured DB_TYPE in config.php.");
+            }
 
-			if (DB_TYPE == "pgsql" && !function_exists("pg_connect")) {
-				array_push($errors, "PHP support for PostgreSQL is required for configured DB_TYPE in config.php");
-			}
+            if (DB_TYPE == "pgsql" && !function_exists("pg_connect")) {
+                array_push($errors, "PHP support for PostgreSQL is required for configured DB_TYPE in config.php");
+            }
 
-			if (!class_exists("PDO")) {
-				array_push($errors, "PHP support for PDO is required but was not found.");
-			}
+            if (!class_exists("PDO")) {
+                array_push($errors, "PHP support for PDO is required but was not found.");
+            }
 
-			if (!function_exists("mb_strlen")) {
-				array_push($errors, "PHP support for mbstring functions is required but was not found.");
-			}
+            if (!function_exists("mb_strlen")) {
+                array_push($errors, "PHP support for mbstring functions is required but was not found.");
+            }
 
-			if (!function_exists("hash")) {
-				array_push($errors, "PHP support for hash() function is required but was not found.");
-			}
+            if (!function_exists("hash")) {
+                array_push($errors, "PHP support for hash() function is required but was not found.");
+            }
 
-			if (ini_get("safe_mode")) {
-				array_push($errors, "PHP safe mode setting is obsolete and not supported by tt-rss.");
-			}
+            if (ini_get("safe_mode")) {
+                array_push($errors, "PHP safe mode setting is obsolete and not supported by tt-rss.");
+            }
 
-			if (!function_exists("mime_content_type")) {
-				array_push($errors, "PHP function mime_content_type() is missing, try enabling fileinfo module.");
-			}
+            if (!function_exists("mime_content_type")) {
+                array_push($errors, "PHP function mime_content_type() is missing, try enabling fileinfo module.");
+            }
 
-			if (!class_exists("DOMDocument")) {
-				array_push($errors, "PHP support for DOMDocument is required, but was not found.");
-			}
+            if (!class_exists("DOMDocument")) {
+                array_push($errors, "PHP support for DOMDocument is required, but was not found.");
+            }
 
-			if (DB_TYPE == "mysql") {
-				$bad_tables = check_mysql_tables();
+            if (DB_TYPE == "mysql") {
+                $bad_tables = check_mysql_tables();
 
-				if (count($bad_tables) > 0) {
-					$bad_tables_fmt = [];
+                if (count($bad_tables) > 0) {
+                    $bad_tables_fmt = [];
 
-					foreach ($bad_tables as $bt) {
-						array_push($bad_tables_fmt, sprintf("%s (%s)", $bt['table_name'], $bt['engine']));
-					}
+                    foreach ($bad_tables as $bt) {
+                        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
+                    $msg .= "<p>The only supported engine on MySQL is InnoDB. MyISAM lacks functionality to run
 						tt-rss.
 						Please backup your data (via OPML) and re-import the schema before continuing.</p>
 						<p><b>WARNING: importing the schema would mean LOSS OF ALL YOUR DATA.</b></p>";
 
 
-					array_push($errors, $msg);
-				}
-			}
-		}
+                    array_push($errors, $msg);
+                }
+            }
+        }
 
-		if (count($errors) > 0 && $_SERVER['REQUEST_URI']) { ?>
+        if (count($errors) > 0 && $_SERVER['REQUEST_URI']) { ?>
 			<!DOCTYPE html>
 			<html>
 			<head>
@@ -211,22 +211,22 @@ 
 		</html>
 
 		<?php
-			die;
-		} else if (count($errors) > 0) {
-			echo "Tiny Tiny RSS was unable to start properly. This usually means a misconfiguration or an incomplete upgrade.\n";
-			echo "Please fix errors indicated by the following messages:\n\n";
+            die;
+        } else if (count($errors) > 0) {
+            echo "Tiny Tiny RSS was unable to start properly. This usually means a misconfiguration or an incomplete upgrade.\n";
+            echo "Please fix errors indicated by the following messages:\n\n";
 
-			foreach ($errors as $error) {
-				echo " * $error\n";
-			}
+            foreach ($errors as $error) {
+                echo " * $error\n";
+            }
 
-			echo "\nYou might want to check tt-rss wiki or the forums for more information.\n";
-			echo "Please search the forums before creating new topic for your question.\n";
+            echo "\nYou might want to check tt-rss wiki or the forums for more information.\n";
+            echo "Please search the forums before creating new topic for your question.\n";
 
-			exit(-1);
-		}
-	}
+            exit(-1);
+        }
+    }
 
-	initial_sanity_check();
+    initial_sanity_check();
 
 ?>

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

Indentation +18 added lines, -18 removed lines

@@ -1,26 +1,26 @@
 <?php
-	require_once "functions.php";
+    require_once "functions.php";
 
-	spl_autoload_register(function($class) {
-		$namespace = '';
-		$class_name = $class;
+    spl_autoload_register(function($class) {
+        $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
+        $root_dir = dirname(__DIR__); // we're in tt-rss/include
 
-		// 1. third party libraries with namespaces are loaded from vendor/
-		// 2. internal tt-rss classes are loaded from classes/ and use special naming logic instead of namespaces
-		// 3. plugin classes are loaded by PluginHandler from plugins.local/ and plugins/ (TODO: use generic autoloader?)
+        // 1. third party libraries with namespaces are loaded from vendor/
+        // 2. internal tt-rss classes are loaded from classes/ and use special naming logic instead of namespaces
+        // 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";
-		} else {
-			$class_file = "$root_dir/classes/" . str_replace("_", "/", strtolower($class)) . ".php";
-		}
+        if ($namespace && $class_name) {
+            $class_file = "$root_dir/vendor/$namespace/" . str_replace('\\', '/', $class_name) . ".php";
+        } else {
+            $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;
 
-	});
+    });

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

Indentation +50 added lines, -50 removed lines

@@ -1,72 +1,72 @@
 <?php
 function format_backtrace($trace) {
-	$rv = "";
-	$idx = 1;
-
-	if (is_array($trace)) {
-		foreach ($trace as $e) {
-			if (isset($e["file"]) && isset($e["line"])) {
-				$fmt_args = [];
-
-				if (is_array($e["args"])) {
-					foreach ($e["args"] as $a) {
-						if (!is_object($a)) {
-							array_push($fmt_args, $a);
-						} else {
-							array_push($fmt_args, "[" . get_class($a) . "]");
-						}
-					}
-				}
-
-				$filename = str_replace(dirname(__DIR__) . "/", "", $e["file"]);
-
-				$rv .= sprintf("%d. %s(%s): %s(%s)\n",
-					$idx, $filename, $e["line"], $e["function"], implode(", ", $fmt_args));
-
-				$idx++;
-			}
-		}
-	}
-
-	return $rv;
+    $rv = "";
+    $idx = 1;
+
+    if (is_array($trace)) {
+        foreach ($trace as $e) {
+            if (isset($e["file"]) && isset($e["line"])) {
+                $fmt_args = [];
+
+                if (is_array($e["args"])) {
+                    foreach ($e["args"] as $a) {
+                        if (!is_object($a)) {
+                            array_push($fmt_args, $a);
+                        } else {
+                            array_push($fmt_args, "[" . get_class($a) . "]");
+                        }
+                    }
+                }
+
+                $filename = str_replace(dirname(__DIR__) . "/", "", $e["file"]);
+
+                $rv .= sprintf("%d. %s(%s): %s(%s)\n",
+                    $idx, $filename, $e["line"], $e["function"], implode(", ", $fmt_args));
+
+                $idx++;
+            }
+        }
+    }
+
+    return $rv;
 }
 
 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);
+    $file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
 
-	$context = format_backtrace(debug_backtrace());
-	$errstr = truncate_middle($errstr, 16384, " (...) ");
+    $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;
+    global $last_query;
 
-	$error = error_get_last();
+    $error = error_get_last();
 
-	if ($error !== null) {
-		$errno = $error["type"];
-		$file = $error["file"];
-		$line = $error["line"];
-		$errstr  = $error["message"];
+    if ($error !== null) {
+        $errno = $error["type"];
+        $file = $error["file"];
+        $line = $error["line"];
+        $errstr  = $error["message"];
 
-		if (!$errno) return false;
+        if (!$errno) return false;
 
-		$context = format_backtrace(debug_backtrace());
+        $context = format_backtrace(debug_backtrace());
 
-		$file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1);
+        $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;
+    return false;
 }
 
 register_shutdown_function('ttrss_fatal_handler');

prefs.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 		header("Location: install/");
 	}
 
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+	set_include_path(dirname(__FILE__)."/include".PATH_SEPARATOR.
 		get_include_path());
 
 	if (!file_exists("config.php")) {

Indentation +43 added lines, -43 removed lines

@@ -1,29 +1,29 @@ 
 <?php
-	if (file_exists("install") && !file_exists("config.php")) {
-		header("Location: install/");
-	}
+    if (file_exists("install") && !file_exists("config.php")) {
+        header("Location: install/");
+    }
 
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
-		get_include_path());
+    set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+        get_include_path());
 
-	if (!file_exists("config.php")) {
-		print "<b>Fatal Error</b>: You forgot to copy
+    if (!file_exists("config.php")) {
+        print "<b>Fatal Error</b>: You forgot to copy
 		<b>config.php-dist</b> to <b>config.php</b> and edit it.\n";
-		exit;
-	}
+        exit;
+    }
 
-	require_once "autoload.php";
-	require_once "sessions.php";
-	require_once "functions.php";
-	require_once "sanity_check.php";
-	require_once "config.php";
-	require_once "db-prefs.php";
+    require_once "autoload.php";
+    require_once "sessions.php";
+    require_once "functions.php";
+    require_once "sanity_check.php";
+    require_once "config.php";
+    require_once "db-prefs.php";
 
-	if (!init_plugins()) return;
+    if (!init_plugins()) return;
 
-	login_sequence();
+    login_sequence();
 
-	header('Content-Type: text/html; charset=utf-8');
+    header('Content-Type: text/html; charset=utf-8');
 ?>
 <!DOCTYPE html>
 <html>
@@ -32,12 +32,12 @@ 
     <meta name="viewport" content="initial-scale=1,width=device-width" />
 
 	<?php if ($_SESSION["uid"]) {
-		$theme = get_pref("USER_CSS_THEME", false, false);
-		if ($theme && theme_exists("$theme")) {
-			echo stylesheet_tag(get_theme_path($theme), 'theme_css');
-		}
-	}
-	?>
+        $theme = get_pref("USER_CSS_THEME", false, false);
+        if ($theme && theme_exists("$theme")) {
+            echo stylesheet_tag(get_theme_path($theme), 'theme_css');
+        }
+    }
+    ?>
 
 	<?php print_user_stylesheet() ?>
 
@@ -56,17 +56,17 @@ 
 	</script>
 
 	<?php
-	foreach (array("lib/prototype.js",
-				"lib/scriptaculous/scriptaculous.js?load=effects,controls",
-				"lib/dojo/dojo.js",
-				"lib/dojo/tt-rss-layer.js",
-				"js/common.js",
-				"js/prefs.js",
-				"errors.php?mode=js") as $jsfile) {
+    foreach (array("lib/prototype.js",
+                "lib/scriptaculous/scriptaculous.js?load=effects,controls",
+                "lib/dojo/dojo.js",
+                "lib/dojo/tt-rss-layer.js",
+                "js/common.js",
+                "js/prefs.js",
+                "errors.php?mode=js") as $jsfile) {
 
-		echo javascript_tag($jsfile);
+        echo javascript_tag($jsfile);
 
-	} ?>
+    } ?>
 
     <script type="text/javascript">
 		require({cache:{}});
@@ -74,22 +74,22 @@ 
 
 	<script type="text/javascript">
 	<?php
-		foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
-			if (method_exists($p, "get_prefs_js")) {
-				$script = $p->get_prefs_js();
+        foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
+            if (method_exists($p, "get_prefs_js")) {
+                $script = $p->get_prefs_js();
 
-				if ($script) {
-					echo "try {
+                if ($script) {
+                    echo "try {
 					    $script
 					} catch (e) {
                         console.warn('failed to initialize plugin JS: $n', e);
                     }";
-				}
-			}
-		}
+                }
+            }
+        }
 
-		init_js_translations();
-	?>
+        init_js_translations();
+    ?>
 	</script>
 
 	<style type="text/css">