From 42f1abacaf0443aec19b245eea555b49a8ff7499 Mon Sep 17 00:00:00 2001
From: Franz Liedke <franz@develophp.org>
Date: Fri, 4 Sep 2015 12:00:03 +0200
Subject: [PATCH] Ask for password confirmation in web installer, too

Closes #405.
---
 src/Install/Actions/InstallAction.php | 20 +++++++++++---------
 views/install/install.php             |  2 ++
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/Install/Actions/InstallAction.php b/src/Install/Actions/InstallAction.php
index 045070eca..fc26f7d83 100644
--- a/src/Install/Actions/InstallAction.php
+++ b/src/Install/Actions/InstallAction.php
@@ -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'), '/');
diff --git a/views/install/install.php b/views/install/install.php
index 40bfad751..67e0b8cce 100644
--- a/views/install/install.php
+++ b/views/install/install.php
@@ -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>