corrected install docs to accuratly reflect how it works, and make it give an error when no password provided during install

2 files changed, 6 insertions, 1 deletions

diff --git a/lib/install.php b/lib/install.php
index 838da84f..37e2867f 100644
--- a/lib/install.php
+++ b/lib/install.php
@@ -106,6 +106,11 @@ function install_insert_db($username,$password,$hostname,$database) {
 		return false; 
 	} 
 
+	if (!strlen($data['database_password'])) { 
+		Error::add('general','Error: Password required for Database creation'); 
+		return false; 
+	} 
+
 	$data['database_username'] = $username; 
 	$data['database_password'] = $password; 
 	$data['database_hostname'] = $hostname; 
diff --git a/templates/show_install_config.inc.php b/templates/show_install_config.inc.php
index d68d47bd..ab266495 100644
--- a/templates/show_install_config.inc.php
+++ b/templates/show_install_config.inc.php
@@ -48,7 +48,7 @@ if (INSTALL != '1') { exit; }
 		<?php echo _("Step 1 - Creating and Inserting the Ampache Database"); ?><br />
 		<b><?php echo _("Step 2 - Creating the Ampache.cfg.php file"); ?></b><br />
 		<dl>
-		<dd><?php echo _("This steps takes the basic config values, and first attempts to write them out directly to your webserver. If access is denied it will prompt you to download the config file. Please put the downloaded config file in /config"); ?></dd>
+		<dd><?php echo _("This steps takes the basic config values and generates the config file. It will prompt you to download the config file. Please put the downloaded config file in /config"); ?></dd>
 		</dl>
 		<?php echo _("Step 3 - Setup Initial Account"); ?><br />
 		<?php Error::display('general'); ?>