added config migrator and the code to detect a bad config

1 files changed, 6 insertions, 2 deletions

diff --git a/templates/show_test_config.inc.php b/templates/show_test_config.inc.php
index 6d3220d4..644e1d4b 100644
--- a/templates/show_test_config.inc.php
+++ b/templates/show_test_config.inc.php
@@ -41,12 +41,16 @@ body {
 <p>Ampache.cfg.php error detected</p>
 </div>
 <div id="content">
+<h3 style="color:red;">Ampache.cfg.php Parse Error</h3>
+<p>You've been redirected to this page because your <strong>/config/ampache.cfg.php</strong> was not parsable. 
+If you are upgrading from 3.3.x please see the directions below.</p>
+
 <h3>Migrating from 3.3.x to 3.4.x</h3>
 <p>Ampache 3.4 uses a different config parser that is over 10x faster then the previous version. Unfortunately the new parser is
-unable to read the old config files. You must run <strong>/bin/generate_config.inc</strong> from the command line to create your
+unable to read the old config files. You must run <strong>/bin/migrate_config.inc</strong> from the command line to create your
 new config file.</p>
 
-<p>The following settings will not be migrated by the <strong>generate_config.inc</strong> script due to major changes between versions. The default
+<p>The following settings will not be migrated by the <strong>migrate_config.inc</strong> script due to major changes between versions. The default
 values from the ampache.cfg.php.dist file will be used.</p>
 
 <strong>auth_methods</strong> (<i>mysql</i>)<br />