codysnider / tt-rss

include/autoload.php

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

Braces +6 added lines, -4 removed lines

@@ -5,8 +5,9 @@ 
 		$namespace = '';
 		$class_name = $class;
 
-		if (strpos($class, '\\') !== false)
-			list ($namespace, $class_name) = explode('\\', $class, 2);
+		if (strpos($class, '\\') !== false) {
+					list ($namespace, $class_name) = explode('\\', $class, 2);
+		}
 
 		$root_dir = dirname(__DIR__); // we're in tt-rss/include
 
@@ -20,7 +21,8 @@ 
 			$class_file = "$root_dir/classes/" . str_replace("_", "/", strtolower($class)) . ".php";
 		}
 
-		if (file_exists($class_file))
-			include $class_file;
+		if (file_exists($class_file)) {
+					include $class_file;
+		}
 
 	});

include/sanity_check.php

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

Indentation +189 added lines, -189 removed lines

@@ -1,339 +1,339 @@
 <?php
 
 function print_select($id, $default, $values, $attributes = "", $name = "") {
-	if (!$name) $name = $id;
+    if (!$name) $name = $id;
 
-	print "<select name=\"$name\" id=\"$id\" $attributes>";
-	foreach ($values as $v) {
-		if ($v == $default)
-			$sel = "selected=\"1\"";
-		else
-			$sel = "";
+    print "<select name=\"$name\" id=\"$id\" $attributes>";
+    foreach ($values as $v) {
+        if ($v == $default)
+            $sel = "selected=\"1\"";
+        else
+            $sel = "";
 
-		$v = trim($v);
+        $v = trim($v);
 
-		print "<option value=\"$v\" $sel>$v</option>";
-	}
-	print "</select>";
+        print "<option value=\"$v\" $sel>$v</option>";
+    }
+    print "</select>";
 }
 
 function print_select_hash($id, $default, $values, $attributes = "", $name = "") {
-	if (!$name) $name = $id;
+    if (!$name) $name = $id;
 
-	print "<select name=\"$name\" id='$id' $attributes>";
-	foreach (array_keys($values) as $v) {
-		if ($v == $default)
-			$sel = 'selected="selected"';
-		else
-			$sel = "";
+    print "<select name=\"$name\" id='$id' $attributes>";
+    foreach (array_keys($values) as $v) {
+        if ($v == $default)
+            $sel = 'selected="selected"';
+        else
+            $sel = "";
 
-		$v = trim($v);
+        $v = trim($v);
 
-		print "<option $sel value=\"$v\">".$values[$v]."</option>";
-	}
+        print "<option $sel value=\"$v\">".$values[$v]."</option>";
+    }
 
-	print "</select>";
+    print "</select>";
 }
 
 function print_hidden($name, $value) {
-	print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"$name\" value=\"$value\">";
+    print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"$name\" value=\"$value\">";
 }
 
 function print_checkbox($id, $checked, $value = "", $attributes = "") {
-	$checked_str = $checked ? "checked" : "";
-	$value_str = $value ? "value=\"$value\"" : "";
+    $checked_str = $checked ? "checked" : "";
+    $value_str = $value ? "value=\"$value\"" : "";
 
-	print "<input dojoType=\"dijit.form.CheckBox\" id=\"$id\" $value_str $checked_str $attributes name=\"$id\">";
+    print "<input dojoType=\"dijit.form.CheckBox\" id=\"$id\" $value_str $checked_str $attributes name=\"$id\">";
 }
 
 function print_button($type, $value, $attributes = "") {
-	print "<p><button dojoType=\"dijit.form.Button\" $attributes type=\"$type\">$value</button>";
+    print "<p><button dojoType=\"dijit.form.Button\" $attributes type=\"$type\">$value</button>";
 }
 
 function print_radio($id, $default, $true_is, $values, $attributes = "") {
-	foreach ($values as $v) {
+    foreach ($values as $v) {
 
-		if ($v == $default)
-			$sel = "checked";
-		else
-			$sel = "";
+        if ($v == $default)
+            $sel = "checked";
+        else
+            $sel = "";
 
-		if ($v == $true_is) {
-			$sel .= " value=\"1\"";
-		} else {
-			$sel .= " value=\"0\"";
-		}
+        if ($v == $true_is) {
+            $sel .= " value=\"1\"";
+        } else {
+            $sel .= " value=\"0\"";
+        }
 
-		print "<input class=\"noborder\" dojoType=\"dijit.form.RadioButton\"
+        print "<input class=\"noborder\" dojoType=\"dijit.form.RadioButton\"
 				type=\"radio\" $sel $attributes name=\"$id\">&nbsp;$v&nbsp;";
 
-	}
+    }
 }
 
 function print_feed_multi_select($id, $default_ids = [],
-						   $attributes = "", $include_all_feeds = true,
-						   $root_id = null, $nest_level = 0) {
+                            $attributes = "", $include_all_feeds = true,
+                            $root_id = null, $nest_level = 0) {
 
-	$pdo = DB::pdo();
+    $pdo = DB::pdo();
 
-	print_r(in_array("CAT:6",$default_ids));
+    print_r(in_array("CAT:6",$default_ids));
 
-	if (!$root_id) {
-		print "<select multiple=\true\" id=\"$id\" name=\"$id\" $attributes>";
-		if ($include_all_feeds) {
-			$is_selected = (in_array("0", $default_ids)) ? "selected=\"1\"" : "";
-			print "<option $is_selected value=\"0\">".__('All feeds')."</option>";
-		}
-	}
+    if (!$root_id) {
+        print "<select multiple=\true\" id=\"$id\" name=\"$id\" $attributes>";
+        if ($include_all_feeds) {
+            $is_selected = (in_array("0", $default_ids)) ? "selected=\"1\"" : "";
+            print "<option $is_selected value=\"0\">".__('All feeds')."</option>";
+        }
+    }
 
-	if (get_pref('ENABLE_FEED_CATS')) {
+    if (get_pref('ENABLE_FEED_CATS')) {
 
-		if (!$root_id) $root_id = null;
+        if (!$root_id) $root_id = null;
 
-		$sth = $pdo->prepare("SELECT id,title,
+        $sth = $pdo->prepare("SELECT id,title,
 				(SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE
 					c2.parent_cat = ttrss_feed_categories.id) AS num_children
 				FROM ttrss_feed_categories
 				WHERE owner_uid = :uid AND
 				(parent_cat = :root_id OR (:root_id IS NULL AND parent_cat IS NULL)) ORDER BY title");
 
-		$sth->execute([":uid" => $_SESSION['uid'], ":root_id" => $root_id]);
+        $sth->execute([":uid" => $_SESSION['uid'], ":root_id" => $root_id]);
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			for ($i = 0; $i < $nest_level; $i++)
-				$line["title"] = " - " . $line["title"];
+            for ($i = 0; $i < $nest_level; $i++)
+                $line["title"] = " - " . $line["title"];
 
-			$is_selected = in_array("CAT:".$line["id"], $default_ids) ? "selected=\"1\"" : "";
+            $is_selected = in_array("CAT:".$line["id"], $default_ids) ? "selected=\"1\"" : "";
 
-			printf("<option $is_selected value='CAT:%d'>%s</option>",
-				$line["id"], htmlspecialchars($line["title"]));
+            printf("<option $is_selected value='CAT:%d'>%s</option>",
+                $line["id"], htmlspecialchars($line["title"]));
 
-			if ($line["num_children"] > 0)
-				print_feed_multi_select($id, $default_ids, $attributes,
-					$include_all_feeds, $line["id"], $nest_level+1);
+            if ($line["num_children"] > 0)
+                print_feed_multi_select($id, $default_ids, $attributes,
+                    $include_all_feeds, $line["id"], $nest_level+1);
 
-			$f_sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
+            $f_sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
 					WHERE cat_id = ? AND owner_uid = ? ORDER BY title");
 
-			$f_sth->execute([$line['id'], $_SESSION['uid']]);
+            $f_sth->execute([$line['id'], $_SESSION['uid']]);
 
-			while ($fline = $f_sth->fetch()) {
-				$is_selected = (in_array($fline["id"], $default_ids)) ? "selected=\"1\"" : "";
+            while ($fline = $f_sth->fetch()) {
+                $is_selected = (in_array($fline["id"], $default_ids)) ? "selected=\"1\"" : "";
 
-				$fline["title"] = " + " . $fline["title"];
+                $fline["title"] = " + " . $fline["title"];
 
-				for ($i = 0; $i < $nest_level; $i++)
-					$fline["title"] = " - " . $fline["title"];
+                for ($i = 0; $i < $nest_level; $i++)
+                    $fline["title"] = " - " . $fline["title"];
 
-				printf("<option $is_selected value='%d'>%s</option>",
-					$fline["id"], htmlspecialchars($fline["title"]));
-			}
-		}
+                printf("<option $is_selected value='%d'>%s</option>",
+                    $fline["id"], htmlspecialchars($fline["title"]));
+            }
+        }
 
-		if (!$root_id) {
-			$is_selected = in_array("CAT:0", $default_ids) ? "selected=\"1\"" : "";
+        if (!$root_id) {
+            $is_selected = in_array("CAT:0", $default_ids) ? "selected=\"1\"" : "";
 
-			printf("<option $is_selected value='CAT:0'>%s</option>",
-				__("Uncategorized"));
+            printf("<option $is_selected value='CAT:0'>%s</option>",
+                __("Uncategorized"));
 
-			$f_sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
+            $f_sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
 					WHERE cat_id IS NULL AND owner_uid = ? ORDER BY title");
-			$f_sth->execute([$_SESSION['uid']]);
+            $f_sth->execute([$_SESSION['uid']]);
 
-			while ($fline = $f_sth->fetch()) {
-				$is_selected = in_array($fline["id"], $default_ids) ? "selected=\"1\"" : "";
+            while ($fline = $f_sth->fetch()) {
+                $is_selected = in_array($fline["id"], $default_ids) ? "selected=\"1\"" : "";
 
-				$fline["title"] = " + " . $fline["title"];
+                $fline["title"] = " + " . $fline["title"];
 
-				for ($i = 0; $i < $nest_level; $i++)
-					$fline["title"] = " - " . $fline["title"];
+                for ($i = 0; $i < $nest_level; $i++)
+                    $fline["title"] = " - " . $fline["title"];
 
-				printf("<option $is_selected value='%d'>%s</option>",
-					$fline["id"], htmlspecialchars($fline["title"]));
-			}
-		}
+                printf("<option $is_selected value='%d'>%s</option>",
+                    $fline["id"], htmlspecialchars($fline["title"]));
+            }
+        }
 
-	} else {
-		$sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
+    } else {
+        $sth = $pdo->prepare("SELECT id,title FROM ttrss_feeds
 				WHERE owner_uid = ? ORDER BY title");
-		$sth->execute([$_SESSION['uid']]);
+        $sth->execute([$_SESSION['uid']]);
 
-		while ($line = $sth->fetch()) {
+        while ($line = $sth->fetch()) {
 
-			$is_selected = (in_array($line["id"], $default_ids)) ? "selected=\"1\"" : "";
+            $is_selected = (in_array($line["id"], $default_ids)) ? "selected=\"1\"" : "";
 
-			printf("<option $is_selected value='%d'>%s</option>",
-				$line["id"], htmlspecialchars($line["title"]));
-		}
-	}
+            printf("<option $is_selected value='%d'>%s</option>",
+                $line["id"], htmlspecialchars($line["title"]));
+        }
+    }
 
-	if (!$root_id) {
-		print "</select>";
-	}
+    if (!$root_id) {
+        print "</select>";
+    }
 }
 
 function print_feed_cat_select($id, $default_id,
-							   $attributes, $include_all_cats = true, $root_id = null, $nest_level = 0) {
+                                $attributes, $include_all_cats = true, $root_id = null, $nest_level = 0) {
 
-	if (!$root_id) {
-		print "<select id=\"$id\" name=\"$id\" default=\"$default_id\" $attributes>";
-	}
+    if (!$root_id) {
+        print "<select id=\"$id\" name=\"$id\" default=\"$default_id\" $attributes>";
+    }
 
-	$pdo = DB::pdo();
+    $pdo = DB::pdo();
 
-	if (!$root_id) $root_id = null;
+    if (!$root_id) $root_id = null;
 
-	$sth = $pdo->prepare("SELECT id,title,
+    $sth = $pdo->prepare("SELECT id,title,
 				(SELECT COUNT(id) FROM ttrss_feed_categories AS c2 WHERE
 					c2.parent_cat = ttrss_feed_categories.id) AS num_children
 				FROM ttrss_feed_categories
 				WHERE owner_uid = :uid AND
 				  (parent_cat = :root_id OR (:root_id IS NULL AND parent_cat IS NULL)) ORDER BY title");
-	$sth->execute([":uid" => $_SESSION['uid'], ":root_id" => $root_id]);
-
-	$found = 0;
-
-	while ($line = $sth->fetch()) {
-		++$found;
-
-		if ($line["id"] == $default_id) {
-			$is_selected = "selected=\"1\"";
-		} else {
-			$is_selected = "";
-		}
-
-		for ($i = 0; $i < $nest_level; $i++)
-			$line["title"] = " - " . $line["title"];
-
-		if ($line["title"])
-			printf("<option $is_selected value='%d'>%s</option>",
-				$line["id"], htmlspecialchars($line["title"]));
-
-		if ($line["num_children"] > 0)
-			print_feed_cat_select($id, $default_id, $attributes,
-				$include_all_cats, $line["id"], $nest_level+1);
-	}
-
-	if (!$root_id) {
-		if ($include_all_cats) {
-			if ($found > 0) {
-				print "<option disabled=\"1\">--------</option>";
-			}
-
-			if ($default_id == 0) {
-				$is_selected = "selected=\"1\"";
-			} else {
-				$is_selected = "";
-			}
-
-			print "<option $is_selected value=\"0\">".__('Uncategorized')."</option>";
-		}
-		print "</select>";
-	}
+    $sth->execute([":uid" => $_SESSION['uid'], ":root_id" => $root_id]);
+
+    $found = 0;
+
+    while ($line = $sth->fetch()) {
+        ++$found;
+
+        if ($line["id"] == $default_id) {
+            $is_selected = "selected=\"1\"";
+        } else {
+            $is_selected = "";
+        }
+
+        for ($i = 0; $i < $nest_level; $i++)
+            $line["title"] = " - " . $line["title"];
+
+        if ($line["title"])
+            printf("<option $is_selected value='%d'>%s</option>",
+                $line["id"], htmlspecialchars($line["title"]));
+
+        if ($line["num_children"] > 0)
+            print_feed_cat_select($id, $default_id, $attributes,
+                $include_all_cats, $line["id"], $nest_level+1);
+    }
+
+    if (!$root_id) {
+        if ($include_all_cats) {
+            if ($found > 0) {
+                print "<option disabled=\"1\">--------</option>";
+            }
+
+            if ($default_id == 0) {
+                $is_selected = "selected=\"1\"";
+            } else {
+                $is_selected = "";
+            }
+
+            print "<option $is_selected value=\"0\">".__('Uncategorized')."</option>";
+        }
+        print "</select>";
+    }
 }
 
 function stylesheet_tag($filename, $id = false) {
-	$timestamp = filemtime($filename);
+    $timestamp = filemtime($filename);
 
-	$id_part = $id ? "id=\"$id\"" : "";
+    $id_part = $id ? "id=\"$id\"" : "";
 
-	return "<link rel=\"stylesheet\" $id_part type=\"text/css\" data-orig-href=\"$filename\" href=\"$filename?$timestamp\"/>\n";
+    return "<link rel=\"stylesheet\" $id_part type=\"text/css\" data-orig-href=\"$filename\" href=\"$filename?$timestamp\"/>\n";
 }
 
 function javascript_tag($filename) {
-	$query = "";
+    $query = "";
 
-	if (!(strpos($filename, "?") === false)) {
-		$query = substr($filename, strpos($filename, "?")+1);
-		$filename = substr($filename, 0, strpos($filename, "?"));
-	}
+    if (!(strpos($filename, "?") === false)) {
+        $query = substr($filename, strpos($filename, "?")+1);
+        $filename = substr($filename, 0, strpos($filename, "?"));
+    }
 
-	$timestamp = filemtime($filename);
+    $timestamp = filemtime($filename);
 
-	if ($query) $timestamp .= "&$query";
+    if ($query) $timestamp .= "&$query";
 
-	return "<script type=\"text/javascript\" charset=\"utf-8\" src=\"$filename?$timestamp\"></script>\n";
+    return "<script type=\"text/javascript\" charset=\"utf-8\" src=\"$filename?$timestamp\"></script>\n";
 }
 
 function format_warning($msg, $id = "") {
-	return "<div class=\"alert\" id=\"$id\">$msg</div>";
+    return "<div class=\"alert\" id=\"$id\">$msg</div>";
 }
 
 function format_notice($msg, $id = "") {
-	return "<div class=\"alert alert-info\" id=\"$id\">$msg</div>";
+    return "<div class=\"alert alert-info\" id=\"$id\">$msg</div>";
 }
 
 function format_error($msg, $id = "") {
-	return "<div class=\"alert alert-danger\" id=\"$id\">$msg</div>";
+    return "<div class=\"alert alert-danger\" id=\"$id\">$msg</div>";
 }
 
 function print_notice($msg) {
-	return print format_notice($msg);
+    return print format_notice($msg);
 }
 
 function print_warning($msg) {
-	return print format_warning($msg);
+    return print format_warning($msg);
 }
 
 function print_error($msg) {
-	return print format_error($msg);
+    return print format_error($msg);
 }
 
 function format_inline_player($url, $ctype) {
 
-	$entry = "";
+    $entry = "";
 
-	$url = htmlspecialchars($url);
+    $url = htmlspecialchars($url);
 
-	if (strpos($ctype, "audio/") === 0) {
+    if (strpos($ctype, "audio/") === 0) {
 
-		$entry .= "<div class='inline-player'>";
+        $entry .= "<div class='inline-player'>";
 
-		if ($_SESSION["hasAudio"] && (strpos($ctype, "ogg") !== false ||
-				$_SESSION["hasMp3"])) {
+        if ($_SESSION["hasAudio"] && (strpos($ctype, "ogg") !== false ||
+                $_SESSION["hasMp3"])) {
 
-			$entry .= "<audio preload=\"none\" controls>
+            $entry .= "<audio preload=\"none\" controls>
 					<source type=\"$ctype\" src=\"$url\"/>
 					</audio> ";
 
-		}
+        }
 
-		if ($entry) $entry .= "<a target=\"_blank\" rel=\"noopener noreferrer\"
+        if ($entry) $entry .= "<a target=\"_blank\" rel=\"noopener noreferrer\"
 				href=\"$url\">" . basename($url) . "</a>";
 
-		$entry .= "</div>";
+        $entry .= "</div>";
 
-		return $entry;
+        return $entry;
 
-	}
+    }
 
-	return "";
+    return "";
 }
 
 function print_label_select($name, $value, $attributes = "") {
 
-	$pdo = Db::pdo();
+    $pdo = Db::pdo();
 
-	$sth = $pdo->prepare("SELECT caption FROM ttrss_labels2
+    $sth = $pdo->prepare("SELECT caption FROM ttrss_labels2
 			WHERE owner_uid = ? ORDER BY caption");
-	$sth->execute([$_SESSION['uid']]);
+    $sth->execute([$_SESSION['uid']]);
 
-	print "<select default=\"$value\" name=\"" . htmlspecialchars($name) .
-		"\" $attributes>";
+    print "<select default=\"$value\" name=\"" . htmlspecialchars($name) .
+        "\" $attributes>";
 
-	while ($line = $sth->fetch()) {
+    while ($line = $sth->fetch()) {
 
-		$issel = ($line["caption"] == $value) ? "selected=\"1\"" : "";
+        $issel = ($line["caption"] == $value) ? "selected=\"1\"" : "";
 
-		print "<option value=\"".htmlspecialchars($line["caption"])."\"
+        print "<option value=\"".htmlspecialchars($line["caption"])."\"
 				$issel>" . htmlspecialchars($line["caption"]) . "</option>";
 
-	}
+    }
 
 #		print "<option value=\"ADD_LABEL\">" .__("Add label...") . "</option>";
 
-	print "</select>";
+    print "</select>";
 
 
 }

Spacing +13 added lines, -13 removed lines

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

install/index.php

Indentation +261 added lines, -261 removed lines

@@ -1,26 +1,26 @@ 
 <?php
-	function stylesheet_tag($filename, $id = false) {
-		$timestamp = filemtime($filename);
+    function stylesheet_tag($filename, $id = false) {
+        $timestamp = filemtime($filename);
 
-		$id_part = $id ? "id=\"$id\"" : "";
+        $id_part = $id ? "id=\"$id\"" : "";
 
-		return "<link rel=\"stylesheet\" $id_part type=\"text/css\" href=\"$filename?$timestamp\"/>\n";
-	}
+        return "<link rel=\"stylesheet\" $id_part type=\"text/css\" href=\"$filename?$timestamp\"/>\n";
+    }
 
-	function javascript_tag($filename) {
-		$query = "";
+    function javascript_tag($filename) {
+        $query = "";
 
-		if (!(strpos($filename, "?") === false)) {
-			$query = substr($filename, strpos($filename, "?")+1);
-			$filename = substr($filename, 0, strpos($filename, "?"));
-		}
+        if (!(strpos($filename, "?") === false)) {
+            $query = substr($filename, strpos($filename, "?")+1);
+            $filename = substr($filename, 0, strpos($filename, "?"));
+        }
 
-		$timestamp = filemtime($filename);
+        $timestamp = filemtime($filename);
 
-		if ($query) $timestamp .= "&$query";
+        if ($query) $timestamp .= "&$query";
 
-		return "<script type=\"text/javascript\" charset=\"utf-8\" src=\"$filename?$timestamp\"></script>\n";
-	}
+        return "<script type=\"text/javascript\" charset=\"utf-8\" src=\"$filename?$timestamp\"></script>\n";
+    }
 ?>
 <!DOCTYPE html>
 <html>
@@ -31,11 +31,11 @@ 
 		textarea { font-size : 12px; }
 	</style>
 	<?php
-		echo stylesheet_tag("../css/default.css");
-		echo javascript_tag("../lib/prototype.js");
-		echo javascript_tag("../lib/dojo/dojo.js");
-		echo javascript_tag("../lib/dojo/tt-rss-layer.js");
-	?>
+        echo stylesheet_tag("../css/default.css");
+        echo javascript_tag("../lib/prototype.js");
+        echo javascript_tag("../lib/dojo/dojo.js");
+        echo javascript_tag("../lib/dojo/tt-rss-layer.js");
+    ?>
 </head>
 <body class="flat ttrss_utility installer">
 
@@ -50,149 +50,149 @@ 
 
 <?php
 
-	// could be needed because of existing config.php
-	function define_default($param, $value) {
-		//
-	}
+    // could be needed because of existing config.php
+    function define_default($param, $value) {
+        //
+    }
 
-	function make_password($length = 12) {
-		$password = "";
-		$possible = "0123456789abcdfghjkmnpqrstvwxyzABCDFGHJKMNPQRSTVWXYZ*%+^";
+    function make_password($length = 12) {
+        $password = "";
+        $possible = "0123456789abcdfghjkmnpqrstvwxyzABCDFGHJKMNPQRSTVWXYZ*%+^";
 
-		$i = 0;
+        $i = 0;
 
-		while ($i < $length) {
+        while ($i < $length) {
 
-			try {
-				$idx = function_exists("random_int") ? random_int(0, strlen($possible) - 1) : mt_rand(0, strlen($possible) - 1);
-			} catch (Exception $e) {
-				$idx = mt_rand(0, strlen($possible) - 1);
-			}
+            try {
+                $idx = function_exists("random_int") ? random_int(0, strlen($possible) - 1) : mt_rand(0, strlen($possible) - 1);
+            } catch (Exception $e) {
+                $idx = mt_rand(0, strlen($possible) - 1);
+            }
 
-			$char = substr($possible, $idx, 1);
+            $char = substr($possible, $idx, 1);
 
-			if (!strstr($password, $char)) {
-				$password .= $char;
-				$i++;
-			}
-		}
+            if (!strstr($password, $char)) {
+                $password .= $char;
+                $i++;
+            }
+        }
 
-		return $password;
-	}
+        return $password;
+    }
 
 
-	function sanity_check($db_type) {
-		$errors = array();
+    function sanity_check($db_type) {
+        $errors = array();
 
-		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 (!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 (!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 (!function_exists("iconv")) {
-			array_push($errors, "PHP support for iconv is required to handle multiple charsets.");
-		}
+        if (!function_exists("iconv")) {
+            array_push($errors, "PHP support for iconv is required to handle multiple charsets.");
+        }
 
-		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 (!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.");
+        }
 
-		return $errors;
-	}
+        return $errors;
+    }
 
-	function print_error($msg) {
-		print "<div class='alert alert-error'>$msg</div>";
-	}
+    function print_error($msg) {
+        print "<div class='alert alert-error'>$msg</div>";
+    }
 
-	function print_notice($msg) {
-		print "<div class=\"alert alert-info\">$msg</div>";
-	}
+    function print_notice($msg) {
+        print "<div class=\"alert alert-info\">$msg</div>";
+    }
 
-	function pdo_connect($host, $user, $pass, $db, $type, $port = false) {
+    function pdo_connect($host, $user, $pass, $db, $type, $port = false) {
 
-		$db_port = $port ? ';port=' . $port : '';
-		$db_host = $host ? ';host=' . $host : '';
+        $db_port = $port ? ';port=' . $port : '';
+        $db_host = $host ? ';host=' . $host : '';
 
-		try {
-			$pdo = new PDO($type . ':dbname=' . $db . $db_host . $db_port,
-				$user,
-				$pass);
+        try {
+            $pdo = new PDO($type . ':dbname=' . $db . $db_host . $db_port,
+                $user,
+                $pass);
 
-			return $pdo;
-		} catch (Exception $e) {
-		    print "<div class='alert alert-danger'>" . $e->getMessage() . "</div>";
-		    return null;
+            return $pdo;
+        } catch (Exception $e) {
+            print "<div class='alert alert-danger'>" . $e->getMessage() . "</div>";
+            return null;
         }
-	}
-
-	function make_config($DB_TYPE, $DB_HOST, $DB_USER, $DB_NAME, $DB_PASS,
-			$DB_PORT, $SELF_URL_PATH) {
-
-		$data = explode("\n", file_get_contents("../config.php-dist"));
-
-		$rv = "";
-
-		$finished = false;
-
-		foreach ($data as $line) {
-			if (preg_match("/define\('DB_TYPE'/", $line)) {
-				$rv .= "\tdefine('DB_TYPE', '$DB_TYPE');\n";
-			} else if (preg_match("/define\('DB_HOST'/", $line)) {
-				$rv .= "\tdefine('DB_HOST', '$DB_HOST');\n";
-			} else if (preg_match("/define\('DB_USER'/", $line)) {
-				$rv .= "\tdefine('DB_USER', '$DB_USER');\n";
-			} else if (preg_match("/define\('DB_NAME'/", $line)) {
-				$rv .= "\tdefine('DB_NAME', '$DB_NAME');\n";
-			} else if (preg_match("/define\('DB_PASS'/", $line)) {
-				$rv .= "\tdefine('DB_PASS', '$DB_PASS');\n";
-			} else if (preg_match("/define\('DB_PORT'/", $line)) {
-				$rv .= "\tdefine('DB_PORT', '$DB_PORT');\n";
-			} else if (preg_match("/define\('SELF_URL_PATH'/", $line)) {
-				$rv .= "\tdefine('SELF_URL_PATH', '$SELF_URL_PATH');\n";
-			} else if (!$finished) {
-				$rv .= "$line\n";
-			}
-
-			if (preg_match("/\?\>/", $line)) {
-				$finished = true;
-			}
-		}
-
-		return $rv;
-	}
-
-	function is_server_https() {
-		return (!empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] != 'off')) || (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https');
-	}
-
-	function make_self_url_path() {
-		$url_path = (is_server_https() ? 'https://' :  'http://') . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
-
-		return $url_path;
-	}
+    }
+
+    function make_config($DB_TYPE, $DB_HOST, $DB_USER, $DB_NAME, $DB_PASS,
+            $DB_PORT, $SELF_URL_PATH) {
+
+        $data = explode("\n", file_get_contents("../config.php-dist"));
+
+        $rv = "";
+
+        $finished = false;
+
+        foreach ($data as $line) {
+            if (preg_match("/define\('DB_TYPE'/", $line)) {
+                $rv .= "\tdefine('DB_TYPE', '$DB_TYPE');\n";
+            } else if (preg_match("/define\('DB_HOST'/", $line)) {
+                $rv .= "\tdefine('DB_HOST', '$DB_HOST');\n";
+            } else if (preg_match("/define\('DB_USER'/", $line)) {
+                $rv .= "\tdefine('DB_USER', '$DB_USER');\n";
+            } else if (preg_match("/define\('DB_NAME'/", $line)) {
+                $rv .= "\tdefine('DB_NAME', '$DB_NAME');\n";
+            } else if (preg_match("/define\('DB_PASS'/", $line)) {
+                $rv .= "\tdefine('DB_PASS', '$DB_PASS');\n";
+            } else if (preg_match("/define\('DB_PORT'/", $line)) {
+                $rv .= "\tdefine('DB_PORT', '$DB_PORT');\n";
+            } else if (preg_match("/define\('SELF_URL_PATH'/", $line)) {
+                $rv .= "\tdefine('SELF_URL_PATH', '$SELF_URL_PATH');\n";
+            } else if (!$finished) {
+                $rv .= "$line\n";
+            }
+
+            if (preg_match("/\?\>/", $line)) {
+                $finished = true;
+            }
+        }
+
+        return $rv;
+    }
+
+    function is_server_https() {
+        return (!empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] != 'off')) || (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https');
+    }
+
+    function make_self_url_path() {
+        $url_path = (is_server_https() ? 'https://' :  'http://') . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
+
+        return $url_path;
+    }
 
 ?>
 
@@ -202,32 +202,32 @@ 
 
 <?php
 
-	if (file_exists("../config.php")) {
-		require "../config.php";
+    if (file_exists("../config.php")) {
+        require "../config.php";
 
-		if (!defined('_INSTALLER_IGNORE_CONFIG_CHECK')) {
-			print_error("Error: config.php already exists in tt-rss directory; aborting.");
+        if (!defined('_INSTALLER_IGNORE_CONFIG_CHECK')) {
+            print_error("Error: config.php already exists in tt-rss directory; aborting.");
 
-			print "<form method='GET' action='../index.php'>
+            print "<form method='GET' action='../index.php'>
 				<button type='submit' dojoType='dijit.form.Button' class='alt-primary'>Return to Tiny Tiny RSS</button>
 				</form>";
-			exit;
-		}
-	}
-
-	@$op = $_REQUEST['op'];
-
-	@$DB_HOST = strip_tags($_POST['DB_HOST']);
-	@$DB_TYPE = strip_tags($_POST['DB_TYPE']);
-	@$DB_USER = strip_tags($_POST['DB_USER']);
-	@$DB_NAME = strip_tags($_POST['DB_NAME']);
-	@$DB_PASS = strip_tags($_POST['DB_PASS']);
-	@$DB_PORT = strip_tags($_POST['DB_PORT']);
-	@$SELF_URL_PATH = strip_tags($_POST['SELF_URL_PATH']);
-
-	if (!$SELF_URL_PATH) {
-		$SELF_URL_PATH = preg_replace("/\/install\/$/", "/", make_self_url_path());
-	}
+            exit;
+        }
+    }
+
+    @$op = $_REQUEST['op'];
+
+    @$DB_HOST = strip_tags($_POST['DB_HOST']);
+    @$DB_TYPE = strip_tags($_POST['DB_TYPE']);
+    @$DB_USER = strip_tags($_POST['DB_USER']);
+    @$DB_NAME = strip_tags($_POST['DB_NAME']);
+    @$DB_PASS = strip_tags($_POST['DB_PASS']);
+    @$DB_PORT = strip_tags($_POST['DB_PORT']);
+    @$SELF_URL_PATH = strip_tags($_POST['SELF_URL_PATH']);
+
+    if (!$SELF_URL_PATH) {
+        $SELF_URL_PATH = preg_replace("/\/install\/$/", "/", make_self_url_path());
+    }
 ?>
 
 <form action="" method="post">
@@ -236,9 +236,9 @@ 
 	<h2>Database settings</h2>
 
 	<?php
-		$issel_pgsql = $DB_TYPE == "pgsql" ? "selected='selected'" : "";
-		$issel_mysql = $DB_TYPE == "mysql" ? "selected='selected'" : "";
-	?>
+        $issel_pgsql = $DB_TYPE == "pgsql" ? "selected='selected'" : "";
+        $issel_mysql = $DB_TYPE == "mysql" ? "selected='selected'" : "";
+    ?>
 
 	<fieldset>
 		<label>Database type:</label>
@@ -292,87 +292,87 @@ 
 	<h2>Checking configuration</h2>
 
 	<?php
-		$errors = sanity_check($DB_TYPE);
+        $errors = sanity_check($DB_TYPE);
 
-		if (count($errors) > 0) {
-			print "<p>Some configuration tests failed. Please correct them before continuing.</p>";
+        if (count($errors) > 0) {
+            print "<p>Some configuration tests failed. Please correct them before continuing.</p>";
 
-			print "<ul>";
+            print "<ul>";
 
-			foreach ($errors as $error) {
-				print "<li style='color : red'>$error</li>";
-			}
+            foreach ($errors as $error) {
+                print "<li style='color : red'>$error</li>";
+            }
 
-			print "</ul>";
+            print "</ul>";
 
-			exit;
-		}
+            exit;
+        }
 
-		$notices = array();
+        $notices = array();
 
-		if (!function_exists("curl_init")) {
-			array_push($notices, "It is highly recommended to enable support for CURL in PHP.");
-		}
+        if (!function_exists("curl_init")) {
+            array_push($notices, "It is highly recommended to enable support for CURL in PHP.");
+        }
 
-		if (function_exists("curl_init") && ini_get("open_basedir")) {
-			array_push($notices, "CURL and open_basedir combination breaks support for HTTP redirects. See the FAQ for more information.");
-		}
+        if (function_exists("curl_init") && ini_get("open_basedir")) {
+            array_push($notices, "CURL and open_basedir combination breaks support for HTTP redirects. See the FAQ for more information.");
+        }
 
-		if (!function_exists("idn_to_ascii")) {
-			array_push($notices, "PHP support for Internationalization Functions is required to handle Internationalized Domain Names.");
-		}
+        if (!function_exists("idn_to_ascii")) {
+            array_push($notices, "PHP support for Internationalization Functions is required to handle Internationalized Domain Names.");
+        }
 
         if ($DB_TYPE == "mysql" && !function_exists("mysqli_connect")) {
             array_push($notices, "PHP extension for MySQL (mysqli) is missing. This may prevent legacy plugins from working.");
         }
 
         if ($DB_TYPE == "pgsql" && !function_exists("pg_connect")) {
-			array_push($notices, "PHP extension for PostgreSQL is missing. This may prevent legacy plugins from working.");
+            array_push($notices, "PHP extension for PostgreSQL is missing. This may prevent legacy plugins from working.");
         }
 
-		if (count($notices) > 0) {
-			print_notice("Configuration check succeeded with minor problems:");
+        if (count($notices) > 0) {
+            print_notice("Configuration check succeeded with minor problems:");
 
-			print "<ul>";
+            print "<ul>";
 
-			foreach ($notices as $notice) {
-				print "<li>$notice</li>";
-			}
+            foreach ($notices as $notice) {
+                print "<li>$notice</li>";
+            }
 
-			print "</ul>";
-		} else {
-			print_notice("Configuration check succeeded.");
-		}
+            print "</ul>";
+        } else {
+            print_notice("Configuration check succeeded.");
+        }
 
-	?>
+    ?>
 
 	<h2>Checking database</h2>
 
 	<?php
-		$pdo = pdo_connect($DB_HOST, $DB_USER, $DB_PASS, $DB_NAME, $DB_TYPE, $DB_PORT);
+        $pdo = pdo_connect($DB_HOST, $DB_USER, $DB_PASS, $DB_NAME, $DB_TYPE, $DB_PORT);
 
-		if (!$pdo) {
-			print_error("Unable to connect to database using specified parameters (driver: $DB_TYPE).");
-			exit;
-		}
+        if (!$pdo) {
+            print_error("Unable to connect to database using specified parameters (driver: $DB_TYPE).");
+            exit;
+        }
 
-		print_notice("Database test succeeded.");
-	?>
+        print_notice("Database test succeeded.");
+    ?>
 
 	<h2>Initialize database</h2>
 
 	<p>Before you can start using tt-rss, database needs to be initialized. Click on the button below to do that now.</p>
 
 	<?php
-		$res = $pdo->query("SELECT true FROM ttrss_feeds");
+        $res = $pdo->query("SELECT true FROM ttrss_feeds");
 
-		if ($res && $res->fetch()) {
-			print_error("Some tt-rss data already exists in this database. If you continue with database initialization your current data <b>WILL BE LOST</b>.");
-			$need_confirm = true;
-		} else {
-			$need_confirm = false;
-		}
-	?>
+        if ($res && $res->fetch()) {
+            print_error("Some tt-rss data already exists in this database. If you continue with database initialization your current data <b>WILL BE LOST</b>.");
+            $need_confirm = true;
+        } else {
+            $need_confirm = false;
+        }
+    ?>
 
 	<table><tr><td>
 	<form method="post">
@@ -415,44 +415,44 @@ 
 
 	<?php
 
-		} else if ($op == 'installschema' || $op == 'skipschema') {
+        } else if ($op == 'installschema' || $op == 'skipschema') {
 
-			$pdo = pdo_connect($DB_HOST, $DB_USER, $DB_PASS, $DB_NAME, $DB_TYPE, $DB_PORT);
+            $pdo = pdo_connect($DB_HOST, $DB_USER, $DB_PASS, $DB_NAME, $DB_TYPE, $DB_PORT);
 
-			if (!$pdo) {
-				print_error("Unable to connect to database using specified parameters.");
-				exit;
-			}
+            if (!$pdo) {
+                print_error("Unable to connect to database using specified parameters.");
+                exit;
+            }
 
-			if ($op == 'installschema') {
+            if ($op == 'installschema') {
 
-				print "<h2>Initializing database...</h2>";
+                print "<h2>Initializing database...</h2>";
 
-				$lines = explode(";", preg_replace("/[\r\n]/", "",
+                $lines = explode(";", preg_replace("/[\r\n]/", "",
                     file_get_contents("../schema/ttrss_schema_".basename($DB_TYPE).".sql")));
 
-				foreach ($lines as $line) {
-					if (strpos($line, "--") !== 0 && $line) {
-						$res = $pdo->query($line);
+                foreach ($lines as $line) {
+                    if (strpos($line, "--") !== 0 && $line) {
+                        $res = $pdo->query($line);
 
-						if (!$res) {
-							print_notice("Query: $line");
-							print_error("Error: " . implode(", ", $pdo->errorInfo()));
+                        if (!$res) {
+                            print_notice("Query: $line");
+                            print_error("Error: " . implode(", ", $pdo->errorInfo()));
                         }
-					}
-				}
+                    }
+                }
 
-				print_notice("Database initialization completed.");
+                print_notice("Database initialization completed.");
 
-			} else {
-				print_notice("Database initialization skipped.");
-			}
+            } else {
+                print_notice("Database initialization skipped.");
+            }
 
-			print "<h2>Generated configuration file</h2>";
+            print "<h2>Generated configuration file</h2>";
 
-			print "<p>Copy following text and save as <code>config.php</code> in tt-rss main directory. It is suggested to read through the file to the end in case you need any options changed fom default values.</p>";
+            print "<p>Copy following text and save as <code>config.php</code> in tt-rss main directory. It is suggested to read through the file to the end in case you need any options changed fom default values.</p>";
 
-			print "<p>After copying the file, you will be able to login with default username and password combination: <code>admin</code> and <code>password</code>. Don't forget to change the password immediately!</p>"; ?>
+            print "<p>After copying the file, you will be able to login with default username and password combination: <code>admin</code> and <code>password</code>. Don't forget to change the password immediately!</p>"; ?>
 
 			<form action="" method="post">
 				<input type="hidden" name="op" value="saveconfig">
@@ -464,9 +464,9 @@ 
 				<input type="hidden" name="DB_TYPE" value="<?php echo $DB_TYPE ?>"/>
 				<input type="hidden" name="SELF_URL_PATH" value="<?php echo $SELF_URL_PATH ?>"/>
 			<?php print "<textarea rows='20' style='width : 100%'>";
-			echo make_config($DB_TYPE, $DB_HOST, $DB_USER, $DB_NAME, $DB_PASS,
-				$DB_PORT, $SELF_URL_PATH);
-			print "</textarea>"; ?>
+            echo make_config($DB_TYPE, $DB_HOST, $DB_USER, $DB_NAME, $DB_PASS,
+                $DB_PORT, $SELF_URL_PATH);
+            print "</textarea>"; ?>
 
 			<hr/>
 
@@ -476,40 +476,40 @@ 
 				<p><button type="submit" dojoType='dijit.form.Button' class='alt-primary'>Save configuration</button></p>
 				</form>
 			<?php } else {
-				print_error("Unfortunately, parent directory is not writable, so we're unable to save config.php automatically.");
-			}
+                print_error("Unfortunately, parent directory is not writable, so we're unable to save config.php automatically.");
+            }
 
-		   print_notice("You can generate the file again by changing the form above.");
+            print_notice("You can generate the file again by changing the form above.");
 
-		} else if ($op == "saveconfig") {
+        } else if ($op == "saveconfig") {
 
-			print "<h2>Saving configuration file to parent directory...</h2>";
+            print "<h2>Saving configuration file to parent directory...</h2>";
 
-			if (!file_exists("../config.php")) {
+            if (!file_exists("../config.php")) {
 
-				$fp = fopen("../config.php", "w");
+                $fp = fopen("../config.php", "w");
 
-				if ($fp) {
-					$written = fwrite($fp, make_config($DB_TYPE, $DB_HOST,
-						$DB_USER, $DB_NAME, $DB_PASS,
-						$DB_PORT, $SELF_URL_PATH));
+                if ($fp) {
+                    $written = fwrite($fp, make_config($DB_TYPE, $DB_HOST,
+                        $DB_USER, $DB_NAME, $DB_PASS,
+                        $DB_PORT, $SELF_URL_PATH));
 
-					if ($written > 0) {
-						print_notice("Successfully saved config.php. You can try <a href=\"..\">loading tt-rss now</a>.");
+                    if ($written > 0) {
+                        print_notice("Successfully saved config.php. You can try <a href=\"..\">loading tt-rss now</a>.");
 
-					} else {
-						print_notice("Unable to write into config.php in tt-rss directory.");
-					}
+                    } else {
+                        print_notice("Unable to write into config.php in tt-rss directory.");
+                    }
 
-					fclose($fp);
-				} else {
-					print_error("Unable to open config.php in tt-rss directory for writing.");
-				}
-			} else {
-				print_error("config.php already present in tt-rss directory, refusing to overwrite.");
-			}
-		}
-	?>
+                    fclose($fp);
+                } else {
+                    print_error("Unable to open config.php in tt-rss directory for writing.");
+                }
+            } else {
+                print_error("config.php already present in tt-rss directory, refusing to overwrite.");
+            }
+        }
+    ?>
 
 </div>
 

Spacing +8 added lines, -8 removed lines

@@ -11,7 +11,7 @@ 
 		$query = "";
 
 		if (!(strpos($filename, "?") === false)) {
-			$query = substr($filename, strpos($filename, "?")+1);
+			$query = substr($filename, strpos($filename, "?") + 1);
 			$filename = substr($filename, 0, strpos($filename, "?"));
 		}
 
@@ -85,7 +85,7 @@ 
 		$errors = array();
 
 		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 (!function_exists("curl_init") && !ini_get("allow_url_fopen")) {
@@ -133,17 +133,17 @@ 
 
 	function pdo_connect($host, $user, $pass, $db, $type, $port = false) {
 
-		$db_port = $port ? ';port=' . $port : '';
-		$db_host = $host ? ';host=' . $host : '';
+		$db_port = $port ? ';port='.$port : '';
+		$db_host = $host ? ';host='.$host : '';
 
 		try {
-			$pdo = new PDO($type . ':dbname=' . $db . $db_host . $db_port,
+			$pdo = new PDO($type.':dbname='.$db.$db_host.$db_port,
 				$user,
 				$pass);
 
 			return $pdo;
 		} catch (Exception $e) {
-		    print "<div class='alert alert-danger'>" . $e->getMessage() . "</div>";
+		    print "<div class='alert alert-danger'>".$e->getMessage()."</div>";
 		    return null;
         }
 	}
@@ -189,7 +189,7 @@ 
 	}
 
 	function make_self_url_path() {
-		$url_path = (is_server_https() ? 'https://' :  'http://') . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
+		$url_path = (is_server_https() ? 'https://' : 'http://').$_SERVER["HTTP_HOST"].parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
 
 		return $url_path;
 	}
@@ -437,7 +437,7 @@ 
 
 						if (!$res) {
 							print_notice("Query: $line");
-							print_error("Error: " . implode(", ", $pdo->errorInfo()));
+							print_error("Error: ".implode(", ", $pdo->errorInfo()));
                         }
 					}
 				}