github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-21 10:25:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ask for password confirmation in web installer, too

Browse Source 
Closes #405.
This commit is contained in:
Franz Liedke 2015-09-04 12:00:03 +02:00
parent 56efeb3a1e
commit 4df26d7d5c
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
framework/core/src/Install/Actions/InstallAction.php
View File

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

2
framework/core/views/install/install.php
View File

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