@@ -254,7 +233,7 @@
@@ -289,6 +268,22 @@
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("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.");
+ }
+
if (count($notices) > 0) {
print_notice("Configuration check succeeded with minor problems:");
@@ -308,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;
@@ -371,9 +366,9 @@
} else if ($op == 'installschema' || $op == 'skipschema') {
- $link = db_connect($DB_HOST, $DB_USER, $DB_PASS, $DB_NAME, $DB_TYPE);
+ $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;
}
@@ -382,11 +377,17 @@
print "