More fixes for new installer and script in general :(

[mailer.git] / inc / install / install_page_finalize.php

diff --git a/inc/install/install_page_finalize.php b/inc/install/install_page_finalize.php
index b8e2f287c4b210db747028aaee4c658049a3de73..8e432c95d9a772fcef34d60dfad9033b66ac8457 100644 (file)
--- a/inc/install/install_page_finalize.php
+++ b/inc/install/install_page_finalize.php
@@ -46,10 +46,10 @@ if ((isPostRequestElementSet('finalize')) && (!isInstalled())) {
        initSqls();
 
        // Remove any existing "cache"
-       unset($GLOBALS['is_sql_link_up']);
+       unsetSqlLinkUp(__FILE__, __LINE__);
 
        // Connect to database server
-       SQL_CONNECT($GLOBALS['install_mysql']['host'], $GLOBALS['install_mysql']['login'], $GLOBALS['install_mysql']['pass1'], __FILE__, __LINE__);
+       SQL_CONNECT($GLOBALS['install_mysql']['host'], $GLOBALS['install_mysql']['login'], $GLOBALS['install_mysql']['password1'], __FILE__, __LINE__);
 
        // Is the link up?
        if (SQL_IS_LINK_UP()) {
@@ -69,23 +69,13 @@ if ((isPostRequestElementSet('finalize')) && (!isInstalled())) {
                                setConfigEntry('_MYSQL_PREFIX', postRequestElement('mysql', 'prefix'));
                                setConfigEntry('__DB_NAME'    , $GLOBALS['install_mysql']['dbase']);
 
-                               // Both exists so import them
-                               foreach (array('tables', 'menu-'.getLanguage()) as $dump) {
-                                       // Should be save here because file_exists() is there but we check it again. :)
-                                       $FQFN = postRequestElement('spath') . 'install/' . $dump . '.sql';
-
-                                       // Is the file readable?
-                                       if (isFileReadable($FQFN)) {
-                                               // Read the file
-                                               $fileContent = readSqlDump($FQFN);
+                               // Set path
+                               setConfigEntry('PATH', postRequestElement('spath'));
+                               unset($GLOBALS['getPath']);
 
-                                               // Split it up against ";\n" and merge it into existing SQLs
-                                               mergeSqls(explode(";\n", $fileContent), 'install');
-                                       } else {
-                                               // Not readable!
-                                               reportBug(__FILE__, __LINE__, sprintf("SQL dump %s is not readable.", $dump));
-                                       }
-                               } // END - foreach
+                               // Both exists so import them
+                               importInstallSqlDump('tables');
+                               importInstallSqlDump('menu-' . getLanguage());
                                //* DEBUG: */ die(__FUNCTION__.'['.__LINE__.']:'<pre>'.print_r(getSqls(), TRUE).'</pre>');
 
                                // Are some SQLs found?
@@ -97,9 +87,6 @@ if ((isPostRequestElementSet('finalize')) && (!isInstalled())) {
 
                                // Now run all queries through
                                runFilterChain('run_sqls');
-
-                               // Copy the config template and verify it
-                               doInstallWriteLocalConfigurationFile(postRequestElement('spath'));
                        } // END - if
                } // END - if
        } // END - if
@@ -115,13 +102,15 @@ if ((isPostRequestElementSet('finalize')) && (!isInstalled())) {
                foreach ($GLOBALS['install_mysql'] as $key => $value) {
                        $OUT .= '    <input type="hidden" name="mysql[' . $key . ']" value="' . $value . '" />';
                } // END foreach
-               $content['mysql_hidden'] = $OUT;
-               $content['spath']      = postRequestElement('spath');
-               $content['burl']       = postRequestElement('burl');
-               $content['title']      = postRequestElement('title');
-               $content['smtp_host']  = postRequestElement('smtp_host');
-               $content['smtp_user']  = postRequestElement('smtp_user');
-               $content['smtp_pass']  = postRequestElement('smtp_pass1');
+               $content['mysql_hidden']  = $OUT;
+               $content['spath']         = postRequestElement('spath');
+               $content['burl']          = postRequestElement('burl');
+               $content['title']         = postRequestElement('title');
+               $content['slogan']        = postRequestElement('slogan');
+               $content['email']         = postRequestElement('email');
+               $content['smtp_host']     = postRequestElement('smtp_host');
+               $content['smtp_user']     = postRequestElement('smtp_user');
+               $content['smtp_password'] = postRequestElement('smtp_password1');
 
                // Load template
                addTemplateToInstallContent('install_fatal_errors', $content);
@@ -129,6 +118,27 @@ if ((isPostRequestElementSet('finalize')) && (!isInstalled())) {
                // We have handled all fatal errors here
                initFatalMessages();
        } else {
+               // Copy the config template and verify it
+               doInstallWriteLocalConfigurationFile(
+                       postRequestElement('spath'),
+                       postRequestElement('burl'),
+                       postRequestElement('title'),
+                       postRequestElement('slogan'),
+                       postRequestElement('email'),
+                       postRequestElement('warn_no_pass'),
+                       postRequestElement('wfooter'),
+                       postRequestElement('blink'),
+                       postRequestElement('mysql', 'host'),
+                       postRequestElement('mysql', 'dbase'),
+                       postRequestElement('mysql', 'login'),
+                       postRequestElement('mysql', 'password1'),
+                       postRequestElement('mysql', 'prefix'),
+                       postRequestElement('mysql', 'type'),
+                       postRequestElement('smtp_host'),
+                       postRequestElement('smtp_user'),
+                       postRequestElement('smtp_password1')
+               );
+
                // Register ext-sql_patches and ext-task
                if ((registerExtension('sql_patches', NULL)) && (registerExtension('task', NULL))) {
                        // Installation is done!