Huge rewrite of default parameters, ext-network continued:

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

diff --git a/inc/install-inc.php b/inc/install-inc.php
index d4afebe5dfad810ef936fbf17166a88de827967b..4bbca9b7791fda18897333b1bcefe69047f4a5cb 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -47,7 +47,10 @@ if (!defined('__SECURITY')) {
 
 // Init variables
 $mysql = array();
-if ((isPostRequestElementSet('mysql')) && (is_array(postRequestElement('mysql')))) $mysql = postRequestElement('mysql');
+if ((isPostRequestElementSet('mysql')) && (is_array(postRequestElement('mysql')))) {
+       // Transfer 'mysql' array
+       $mysql = postRequestElement('mysql');
+} // END - if
 
 // Check if both passwords from SMTP are matching
 if ((isGetRequestElementSet('page') && (getRequestElement('page') == 5))) {
@@ -85,12 +88,12 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        addTemplateToInstallContent('install_welcome');
                        break;
 
-               case '1': // Server path, base URL
+               case 1: // Server path, base URL
                        // Load template
                        addTemplateToInstallContent('install_page1');
                        break;
 
-               case '2': // MySQL data (alone!)
+               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';
@@ -115,10 +118,10 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        $content['email']        = postRequestElement('email');
 
                        // Load template
-                       addTemplateToInstallContent('install_page2', false, $content);
+                       addTemplateToInstallContent('install_page2', $content);
                        break;
 
-               case '3':
+               case 3:
                        // Set more values
                        $content['spath']      = postRequestElement('spath');
                        $content['burl']       = postRequestElement('burl');
@@ -156,10 +159,10 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        $content['smtp_pass2'] = $smtpPass2;
 
                        // Load template
-                       addTemplateToInstallContent('install_page3', false, $content);
+                       addTemplateToInstallContent('install_page3', $content);
                        break;
 
-               case '5': // Misc settings
+               case 5: // Misc settings
                        // General settings
                        $content['spath']  = postRequestElement('spath');
                        $content['burl']   = postRequestElement('burl');
@@ -167,13 +170,6 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        $content['slogan'] = postRequestElement('slogan');
                        $content['email']  = postRequestElement('email');
 
-                       // MySQL settings
-                       $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'];
-
                        // SMTP settings
                        $content['smtp_host'] = postRequestElement('smtp_host');
                        $content['smtp_user'] = postRequestElement('smtp_user');
@@ -183,11 +179,11 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        $OUT = '';
                        foreach ($mysql as $key => $value) {
                                $OUT .= "    <input type=\"hidden\" name=\"mysql[" . $key . "]\" value=\"" . $value . "\" />\n";
-                       }
+                       } // END - foreach
                        $content['mysql_hidden'] = $OUT;
 
                        // Load template
-                       addTemplateToInstallContent('install_page5', false, $content);
+                       addTemplateToInstallContent('install_page5', $content);
                        break;
 
                case 'finalize': // Write captured data to files
@@ -206,7 +202,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                                        addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_MISSING_DUMPS'));
                                                } // END - if
 
-                                               if (getTotalFatalErrors() == 0) {
+                                               if (getTotalFatalErrors() == '0') {
                                                        // Set type and prefix from POST data
                                                        setConfigEntry('_TABLE_TYPE'  , postRequestElement('mysql', 'type'));
                                                        setConfigEntry('_MYSQL_PREFIX', postRequestElement('mysql', 'prefix'));
@@ -234,7 +230,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                                        //* DEBUG: */ die('<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;
@@ -268,7 +264,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                        $content['smtp_pass']  = postRequestElement('smtp_pass1');
 
                                        // Load template
-                                       addTemplateToInstallContent('install_fatal_errors', false, $content);
+                                       addTemplateToInstallContent('install_fatal_errors', $content);
                                } else {
                                        // Installation is done!
                                        redirectToUrl('install.php?page=finished');