codysnider / tt-rss

include/login_form.php

Indentation +7 added lines, -7 removed lines

@@ -7,15 +7,15 @@
 	<link rel="shortcut icon" type="image/png" href="images/favicon.png">
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<?php
-	foreach (array("lib/prototype.js",
-				"lib/dojo/dojo.js",
-				"lib/dojo/tt-rss-layer.js",
-				"js/common.js",
-				"errors.php?mode=js") as $jsfile) {
+    foreach (array("lib/prototype.js",
+                "lib/dojo/dojo.js",
+                "lib/dojo/tt-rss-layer.js",
+                "js/common.js",
+                "errors.php?mode=js") as $jsfile) {
 
-		echo javascript_tag($jsfile);
+        echo javascript_tag($jsfile);
 
-	} ?>
+    } ?>
 
 	<script type="text/javascript">
 		require({cache:{}});

include/functions.php

Indentation +8 added lines, -8 removed lines

@@ -379,8 +379,8 @@ 
 
         // TODO: should this support POST requests or not? idk
 
-         $context_options = array(
-              'http' => array(
+            $context_options = array(
+                'http' => array(
                     'header' => array(
                         'Connection: close'
                     ),
@@ -388,7 +388,7 @@ 
                     'ignore_errors' => true,
                     'timeout' => $timeout ? $timeout : FILE_FETCH_TIMEOUT,
                     'protocol_version'=> 1.1)
-              );
+                );
 
         if (!$post_query && $last_modified)
             array_push($context_options['http']['header'], "If-Modified-Since: $last_modified");
@@ -659,7 +659,7 @@ 
 function logout_user() {
     @session_destroy();
     if (isset($_COOKIE[session_name()])) {
-       setcookie(session_name(), '', time()-42000, '/');
+        setcookie(session_name(), '', time()-42000, '/');
     }
     session_commit();
 }
@@ -699,7 +699,7 @@ 
             if (AUTH_AUTO_LOGIN && authenticate_user(null, null)) {
                 $_SESSION["ref_schema_version"] = get_schema_version(true);
             } else {
-                 authenticate_user(null, null, true);
+                    authenticate_user(null, null, true);
             }
 
             if (!$_SESSION["uid"]) {
@@ -974,9 +974,9 @@ 
     $params = array();
 
     foreach (array("ON_CATCHUP_SHOW_NEXT_FEED", "HIDE_READ_FEEDS",
-                 "ENABLE_FEED_CATS", "FEEDS_SORT_BY_UNREAD", "CONFIRM_FEED_CATCHUP",
-                 "CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE",
-                 "HIDE_READ_SHOWS_SPECIAL", "COMBINED_DISPLAY_MODE") as $param) {
+                    "ENABLE_FEED_CATS", "FEEDS_SORT_BY_UNREAD", "CONFIRM_FEED_CATCHUP",
+                    "CDM_AUTO_CATCHUP", "FRESH_ARTICLE_MAX_AGE",
+                    "HIDE_READ_SHOWS_SPECIAL", "COMBINED_DISPLAY_MODE") as $param) {
 
         $params[strtolower($param)] = (int) get_pref($param);
     }

include/sessions.php

Indentation +9 added lines, -9 removed lines

@@ -42,7 +42,7 @@ 
             __("Session failed to validate (schema version changed)");
         return false;
     }
-      $pdo = Db::pdo();
+        $pdo = Db::pdo();
 
     if ($_SESSION["uid"]) {
 
@@ -56,21 +56,21 @@ 
 
         // user not found
         if ($row = $sth->fetch()) {
-                 $pwd_hash = $row["pwd_hash"];
+                    $pwd_hash = $row["pwd_hash"];
 
-                 if ($pwd_hash != $_SESSION["pwd_hash"]) {
+                    if ($pwd_hash != $_SESSION["pwd_hash"]) {
 
-                      $_SESSION["login_error_msg"] =
+                        $_SESSION["login_error_msg"] =
                             __("Session failed to validate (password changed)");
 
-                      return false;
-                 }
+                        return false;
+                    }
         } else {
 
-                 $_SESSION["login_error_msg"] =
-                      __("Session failed to validate (user not found)");
+                    $_SESSION["login_error_msg"] =
+                        __("Session failed to validate (user not found)");
 
-                 return false;
+                    return false;
 
         }
     }

update.php

Indentation +363 added lines, -363 removed lines

@@ -1,107 +1,107 @@ 
 #!/usr/bin/env php
 <?php
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
-		get_include_path());
+    set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+        get_include_path());
 
-	define('DISABLE_SESSIONS', true);
+    define('DISABLE_SESSIONS', true);
 
-	chdir(dirname(__FILE__));
+    chdir(dirname(__FILE__));
 
-	require_once "autoload.php";
-	require_once "functions.php";
-	require_once "config.php";
-	require_once "sanity_check.php";
-	require_once "db.php";
-	require_once "db-prefs.php";
+    require_once "autoload.php";
+    require_once "functions.php";
+    require_once "config.php";
+    require_once "sanity_check.php";
+    require_once "db.php";
+    require_once "db-prefs.php";
 
-	function cleanup_tags($days = 14, $limit = 1000) {
+    function cleanup_tags($days = 14, $limit = 1000) {
 
-		$days = (int) $days;
+        $days = (int) $days;
 
-		if (DB_TYPE == "pgsql") {
-			$interval_query = "date_updated < NOW() - INTERVAL '$days days'";
-		} else if (DB_TYPE == "mysql") {
-			$interval_query = "date_updated < DATE_SUB(NOW(), INTERVAL $days DAY)";
-		}
+        if (DB_TYPE == "pgsql") {
+            $interval_query = "date_updated < NOW() - INTERVAL '$days days'";
+        } else if (DB_TYPE == "mysql") {
+            $interval_query = "date_updated < DATE_SUB(NOW(), INTERVAL $days DAY)";
+        }
 
-		$tags_deleted = 0;
+        $tags_deleted = 0;
 
-		$pdo = Db::pdo();
+        $pdo = Db::pdo();
 
-		while ($limit > 0) {
-			$limit_part = 500;
+        while ($limit > 0) {
+            $limit_part = 500;
 
-			$sth = $pdo->prepare("SELECT ttrss_tags.id AS id
+            $sth = $pdo->prepare("SELECT ttrss_tags.id AS id
 						FROM ttrss_tags, ttrss_user_entries, ttrss_entries
 						WHERE post_int_id = int_id AND $interval_query AND
 						ref_id = ttrss_entries.id AND tag_cache != '' LIMIT ?");
-			$sth->bindValue(1, $limit_part, PDO::PARAM_INT);
-			$sth->execute();
-
-			$ids = array();
-
-			while ($line = $sth->fetch()) {
-				array_push($ids, $line['id']);
-			}
-
-			if (count($ids) > 0) {
-				$ids = join(",", $ids);
-
-				$usth = $pdo->query("DELETE FROM ttrss_tags WHERE id IN ($ids)");
-				$tags_deleted = $usth->rowCount();
-			} else {
-				break;
-			}
-
-			$limit -= $limit_part;
-		}
-
-		return $tags_deleted;
-	}
-
-	if (!defined('PHP_EXECUTABLE'))
-		define('PHP_EXECUTABLE', '/usr/bin/php');
-
-	$pdo = Db::pdo();
-
-	init_plugins();
-
-	$longopts = array("feeds",
-			"daemon",
-			"daemon-loop",
-			"send-digests",
-			"task:",
-			"cleanup-tags",
-			"quiet",
-			"log:",
-			"log-level:",
-			"indexes",
-			"pidlock:",
-			"update-schema",
-			"convert-filters",
-			"force-update",
-			"gen-search-idx",
-			"list-plugins",
-			"debug-feed:",
-			"force-refetch",
-			"force-rehash",
-			"help");
-
-	foreach (PluginHost::getInstance()->get_commands() as $command => $data) {
-		array_push($longopts, $command . $data["suffix"]);
-	}
-
-	$options = getopt("", $longopts);
-
-	if (!is_array($options)) {
-		die("error: getopt() failed. ".
-			"Most probably you are using PHP CGI to run this script ".
-			"instead of required PHP CLI. Check tt-rss wiki page on updating feeds for ".
-			"additional information.\n");
-	}
-
-	if (count($options) == 0 && !defined('STDIN')) {
-		?>
+            $sth->bindValue(1, $limit_part, PDO::PARAM_INT);
+            $sth->execute();
+
+            $ids = array();
+
+            while ($line = $sth->fetch()) {
+                array_push($ids, $line['id']);
+            }
+
+            if (count($ids) > 0) {
+                $ids = join(",", $ids);
+
+                $usth = $pdo->query("DELETE FROM ttrss_tags WHERE id IN ($ids)");
+                $tags_deleted = $usth->rowCount();
+            } else {
+                break;
+            }
+
+            $limit -= $limit_part;
+        }
+
+        return $tags_deleted;
+    }
+
+    if (!defined('PHP_EXECUTABLE'))
+        define('PHP_EXECUTABLE', '/usr/bin/php');
+
+    $pdo = Db::pdo();
+
+    init_plugins();
+
+    $longopts = array("feeds",
+            "daemon",
+            "daemon-loop",
+            "send-digests",
+            "task:",
+            "cleanup-tags",
+            "quiet",
+            "log:",
+            "log-level:",
+            "indexes",
+            "pidlock:",
+            "update-schema",
+            "convert-filters",
+            "force-update",
+            "gen-search-idx",
+            "list-plugins",
+            "debug-feed:",
+            "force-refetch",
+            "force-rehash",
+            "help");
+
+    foreach (PluginHost::getInstance()->get_commands() as $command => $data) {
+        array_push($longopts, $command . $data["suffix"]);
+    }
+
+    $options = getopt("", $longopts);
+
+    if (!is_array($options)) {
+        die("error: getopt() failed. ".
+            "Most probably you are using PHP CGI to run this script ".
+            "instead of required PHP CLI. Check tt-rss wiki page on updating feeds for ".
+            "additional information.\n");
+    }
+
+    if (count($options) == 0 && !defined('STDIN')) {
+        ?>
 		<!DOCTYPE html>
 		<html>
 		<head>
@@ -116,376 +116,376 @@ 
 
 		</body></html>
 	<?php
-		exit;
-	}
-
-	if (count($options) == 0 || isset($options["help"]) ) {
-		print "Tiny Tiny RSS data update script.\n\n";
-		print "Options:\n";
-		print "  --feeds              - update feeds\n";
-		print "  --daemon             - start single-process update daemon\n";
-		print "  --task N             - create lockfile using this task id\n";
-		print "  --cleanup-tags       - perform tags table maintenance\n";
-		print "  --quiet              - don't output messages to stdout\n";
-		print "  --log FILE           - log messages to FILE\n";
-		print "  --log-level N        - log verbosity level\n";
-		print "  --indexes            - recreate missing schema indexes\n";
-		print "  --update-schema      - update database schema\n";
-		print "  --gen-search-idx     - generate basic PostgreSQL fulltext search index\n";
-		print "  --convert-filters    - convert type1 filters to type2\n";
-		print "  --send-digests       - send pending email digests\n";
-		print "  --force-update       - force update of all feeds\n";
-		print "  --list-plugins       - list all available plugins\n";
-		print "  --debug-feed N       - perform debug update of feed N\n";
-		print "  --force-refetch      - debug update: force refetch feed data\n";
-		print "  --force-rehash       - debug update: force rehash articles\n";
-		print "  --help               - show this help\n";
-		print "Plugin options:\n";
-
-		foreach (PluginHost::getInstance()->get_commands() as $command => $data) {
-			$args = $data['arghelp'];
-			printf(" --%-19s - %s\n", "$command $args", $data["description"]);
-		}
-
-		return;
-	}
-
-	if (!isset($options['daemon'])) {
-		require_once "errorhandler.php";
-	}
-
-	if (!isset($options['update-schema'])) {
-		$schema_version = get_schema_version();
-
-		if ($schema_version != SCHEMA_VERSION) {
-			die("Schema version is wrong, please upgrade the database (--update-schema).\n");
-		}
-	}
-
-	Debug::set_enabled(true);
-
-	if (isset($options["log-level"])) {
-	    Debug::set_loglevel((int)$options["log-level"]);
+        exit;
+    }
+
+    if (count($options) == 0 || isset($options["help"]) ) {
+        print "Tiny Tiny RSS data update script.\n\n";
+        print "Options:\n";
+        print "  --feeds              - update feeds\n";
+        print "  --daemon             - start single-process update daemon\n";
+        print "  --task N             - create lockfile using this task id\n";
+        print "  --cleanup-tags       - perform tags table maintenance\n";
+        print "  --quiet              - don't output messages to stdout\n";
+        print "  --log FILE           - log messages to FILE\n";
+        print "  --log-level N        - log verbosity level\n";
+        print "  --indexes            - recreate missing schema indexes\n";
+        print "  --update-schema      - update database schema\n";
+        print "  --gen-search-idx     - generate basic PostgreSQL fulltext search index\n";
+        print "  --convert-filters    - convert type1 filters to type2\n";
+        print "  --send-digests       - send pending email digests\n";
+        print "  --force-update       - force update of all feeds\n";
+        print "  --list-plugins       - list all available plugins\n";
+        print "  --debug-feed N       - perform debug update of feed N\n";
+        print "  --force-refetch      - debug update: force refetch feed data\n";
+        print "  --force-rehash       - debug update: force rehash articles\n";
+        print "  --help               - show this help\n";
+        print "Plugin options:\n";
+
+        foreach (PluginHost::getInstance()->get_commands() as $command => $data) {
+            $args = $data['arghelp'];
+            printf(" --%-19s - %s\n", "$command $args", $data["description"]);
+        }
+
+        return;
+    }
+
+    if (!isset($options['daemon'])) {
+        require_once "errorhandler.php";
+    }
+
+    if (!isset($options['update-schema'])) {
+        $schema_version = get_schema_version();
+
+        if ($schema_version != SCHEMA_VERSION) {
+            die("Schema version is wrong, please upgrade the database (--update-schema).\n");
+        }
+    }
+
+    Debug::set_enabled(true);
+
+    if (isset($options["log-level"])) {
+        Debug::set_loglevel((int)$options["log-level"]);
     }
 
-	if (isset($options["log"])) {
-		Debug::set_quiet(isset($options['quiet']));
-		Debug::set_logfile($options["log"]);
+    if (isset($options["log"])) {
+        Debug::set_quiet(isset($options['quiet']));
+        Debug::set_logfile($options["log"]);
         Debug::log("Logging to " . $options["log"]);
     } else {
-	    if (isset($options['quiet'])) {
-			Debug::set_loglevel(Debug::$LOG_DISABLED);
+        if (isset($options['quiet'])) {
+            Debug::set_loglevel(Debug::$LOG_DISABLED);
         }
     }
 
-	if (!isset($options["daemon"])) {
-		$lock_filename = "update.lock";
-	} else {
-		$lock_filename = "update_daemon.lock";
-	}
+    if (!isset($options["daemon"])) {
+        $lock_filename = "update.lock";
+    } else {
+        $lock_filename = "update_daemon.lock";
+    }
 
-	if (isset($options["task"])) {
-		Debug::log("Using task id " . $options["task"]);
-		$lock_filename = $lock_filename . "-task_" . $options["task"];
-	}
+    if (isset($options["task"])) {
+        Debug::log("Using task id " . $options["task"]);
+        $lock_filename = $lock_filename . "-task_" . $options["task"];
+    }
 
-	if (isset($options["pidlock"])) {
-		$my_pid = $options["pidlock"];
-		$lock_filename = "update_daemon-$my_pid.lock";
+    if (isset($options["pidlock"])) {
+        $my_pid = $options["pidlock"];
+        $lock_filename = "update_daemon-$my_pid.lock";
 
-	}
+    }
 
-	Debug::log("Lock: $lock_filename");
+    Debug::log("Lock: $lock_filename");
 
-	$lock_handle = make_lockfile($lock_filename);
-	$must_exit = false;
+    $lock_handle = make_lockfile($lock_filename);
+    $must_exit = false;
 
-	if (isset($options["task"]) && isset($options["pidlock"])) {
-		$waits = $options["task"] * 5;
-		Debug::log("Waiting before update ($waits)");
-		sleep($waits);
-	}
+    if (isset($options["task"]) && isset($options["pidlock"])) {
+        $waits = $options["task"] * 5;
+        Debug::log("Waiting before update ($waits)");
+        sleep($waits);
+    }
 
-	// Try to lock a file in order to avoid concurrent update.
-	if (!$lock_handle) {
-		die("error: Can't create lockfile ($lock_filename). ".
-			"Maybe another update process is already running.\n");
-	}
+    // Try to lock a file in order to avoid concurrent update.
+    if (!$lock_handle) {
+        die("error: Can't create lockfile ($lock_filename). ".
+            "Maybe another update process is already running.\n");
+    }
 
-	if (isset($options["force-update"])) {
-		Debug::log("marking all feeds as needing update...");
+    if (isset($options["force-update"])) {
+        Debug::log("marking all feeds as needing update...");
 
-		$pdo->query( "UPDATE ttrss_feeds SET
+        $pdo->query( "UPDATE ttrss_feeds SET
           last_update_started = '1970-01-01', last_updated = '1970-01-01'");
-	}
+    }
 
-	if (isset($options["feeds"])) {
-		RSSUtils::update_daemon_common();
-		RSSUtils::housekeeping_common(true);
+    if (isset($options["feeds"])) {
+        RSSUtils::update_daemon_common();
+        RSSUtils::housekeeping_common(true);
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
-	}
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
+    }
 
-	if (isset($options["daemon"])) {
-		while (true) {
-			$quiet = (isset($options["quiet"])) ? "--quiet" : "";
+    if (isset($options["daemon"])) {
+        while (true) {
+            $quiet = (isset($options["quiet"])) ? "--quiet" : "";
             $log = isset($options['log']) ? '--log '.$options['log'] : '';
             $log_level = isset($options['log-level']) ? '--log-level '.$options['log-level'] : '';
 
-			passthru(PHP_EXECUTABLE . " " . $argv[0] ." --daemon-loop $quiet $log $log_level");
+            passthru(PHP_EXECUTABLE . " " . $argv[0] ." --daemon-loop $quiet $log $log_level");
 
-			// let's enforce a minimum spawn interval as to not forkbomb the host
-			$spawn_interval = max(60, DAEMON_SLEEP_INTERVAL);
+            // let's enforce a minimum spawn interval as to not forkbomb the host
+            $spawn_interval = max(60, DAEMON_SLEEP_INTERVAL);
 
-			Debug::log("Sleeping for $spawn_interval seconds...");
-			sleep($spawn_interval);
-		}
-	}
+            Debug::log("Sleeping for $spawn_interval seconds...");
+            sleep($spawn_interval);
+        }
+    }
 
-	if (isset($options["daemon-loop"])) {
-		if (!make_stampfile('update_daemon.stamp')) {
-			Debug::log("warning: unable to create stampfile\n");
-		}
+    if (isset($options["daemon-loop"])) {
+        if (!make_stampfile('update_daemon.stamp')) {
+            Debug::log("warning: unable to create stampfile\n");
+        }
 
-		RSSUtils::update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT);
+        RSSUtils::update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT);
 
-		if (!isset($options["pidlock"]) || $options["task"] == 0)
-			RSSUtils::housekeeping_common(true);
+        if (!isset($options["pidlock"]) || $options["task"] == 0)
+            RSSUtils::housekeeping_common(true);
 
-		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
-	}
+        PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
+    }
 
-	if (isset($options["cleanup-tags"])) {
-		$rc = cleanup_tags( 14, 50000);
-		Debug::log("$rc tags deleted.\n");
-	}
+    if (isset($options["cleanup-tags"])) {
+        $rc = cleanup_tags( 14, 50000);
+        Debug::log("$rc tags deleted.\n");
+    }
 
-	if (isset($options["indexes"])) {
-		Debug::log("PLEASE BACKUP YOUR DATABASE BEFORE PROCEEDING!");
-		Debug::log("Type 'yes' to continue.");
+    if (isset($options["indexes"])) {
+        Debug::log("PLEASE BACKUP YOUR DATABASE BEFORE PROCEEDING!");
+        Debug::log("Type 'yes' to continue.");
 
-		if (read_stdin() != 'yes')
-			exit;
+        if (read_stdin() != 'yes')
+            exit;
 
-		Debug::log("clearing existing indexes...");
+        Debug::log("clearing existing indexes...");
 
-		if (DB_TYPE == "pgsql") {
-			$sth = $pdo->query( "SELECT relname FROM
+        if (DB_TYPE == "pgsql") {
+            $sth = $pdo->query( "SELECT relname FROM
 				pg_catalog.pg_class WHERE relname LIKE 'ttrss_%'
 					AND relname NOT LIKE '%_pkey'
 				AND relkind = 'i'");
-		} else {
-			$sth = $pdo->query( "SELECT index_name,table_name FROM
+        } else {
+            $sth = $pdo->query( "SELECT index_name,table_name FROM
 				information_schema.statistics WHERE index_name LIKE 'ttrss_%'");
-		}
-
-		while ($line = $sth->fetch()) {
-			if (DB_TYPE == "pgsql") {
-				$statement = "DROP INDEX " . $line["relname"];
-				Debug::log($statement);
-			} else {
-				$statement = "ALTER TABLE ".
-					$line['table_name']." DROP INDEX ".$line['index_name'];
-				Debug::log($statement);
-			}
-			$pdo->query($statement);
-		}
+        }
 
-		Debug::log("reading indexes from schema for: " . DB_TYPE);
+        while ($line = $sth->fetch()) {
+            if (DB_TYPE == "pgsql") {
+                $statement = "DROP INDEX " . $line["relname"];
+                Debug::log($statement);
+            } else {
+                $statement = "ALTER TABLE ".
+                    $line['table_name']." DROP INDEX ".$line['index_name'];
+                Debug::log($statement);
+            }
+            $pdo->query($statement);
+        }
 
-		$fp = fopen("schema/ttrss_schema_" . DB_TYPE . ".sql", "r");
-		if ($fp) {
-			while ($line = fgets($fp)) {
-				$matches = array();
+        Debug::log("reading indexes from schema for: " . DB_TYPE);
 
-				if (preg_match("/^create index ([^ ]+) on ([^ ]+)$/i", $line, $matches)) {
-					$index = $matches[1];
-					$table = $matches[2];
+        $fp = fopen("schema/ttrss_schema_" . DB_TYPE . ".sql", "r");
+        if ($fp) {
+            while ($line = fgets($fp)) {
+                $matches = array();
 
-					$statement = "CREATE INDEX $index ON $table";
+                if (preg_match("/^create index ([^ ]+) on ([^ ]+)$/i", $line, $matches)) {
+                    $index = $matches[1];
+                    $table = $matches[2];
 
-					Debug::log($statement);
-					$pdo->query($statement);
-				}
-			}
-			fclose($fp);
-		} else {
-			Debug::log("unable to open schema file.");
-		}
-		Debug::log("all done.");
-	}
+                    $statement = "CREATE INDEX $index ON $table";
 
-	if (isset($options["convert-filters"])) {
-		Debug::log("WARNING: this will remove all existing type2 filters.");
-		Debug::log("Type 'yes' to continue.");
+                    Debug::log($statement);
+                    $pdo->query($statement);
+                }
+            }
+            fclose($fp);
+        } else {
+            Debug::log("unable to open schema file.");
+        }
+        Debug::log("all done.");
+    }
 
-		if (read_stdin() != 'yes')
-			exit;
+    if (isset($options["convert-filters"])) {
+        Debug::log("WARNING: this will remove all existing type2 filters.");
+        Debug::log("Type 'yes' to continue.");
 
-		Debug::log("converting filters...");
+        if (read_stdin() != 'yes')
+            exit;
 
-		$pdo->query("DELETE FROM ttrss_filters2");
+        Debug::log("converting filters...");
 
-		$res = $pdo->query("SELECT * FROM ttrss_filters ORDER BY id");
+        $pdo->query("DELETE FROM ttrss_filters2");
 
-		while ($line = $res->fetch()) {
-			$owner_uid = $line["owner_uid"];
+        $res = $pdo->query("SELECT * FROM ttrss_filters ORDER BY id");
 
-			// date filters are removed
-			if ($line["filter_type"] != 5) {
-				$filter = array();
+        while ($line = $res->fetch()) {
+            $owner_uid = $line["owner_uid"];
 
-				if (sql_bool_to_bool($line["cat_filter"])) {
-					$feed_id = "CAT:" . (int)$line["cat_id"];
-				} else {
-					$feed_id = (int)$line["feed_id"];
-				}
+            // date filters are removed
+            if ($line["filter_type"] != 5) {
+                $filter = array();
 
-				$filter["enabled"] = $line["enabled"] ? "on" : "off";
-				$filter["rule"] = array(
-					json_encode(array(
-						"reg_exp" => $line["reg_exp"],
-						"feed_id" => $feed_id,
-						"filter_type" => $line["filter_type"])));
+                if (sql_bool_to_bool($line["cat_filter"])) {
+                    $feed_id = "CAT:" . (int)$line["cat_id"];
+                } else {
+                    $feed_id = (int)$line["feed_id"];
+                }
 
-				$filter["action"] = array(
-					json_encode(array(
-						"action_id" => $line["action_id"],
-						"action_param_label" => $line["action_param"],
-						"action_param" => $line["action_param"])));
+                $filter["enabled"] = $line["enabled"] ? "on" : "off";
+                $filter["rule"] = array(
+                    json_encode(array(
+                        "reg_exp" => $line["reg_exp"],
+                        "feed_id" => $feed_id,
+                        "filter_type" => $line["filter_type"])));
 
-				// Oh god it's full of hacks
+                $filter["action"] = array(
+                    json_encode(array(
+                        "action_id" => $line["action_id"],
+                        "action_param_label" => $line["action_param"],
+                        "action_param" => $line["action_param"])));
 
-				$_REQUEST = $filter;
-				$_SESSION["uid"] = $owner_uid;
+                // Oh god it's full of hacks
 
-				$filters = new Pref_Filters($_REQUEST);
-				$filters->add();
-			}
-		}
+                $_REQUEST = $filter;
+                $_SESSION["uid"] = $owner_uid;
 
-	}
+                $filters = new Pref_Filters($_REQUEST);
+                $filters->add();
+            }
+        }
 
-	if (isset($options["update-schema"])) {
-		Debug::log("Checking for updates (" . DB_TYPE . ")...");
+    }
+
+    if (isset($options["update-schema"])) {
+        Debug::log("Checking for updates (" . DB_TYPE . ")...");
 
-		$updater = new DbUpdater(DB_TYPE, SCHEMA_VERSION);
+        $updater = new DbUpdater(DB_TYPE, SCHEMA_VERSION);
 
-		if ($updater->isUpdateRequired()) {
-			Debug::log("Schema update required, version " . $updater->getSchemaVersion() . " to " . SCHEMA_VERSION);
+        if ($updater->isUpdateRequired()) {
+            Debug::log("Schema update required, version " . $updater->getSchemaVersion() . " to " . SCHEMA_VERSION);
 
-			if (DB_TYPE == "mysql")
-				Debug::Log("READ THIS: Due to MySQL limitations, your database is not completely protected while updating.\n".
-					"Errors may put it in an inconsistent state requiring manual rollback.\nBACKUP YOUR DATABASE BEFORE CONTINUING.");
-			else
-				Debug::log("WARNING: please backup your database before continuing.");
+            if (DB_TYPE == "mysql")
+                Debug::Log("READ THIS: Due to MySQL limitations, your database is not completely protected while updating.\n".
+                    "Errors may put it in an inconsistent state requiring manual rollback.\nBACKUP YOUR DATABASE BEFORE CONTINUING.");
+            else
+                Debug::log("WARNING: please backup your database before continuing.");
 
-			Debug::log("Type 'yes' to continue.");
+            Debug::log("Type 'yes' to continue.");
 
-			if (read_stdin() != 'yes')
-				exit;
+            if (read_stdin() != 'yes')
+                exit;
 
-			Debug::log("Performing updates to version " . SCHEMA_VERSION);
+            Debug::log("Performing updates to version " . SCHEMA_VERSION);
 
-			for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
-				Debug::log("* Updating to version $i...");
+            for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
+                Debug::log("* Updating to version $i...");
 
-				$result = $updater->performUpdateTo($i, false);
+                $result = $updater->performUpdateTo($i, false);
 
-				if ($result) {
-					Debug::log("* Completed.");
-				} else {
-					Debug::log("One of the updates failed. Either retry the process or perform updates manually.");
-					return;
-				}
+                if ($result) {
+                    Debug::log("* Completed.");
+                } else {
+                    Debug::log("One of the updates failed. Either retry the process or perform updates manually.");
+                    return;
+                }
 
-			}
-		} else {
-			Debug::log("Update not required.");
-		}
+            }
+        } else {
+            Debug::log("Update not required.");
+        }
 
-	}
+    }
 
-	if (isset($options["gen-search-idx"])) {
-		echo "Generating search index (stemming set to English)...\n";
+    if (isset($options["gen-search-idx"])) {
+        echo "Generating search index (stemming set to English)...\n";
 
-		$res = $pdo->query("SELECT COUNT(id) AS count FROM ttrss_entries WHERE tsvector_combined IS NULL");
-		$row = $res->fetch();
-		$count = $row['count'];
+        $res = $pdo->query("SELECT COUNT(id) AS count FROM ttrss_entries WHERE tsvector_combined IS NULL");
+        $row = $res->fetch();
+        $count = $row['count'];
 
-		print "Articles to process: $count.\n";
+        print "Articles to process: $count.\n";
 
-		$limit = 500;
-		$processed = 0;
+        $limit = 500;
+        $processed = 0;
 
-		$sth = $pdo->prepare("SELECT id, title, content FROM ttrss_entries WHERE
+        $sth = $pdo->prepare("SELECT id, title, content FROM ttrss_entries WHERE
           tsvector_combined IS NULL ORDER BY id LIMIT ?");
-		$sth->execute([$limit]);
+        $sth->execute([$limit]);
 
-		$usth = $pdo->prepare("UPDATE ttrss_entries
+        $usth = $pdo->prepare("UPDATE ttrss_entries
           SET tsvector_combined = to_tsvector('english', ?) WHERE id = ?");
 
-		while (true) {
+        while (true) {
 
-			while ($line = $sth->fetch()) {
-				$tsvector_combined = mb_substr(strip_tags($line["title"] . " " . $line["content"]), 0, 1000000);
+            while ($line = $sth->fetch()) {
+                $tsvector_combined = mb_substr(strip_tags($line["title"] . " " . $line["content"]), 0, 1000000);
 
-				$usth->execute([$tsvector_combined, $line['id']]);
+                $usth->execute([$tsvector_combined, $line['id']]);
 
-				$processed++;
-			}
+                $processed++;
+            }
 
-			print "Processed $processed articles...\n";
+            print "Processed $processed articles...\n";
 
-			if ($processed < $limit) {
-				echo "All done.\n";
-				break;
-			}
-		}
-	}
+            if ($processed < $limit) {
+                echo "All done.\n";
+                break;
+            }
+        }
+    }
 
-	if (isset($options["list-plugins"])) {
-		$tmppluginhost = new PluginHost();
-		$tmppluginhost->load_all($tmppluginhost::KIND_ALL, false);
-		$enabled = array_map("trim", explode(",", PLUGINS));
+    if (isset($options["list-plugins"])) {
+        $tmppluginhost = new PluginHost();
+        $tmppluginhost->load_all($tmppluginhost::KIND_ALL, false);
+        $enabled = array_map("trim", explode(",", PLUGINS));
 
-		echo "List of all available plugins:\n";
+        echo "List of all available plugins:\n";
 
-		foreach ($tmppluginhost->get_plugins() as $name => $plugin) {
-			$about = $plugin->about();
+        foreach ($tmppluginhost->get_plugins() as $name => $plugin) {
+            $about = $plugin->about();
 
-			$status = $about[3] ? "system" : "user";
+            $status = $about[3] ? "system" : "user";
 
-			if (in_array($name, $enabled)) $name .= "*";
+            if (in_array($name, $enabled)) $name .= "*";
 
-			printf("%-50s %-10s v%.2f (by %s)\n%s\n\n",
-				$name, $status, $about[0], $about[2], $about[1]);
-		}
+            printf("%-50s %-10s v%.2f (by %s)\n%s\n\n",
+                $name, $status, $about[0], $about[2], $about[1]);
+        }
 
-		echo "Plugins marked by * are currently enabled for all users.\n";
+        echo "Plugins marked by * are currently enabled for all users.\n";
 
-	}
+    }
 
-	if (isset($options["debug-feed"])) {
-		$feed = $options["debug-feed"];
+    if (isset($options["debug-feed"])) {
+        $feed = $options["debug-feed"];
 
-		if (isset($options["force-refetch"])) $_REQUEST["force_refetch"] = true;
-		if (isset($options["force-rehash"])) $_REQUEST["force_rehash"] = true;
+        if (isset($options["force-refetch"])) $_REQUEST["force_refetch"] = true;
+        if (isset($options["force-rehash"])) $_REQUEST["force_rehash"] = true;
 
-		Debug::set_loglevel(Debug::$LOG_EXTENDED);
+        Debug::set_loglevel(Debug::$LOG_EXTENDED);
 
-		$rc = RSSUtils::update_rss_feed($feed) != false ? 0 : 1;
+        $rc = RSSUtils::update_rss_feed($feed) != false ? 0 : 1;
 
-		exit($rc);
-	}
+        exit($rc);
+    }
 
-	if (isset($options["send-digests"])) {
-		Digest::send_headlines_digests();
-	}
+    if (isset($options["send-digests"])) {
+        Digest::send_headlines_digests();
+    }
 
-	PluginHost::getInstance()->run_commands($options);
+    PluginHost::getInstance()->run_commands($options);
 
-	if (file_exists(LOCK_DIRECTORY . "/$lock_filename"))
-		if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')
-			fclose($lock_handle);
-		unlink(LOCK_DIRECTORY . "/$lock_filename");
+    if (file_exists(LOCK_DIRECTORY . "/$lock_filename"))
+        if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN')
+            fclose($lock_handle);
+        unlink(LOCK_DIRECTORY . "/$lock_filename");

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

register.php

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 { ?>
 

opml.php

Indentation +24 added lines, -24 removed lines

@@ -1,35 +1,35 @@
 <?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 "functions.php";
-	require_once "sessions.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 "functions.php";
+    require_once "sessions.php";
+    require_once "sanity_check.php";
+    require_once "config.php";
+    require_once "db.php";
+    require_once "db-prefs.php";
 
-	if (!init_plugins()) return;
+    if (!init_plugins()) return;
 
-	$op = $_REQUEST['op'];
+    $op = $_REQUEST['op'];
 
-	if ($op == "publish"){
-		$key = $_REQUEST["key"];
-		$pdo = Db::pdo();
+    if ($op == "publish"){
+        $key = $_REQUEST["key"];
+        $pdo = Db::pdo();
 
-		$sth = $pdo->prepare( "SELECT owner_uid
+        $sth = $pdo->prepare( "SELECT owner_uid
 				FROM ttrss_access_keys WHERE
 				access_key = ? AND feed_id = 'OPML:Publish'");
-		$sth->execute([$key]);
+        $sth->execute([$key]);
 
-		if ($row = $sth->fetch()) {
-			$owner_uid = $row['owner_uid'];
+        if ($row = $sth->fetch()) {
+            $owner_uid = $row['owner_uid'];
 
-			$opml = new Opml($_REQUEST);
-			$opml->opml_export("", $owner_uid, true, false);
+            $opml = new Opml($_REQUEST);
+            $opml->opml_export("", $owner_uid, true, false);
 
-		} else {
-			print "<error>User not found</error>";
-		}
-	}
+        } else {
+            print "<error>User not found</error>";
+        }
+    }

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>