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 6cd0f3032f783e8ed68ad636b3e26781a704a4e7..faf29112a719416e36cc50224f9e26ddf8d61d3c 100644 (file)
--- a/inc/install/install_page_finalize.php
+++ b/inc/install/install_page_finalize.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -36,7 +36,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!isInstallationPhase())) {
+if ((!defined('__SECURITY')) || (!isInstaller())) {
        die();
 } // END - if
 
@@ -46,17 +46,17 @@ 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__);
+       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;
@@ -102,15 +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['slogan']     = postRequestElement('slogan');
-               $content['email']      = postRequestElement('email');
-               $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);
@@ -131,12 +131,12 @@ if ((isPostRequestElementSet('finalize')) && (!isInstalled())) {
                        postRequestElement('mysql', 'host'),
                        postRequestElement('mysql', 'dbase'),
                        postRequestElement('mysql', 'login'),
-                       postRequestElement('mysql', 'pass1'),
+                       postRequestElement('mysql', 'password1'),
                        postRequestElement('mysql', 'prefix'),
                        postRequestElement('mysql', 'type'),
                        postRequestElement('smtp_host'),
                        postRequestElement('smtp_user'),
-                       postRequestElement('smtp_pass1')
+                       postRequestElement('smtp_password1')
                );
 
                // Register ext-sql_patches and ext-task