Typo and SVN revision fixed

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

diff --git a/inc/install-inc.php b/inc/install-inc.php
index fd5572b0331c83bc458a3fb2c796b0a9652b6034..b1aeb83b02054f9accd16ad8604953a17712c9ca 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -268,8 +268,8 @@ if ((!isInstalled()) || (!isAdminRegistered()))
 
        case "finalize": // Write captured data to files
                if ((REQUEST_ISSET_POST(('finalize'))) && (!isInstalled())) {
-                       // You have submitted data then we have to reset the fatal messages
-                       $SQLs = array();
+                       // You have submitted data then we have to reset the SQLs
+                       INIT_SQLS();
 
                        // Connect to MySQL server
                        SQL_CONNECT($mysql['host'], $mysql['login'], $mysql['pass1'], __FILE__, __LINE__);
@@ -286,8 +286,13 @@ if ((!isInstalled()) || (!isAdminRegistered()))
                                                                // Read the file
                                                                $fileContent = READ_FILE($FQFN, true);
 
+                                                               // Replace the {!prefix!} with actual one
+                                                               while (strpos($fileContent, "{!prefix!}") !== false) {
+                                                                       $fileContent = str_replace("{!prefix!}", $mysql['prefix'], $fileContent);
+                                                               } // END - while
+
                                                                // And split it up against ;\n ...
-                                                               $SQLs = merge_array($SQLs, explode(";\n", $fileContent));
+                                                               SET_SQLS(merge_array(GET_SQLS(), explode(";\n", $fileContent)));
                                                        } else {
                                                                // Not readable!
                                                                debug_report_bug(sprintf("SQL dump %s is not readable!", $dump));
@@ -295,23 +300,14 @@ if ((!isInstalled()) || (!isAdminRegistered()))
                                                } // END - foreach
 
                                                // Are some SQLs found?
-                                               if (count($SQLs) == 0) {
+                                               if (COUNT_SQLS() == 0) {
                                                        // Abort here
                                                        addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_SQL_IMPORT_FAILED'));
                                                        return;
                                                } // END - if
 
                                                // Now run all queries through and try to keep out empty or comment queries
-                                               foreach ($SQLs as $sql) {
-                                                       // Trim spaces away
-                                                       $sql = trim($sql);
-
-                                                       // Is this query not empty and not a comment?
-                                                       if ((!empty($sql)) && (substr($sql, 0, 2) != "--") && (substr($sql, 0, 1) != "#")) {
-                                                               // Then run it!
-                                                               SQL_QUERY($sql, __FILE__, __LINE__);
-                                                       } // END - if
-                                               } // END - foreach
+                                               runFilterChain('run_sqls');
 
                                                // Ok, all done. So we can write the config data to the php files
                                                if (REQUEST_POST('spath') != constant('PATH')) changeDataInFile(REQUEST_POST('spath')."inc/config.php", "SERVER-PATH", "define('PATH', \"", "\");", REQUEST_POST('spath'), 0);