badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix database not detected on installation

Browse source
This commit is contained in:
nodate-yaozua 2023-01-10 22:34:47 +09:00 committed by GitHub
parent 1842d5609d
commit c2b946f282
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/install.php
View file

@ -49,7 +49,7 @@ function get_dsn()
{
if (getenv("INSTALL_DSN")) {
$dsn = getenv("INSTALL_DSN");
} elseif (@$_POST["database_type"] == DatabaseDriverID::SQLITE) {
} elseif (@$_POST["database_type"] == DatabaseDriverID::SQLITE->value) {
/** @noinspection PhpUnhandledExceptionInspection */
$id = bin2hex(random_bytes(5));
$dsn = "sqlite:data/shimmie.{$id}.sqlite";
@ -99,9 +99,9 @@ function ask_questions()
$drivers = PDO::getAvailableDrivers();
if (
!in_array(DatabaseDriverID::MYSQL, $drivers) &&
!in_array(DatabaseDriverID::PGSQL, $drivers) &&
!in_array(DatabaseDriverID::SQLITE, $drivers)
!in_array(DatabaseDriverID::MYSQL->value, $drivers) &&
!in_array(DatabaseDriverID::PGSQL->value, $drivers) &&
!in_array(DatabaseDriverID::SQLITE->value, $drivers)
) {
$errors[] = "
No database connection library could be found; shimmie needs
@ -109,9 +109,9 @@ function ask_questions()
";
}
$db_m = in_array(DatabaseDriverID::MYSQL, $drivers) ? '<option value="'. DatabaseDriverID::MYSQL .'">MySQL</option>' : "";
$db_p = in_array(DatabaseDriverID::PGSQL, $drivers) ? '<option value="'. DatabaseDriverID::PGSQL .'">PostgreSQL</option>' : "";
$db_s = in_array(DatabaseDriverID::SQLITE, $drivers) ? '<option value="'. DatabaseDriverID::SQLITE .'">SQLite</option>' : "";
$db_m = in_array(DatabaseDriverID::MYSQL->value, $drivers) ? '<option value="'. DatabaseDriverID::MYSQL->value .'">MySQL</option>' : "";
$db_p = in_array(DatabaseDriverID::PGSQL->value, $drivers) ? '<option value="'. DatabaseDriverID::PGSQL->value .'">PostgreSQL</option>' : "";
$db_s = in_array(DatabaseDriverID::SQLITE->value, $drivers) ? '<option value="'. DatabaseDriverID::SQLITE->value .'">SQLite</option>' : "";
$warn_msg = $warnings ? "<h3>Warnings</h3>".implode("\n<p>", $warnings) : "";
$err_msg = $errors ? "<h3>Errors</h3>".implode("\n<p>", $errors) : "";