From f8db5bb4db45f7e867a7f1e29ef58e1fd1473edc Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 10 Dec 2017 09:20:52 +0300 Subject: [PATCH] installer: use PDO, improve wording for some notices PDO wrapper: allow working with blank DB_HOST --- classes/db.php | 3 +- include/sanity_check.php | 2 +- install/index.php | 100 +++++++++++++++------------------------ 3 files changed, 40 insertions(+), 65 deletions(-) diff --git a/classes/db.php b/classes/db.php index 3f3c1268..b6320944 100644 --- a/classes/db.php +++ b/classes/db.php @@ -52,8 +52,9 @@ class Db private function pdo_connect() { $db_port = defined('DB_PORT') && DB_PORT ? ';port=' . DB_PORT : ''; + $db_host = defined('DB_HOST') && DB_HOST ? ';host=' . DB_HOST : ''; - $this->pdo = new PDO(DB_TYPE . ':dbname=' . DB_NAME . ';host=' . DB_HOST . $db_port, + $this->pdo = new PDO(DB_TYPE . ':dbname=' . DB_NAME . $db_host . $db_port, DB_USER, DB_PASS); diff --git a/include/sanity_check.php b/include/sanity_check.php index dddc557f..94578b40 100755 --- a/include/sanity_check.php +++ b/include/sanity_check.php @@ -140,7 +140,7 @@ } if (!class_exists("PDO")) { - array_push($errors, "PHP support for PDO (Portable Data Objects) is required but was not found."); + array_push($errors, "PHP support for PDO is required but was not found."); } if (!function_exists("mb_strlen")) { diff --git a/install/index.php b/install/index.php index 46a0fdec..f1547982 100755 --- a/install/index.php +++ b/install/index.php @@ -50,12 +50,8 @@ 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 == "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 (!function_exists("mb_strlen")) { @@ -89,33 +85,21 @@ print "
$msg
"; } - function db_connect($host, $user, $pass, $db, $type, $port = false) { - if ($type == "pgsql") { - - $string = "dbname=$db user=$user"; + function pdo_connect($host, $user, $pass, $db, $type, $port = false) { - if ($pass) { - $string .= " password=$pass"; - } + $db_port = $port ? ';port=' . $port : ''; + $db_host = $host ? ';host=' . $host : ''; - if ($host) { - $string .= " host=$host"; - } + try { + $pdo = new PDO($type . ':dbname=' . $db . $db_host . $db_port, + $user, + $pass); - if ($port) { - $string = "$string port=" . $port; - } - - $link = pg_connect($string); - - return $link; - - } else if ($type == "mysql") { - if ($port) - return mysqli_connect($host, $user, $pass, $db, $port); - else - return mysqli_connect($host, $user, $pass, $db); - } + return $pdo; + } catch (Exception $e) { + print "
" . $e->getMessage() . "
"; + return null; + } } function make_config($DB_TYPE, $DB_HOST, $DB_USER, $DB_NAME, $DB_PASS, @@ -154,30 +138,6 @@ return $rv; } - function db_query($link, $query, $type, $die_on_error = true) { - if ($type == "pgsql") { - $result = pg_query($link, $query); - if (!$result) { - $query = htmlspecialchars($query); // just in case - if ($die_on_error) { - die("Query $query failed [$result]: " . ($link ? pg_last_error($link) : "No connection")); - } - } - return $result; - } else if ($type == "mysql") { - - $result = mysqli_query($link, $query); - - if (!$result) { - $query = htmlspecialchars($query); - if ($die_on_error) { - die("Query $query failed: " . ($link ? mysqli_error($link) : "No connection")); - } - } - return $result; - } - } - function is_server_https() { return (!empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] != 'off')) || $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https'; } @@ -316,6 +276,14 @@ 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."); + } + if (count($notices) > 0) { print_notice("Configuration check succeeded with minor problems:"); @@ -335,9 +303,9 @@

Checking database

Before you can start using tt-rss, database needs to be initialized. Click on the button below to do that now.

query("SELECT true FROM ttrss_feeds"); - if ($result) { - print_error("Existing tt-rss tables will be removed from the database. If you would like to keep your data, skip database initialization."); + if ($res && $res->fetch()) { + print_error("Some tt-rss data already exists in this database. If you continue with database initialization your current data will be lost."); $need_confirm = true; } else { $need_confirm = false; @@ -398,9 +366,9 @@ } else if ($op == 'installschema' || $op == 'skipschema') { - $link = db_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 (!$link) { + if (!$pdo) { print_error("Unable to connect to database using specified parameters."); exit; } @@ -409,11 +377,17 @@ print "

Initializing database...

"; - $lines = explode(";", preg_replace("/[\r\n]/", "", file_get_contents("../schema/ttrss_schema_".basename($DB_TYPE).".sql"))); + $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) { - db_query($link, $line, $DB_TYPE); + $res = $pdo->query($line); + + if (!$res) { + print_notice("Query: $line"); + print_error("Error: " . implode(", ", $this->pdo->errorInfo())); + } } } -- 2.39.5