Fix for missing array elements

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

diff --git a/inc/install-inc.php b/inc/install-inc.php
index 51d2fa1a2b3b171b9ef720550fe7704cc69e3667..38e4a6be53215fab6f09a696c03df77e77578bf8 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -46,10 +47,10 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Init variables
-$mysql = array();
+$GLOBALS['install_mysql'] = array();
 if ((isPostRequestParameterSet('mysql')) && (is_array(postRequestParameter('mysql')))) {
        // Transfer 'mysql' array
-       $mysql = postRequestParameter('mysql');
+       $GLOBALS['install_mysql'] = postRequestParameter('mysql');
 } // END - if
 
 // Check if both passwords from SMTP are matching
@@ -94,23 +95,23 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        break;
 
                case '2': // MySQL data (alone!)
-                       if (empty($mysql['dbase']))  $mysql['dbase']  = 'your_database';
-                       if (empty($mysql['login']))  $mysql['login']  = 'your_login';
-                       if (empty($mysql['host']))   $mysql['host']   = 'localhost';
-                       if (empty($mysql['prefix'])) $mysql['prefix'] = 'mxchange';
-                       if (empty($mysql['type']))   $mysql['type']   = 'MyISAM';
-                       if (getTotalFatalErrors() > 0) {
+                       if (empty($GLOBALS['install_mysql']['dbase']))  $GLOBALS['install_mysql']['dbase']  = 'your_database';
+                       if (empty($GLOBALS['install_mysql']['login']))  $GLOBALS['install_mysql']['login']  = 'your_login';
+                       if (empty($GLOBALS['install_mysql']['host']))   $GLOBALS['install_mysql']['host']   = 'localhost';
+                       if (empty($GLOBALS['install_mysql']['prefix'])) $GLOBALS['install_mysql']['prefix'] = 'mxchange';
+                       if (empty($GLOBALS['install_mysql']['type']))   $GLOBALS['install_mysql']['type']   = 'MyISAM';
+                       if (ifFatalErrorsDetected()) {
                                addToInstallContent('<div class="install_fatal">');
                                foreach (getFatalArray() as $key => $err) {
                                        addToInstallContent('<div class="para"><strong>&middot;</strong>&nbsp;{--FATAL_NO--}' . ($key + 1) . ':&nbsp;' . $err . '</div>');
-                               }
+                               } // END - foreach
                                addToInstallContent('</div>');
-                       }
-                       $content['mysql_host']   = $mysql['host'];
-                       $content['mysql_dbase']  = $mysql['dbase'];
-                       $content['mysql_prefix'] = $mysql['prefix'];
-                       $content['mysql_login']  = $mysql['login'];
-                       $content['table_type']   = $mysql['type'];
+                       } // END - if
+                       $content['mysql_host']   = $GLOBALS['install_mysql']['host'];
+                       $content['mysql_dbase']  = $GLOBALS['install_mysql']['dbase'];
+                       $content['mysql_prefix'] = $GLOBALS['install_mysql']['prefix'];
+                       $content['mysql_login']  = $GLOBALS['install_mysql']['login'];
+                       $content['table_type']   = $GLOBALS['install_mysql']['type'];
                        $content['spath']        = postRequestParameter('spath');
                        $content['burl']         = postRequestParameter('burl');
                        $content['title']        = postRequestParameter('title');
@@ -144,13 +145,13 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        } // END - if
 
                        // MySQL settings
-                       $content['mysql_host']   = $mysql['host'];
-                       $content['mysql_dbase']  = $mysql['dbase'];
-                       $content['mysql_prefix'] = $mysql['prefix'];
-                       $content['table_type']   = $mysql['type'];
-                       $content['mysql_login']  = $mysql['login'];
-                       $content['mysql_pass1']  = $mysql['pass1'];
-                       $content['mysql_pass2']  = $mysql['pass2'];
+                       $content['mysql_host']   = $GLOBALS['install_mysql']['host'];
+                       $content['mysql_dbase']  = $GLOBALS['install_mysql']['dbase'];
+                       $content['mysql_prefix'] = $GLOBALS['install_mysql']['prefix'];
+                       $content['table_type']   = $GLOBALS['install_mysql']['type'];
+                       $content['mysql_login']  = $GLOBALS['install_mysql']['login'];
+                       $content['mysql_pass1']  = $GLOBALS['install_mysql']['pass1'];
+                       $content['mysql_pass2']  = $GLOBALS['install_mysql']['pass2'];
 
                        // Set constants for SMTP data
                        $content['smtp_host']  = $smtpHost;
@@ -177,7 +178,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 
                        // MySQL data
                        $OUT = '';
-                       foreach ($mysql as $key => $value) {
+                       foreach ($GLOBALS['install_mysql'] as $key => $value) {
                                $OUT .= "    <input type=\"hidden\" name=\"mysql[" . $key . "]\" value=\"" . $value . "\" />\n";
                        } // END - foreach
                        $content['mysql_hidden'] = $OUT;
@@ -192,17 +193,21 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                initSqls();
 
                                // Connect to MySQL server
-                               SQL_CONNECT($mysql['host'], $mysql['login'], $mysql['pass1'], __FILE__, __LINE__);
+                               SQL_CONNECT($GLOBALS['install_mysql']['host'], $GLOBALS['install_mysql']['login'], $GLOBALS['install_mysql']['pass1'], __FILE__, __LINE__);
+
+                               // Is the link up?
                                if (SQL_IS_LINK_UP()) {
                                        // Seems to work, also right database?
-                                       if (SQL_SELECT_DB($mysql['dbase'], __FILE__, __LINE__) === true) {
-                                               // Automatically run install.sql
+                                       if (SQL_SELECT_DB($GLOBALS['install_mysql']['dbase'], __FILE__, __LINE__) === true) {
+                                               // Check for dumps
                                                if ((!isFileReadable(postRequestParameter('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestParameter('spath') . 'install/menu-'.getLanguage().'.sql'))) {
                                                        // Installation area not found!
                                                        addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_MISSING_DUMPS'));
+                                                       return;
                                                } // END - if
 
-                                               if (getTotalFatalErrors() == '0') {
+                                               // Any errors detected?
+                                               if (!ifFatalErrorsDetected()) {
                                                        // Set type and prefix from POST data
                                                        setConfigEntry('_TABLE_TYPE'  , postRequestParameter('mysql', 'type'));
                                                        setConfigEntry('_MYSQL_PREFIX', postRequestParameter('mysql', 'prefix'));
@@ -215,7 +220,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                                                // Is the file readable?
                                                                if (isFileReadable($FQFN)) {
                                                                        // Read the file
-                                                                       $fileContent = readFromFile($FQFN, true);
+                                                                       $fileContent = readSqlDump($FQFN);
 
                                                                        // Split it up against ";\n" and merge it into existing SQLs
                                                                        mergeSqls(explode(";\n", $fileContent), 'install');
@@ -224,10 +229,10 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                                                        debug_report_bug(sprintf("SQL dump %s is not readable!", $dump));
                                                                }
                                                        } // END - foreach
-                                                       //* DEBUG: */ die('<pre>'.print_r(getSqls(), true).'</pre>');
+                                                       //* DEBUG: */ die(__FUNCTION__.'['.__LINE__.']:'<pre>'.print_r(getSqls(), true).'</pre>');
 
                                                        // Are some SQLs found?
-                                                       if (countSqls() == '0') {
+                                                       if (countSqls() == 0) {
                                                                // Abort here
                                                                addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_SQL_IMPORT_FAILED'));
                                                                return;
@@ -242,14 +247,14 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                        } // END - if
                                } // END - if
 
-                               if (getTotalFatalErrors() > 0) {
+                               if (ifFatalErrorsDetected()) {
                                        $OUT = '';
                                        foreach (getFatalArray() as $value) {
                                                $OUT .= '    <li>' . $value . '</li>';
                                        } // END foreach
                                        $content['fatal_errors'] = $OUT;
                                        $OUT = '';
-                                       foreach ($mysql as $key => $value) {
+                                       foreach ($GLOBALS['install_mysql'] as $key => $value) {
                                                $OUT .= '    <input type="hidden" name="mysql[' . $key . ']" value="' . $value . '" />';
                                        } // END foreach
                                        $content['mysql_hidden'] = $OUT;