From 143dae483fc5a8ae43c7ef52a4a1c91cbe0290d9 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 19 Nov 2009 20:23:19 +0000
Subject: [PATCH] MINOR: Make pass use a password field, dont require call by
 reference (merged from r72930)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92259 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 dev/install/config-form.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev/install/config-form.html b/dev/install/config-form.html
index 7d413880a..f18c58c26 100644
--- a/dev/install/config-form.html
+++ b/dev/install/config-form.html
@@ -46,6 +46,10 @@
 										Please see below for details.<br />
 										If you are having problems meeting the requirements, see the <a href="http://doc.silverstripe.org/doku.php?id=server-requirements">server requirements wiki page</a>.
 									</p>
+								<?php } else if(!$adminConfig['username'] || !$adminConfig['password']) { ?>
+									<p class="warning">
+										Please fill in a username and password for the admin account to install.
+									</p>
 								<?php } else if(!$dbReq->hasErrors()) { ?>
 									<p class="good">
 										You're ready to install! &nbsp;&nbsp; 
@@ -123,7 +127,7 @@
 								<label for="admin_username">Administrator email:</label>
 								<span class="middleColumn"><input type="text" class="text" name="admin[username]" id="admin_username" value="<?php echo $adminConfig['username']; ?>" /></span>
 								<label for="admin_password">Administrator password:</label>
-								<span class="middleColumn"><input type="text" class="text" name="admin[password]" id="admin_password" value="<?php echo $adminConfig['password']; ?>" /></span>
+								<span class="middleColumn"><input type="password" class="text" name="admin[password]" id="admin_password" value="<?php echo $adminConfig['password']; ?>" /></span>
 								<label for="admin_firstname">Administrator first name:</label>
 								<span class="middleColumn"><input type="text" class="text" name="admin[firstname]" id="admin_firstname" value="<?php echo $adminConfig['firstname']; ?>" /></span>
 								<label for="admin_surname">Administrator surname:</label>