Fixed bug 'sprintf() too few arguments':

[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 257930fbd47f907d924d77162edb8e39b1c8c167..faf29112a719416e36cc50224f9e26ddf8d61d3c 100644 (file)
--- a/inc/install/install_page_finalize.php
+++ b/inc/install/install_page_finalize.php
@@ -36,7 +36,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!isInstallationPhase())) {
+if ((!defined('__SECURITY')) || (!isInstaller())) {
        die();
 } // END - if
 
@@ -49,14 +49,14 @@ if ((isPostRequestElementSet('finalize')) && (!isInstalled())) {
        unsetSqlLinkUp(__FILE__, __LINE__);
 
        // Connect to database server
-       SQL_CONNECT($GLOBALS['install_mysql']['host'], $GLOBALS['install_mysql']['login'], $GLOBALS['install_mysql']['password1'], __FILE__, __LINE__);
+       sqlConnectToDatabase($GLOBALS['install_mysql']['host'], $GLOBALS['install_mysql']['login'], $GLOBALS['install_mysql']['password1'], __FILE__, __LINE__);
 
        // Is the link up?
-       if (SQL_IS_LINK_UP()) {
+       if (isSqlLinkUp()) {
                // Seems to work, also right database?
-               if (SQL_SELECT_DB($GLOBALS['install_mysql']['dbase'], __FILE__, __LINE__) === TRUE) {
+               if (sqlSelectDatabase($GLOBALS['install_mysql']['dbase'], __FILE__, __LINE__) === TRUE) {
                        // Check for dumps
-                       if ((!isFileReadable(postRequestElement('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestElement('spath') . 'install/menu-'.getLanguage().'.sql'))) {
+                       if (!isInstallerSqlsReadable(postRequestElement('spath'))) {
                                // Installation area not found
                                reportBug(__FILE__, __LINE__, 'SQL dumps not found. Please extract ALL files from the archive or checkout all files out from SVN.');
                                return;