1
0
mirror of https://github.com/flarum/core.git synced 2025-08-04 15:37:51 +02:00

Ask for password confirmation in web installer, too

Closes #405.
This commit is contained in:
Franz Liedke
2015-09-04 12:00:03 +02:00
parent b26c67dd3c
commit 42f1abacaf
2 changed files with 13 additions and 9 deletions

View File

@@ -54,18 +54,20 @@ class InstallAction extends Action
$data = new DefaultData; $data = new DefaultData;
$data->setDatabaseConfiguration([ $data->setDatabaseConfiguration([
'driver' => 'mysql', 'driver' => 'mysql',
'host' => array_get($input, 'mysqlHost'), 'host' => array_get($input, 'mysqlHost'),
'database' => array_get($input, 'mysqlDatabase'), 'database' => array_get($input, 'mysqlDatabase'),
'username' => array_get($input, 'mysqlUsername'), 'username' => array_get($input, 'mysqlUsername'),
'password' => array_get($input, 'mysqlPassword'), 'password' => array_get($input, 'mysqlPassword'),
'prefix' => array_get($input, 'tablePrefix'), 'password_confirmation' => array_get($input, 'mysqlPasswordConfirmation'),
'prefix' => array_get($input, 'tablePrefix'),
]); ]);
$data->setAdminUser([ $data->setAdminUser([
'username' => array_get($input, 'adminUsername'), 'username' => array_get($input, 'adminUsername'),
'password' => array_get($input, 'adminPassword'), 'password' => array_get($input, 'adminPassword'),
'email' => array_get($input, 'adminEmail'), 'password_confirmation' => array_get($input, 'adminPasswordConfirmation'),
'email' => array_get($input, 'adminEmail'),
]); ]);
$baseUrl = rtrim((string) $request->getAttribute('originalUri'), '/'); $baseUrl = rtrim((string) $request->getAttribute('originalUri'), '/');

View File

@@ -26,6 +26,7 @@
<div class="FormField"> <div class="FormField">
<label>MySQL Password</label> <label>MySQL Password</label>
<input type="password" name="mysqlPassword"> <input type="password" name="mysqlPassword">
<input type="password" name="mysqlPasswordConfirmation">
</div> </div>
<div class="FormField"> <div class="FormField">
@@ -53,6 +54,7 @@
<div class="FormField"> <div class="FormField">
<label>Admin Password</label> <label>Admin Password</label>
<input type="password" name="adminPassword"> <input type="password" name="adminPassword">
<input type="password" name="adminPasswordConfirmation">
</div> </div>
</div> </div>