diff options
| -rw-r--r-- | app/Controller/SetupController.php | 18 | ||||
| -rw-r--r-- | resources/views/setup/step-3-database-connection.php | 2 |
2 files changed, 16 insertions, 4 deletions
diff --git a/app/Controller/SetupController.php b/app/Controller/SetupController.php index 0897bb281d..506bf49264 100644 --- a/app/Controller/SetupController.php +++ b/app/Controller/SetupController.php @@ -56,11 +56,23 @@ class SetupController extends BaseController { $data['lang'] = Locale::httpAcceptLanguage($_SERVER, I18N::installedLocales(), new LocaleEnUs)->languageTag(); } - $db_conn_error = $this->checkDatabaseConnection($data['dbhost'], $data['dbport'], $data['dbuser'], $data['dbpass']); + if ($data['dbuser'] !== '') { + $db_conn_error = $this->checkDatabaseConnection($data['dbhost'], $data['dbport'], $data['dbuser'], $data['dbpass']); + } else { + $db_conn_error = ''; + } - $db_name_error = $this->checkDatabaseName($data['dbhost'], $data['dbport'], $data['dbuser'], $data['dbpass'], $data['dbname'], $data['tblpfx']); + if ($data['dbname'] !== '') { + $db_name_error = $this->checkDatabaseName($data['dbhost'], $data['dbport'], $data['dbuser'], $data['dbpass'], $data['dbname'], $data['tblpfx']); + } else { + $db_name_error = ''; + } - $wt_user_error = $this->checkAdminUser($data['wtname'], $data['wtuser'], $data['wtpass'], $data['wtemail']); + if ($data['wtname'] !== '') { + $wt_user_error = $this->checkAdminUser($data['wtname'], $data['wtuser'], $data['wtpass'], $data['wtemail']); + } else { + $wt_user_error = ''; + } $data['cpu_limit'] = $this->maxExecutionTime(); $data['db_conn_error'] = $db_conn_error; diff --git a/resources/views/setup/step-3-database-connection.php b/resources/views/setup/step-3-database-connection.php index 34e2a9eba3..43d60dd854 100644 --- a/resources/views/setup/step-3-database-connection.php +++ b/resources/views/setup/step-3-database-connection.php @@ -25,7 +25,7 @@ <?php if ($db_conn_error): ?> <p class="alert alert-danger"> - <?= $db_error ?> + <?= $db_conn_error ?> </p> <?php endif ?> |