Renamed function so it might be more understandable

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

diff --git a/inc/install-inc.php b/inc/install-inc.php
index f27ccb8c024bd35f0c9364f7559e44d96033fbfc..9c0a5cf4840523956a4340bafa127139029c9df5 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -46,6 +44,15 @@ if (!defined('__SECURITY')) {
        die();
 } // END - if
 
+// Load extension timezone
+loadExtension('timezone', 'test');
+
+// Set config entry
+setConfigEntry('timezone', 'Europe/Berlin');
+
+// And init timezone
+FILTER_INIT_TIMEZONE();
+
 // Init variables
 $GLOBALS['install_mysql'] = array();
 if ((isPostRequestParameterSet('mysql')) && (is_array(postRequestParameter('mysql')))) {
@@ -58,25 +65,25 @@ if ((isGetRequestParameterSet('page') && (getRequestParameter('page') == 5))) {
        // Okay, we have to check it
        if (isPostRequestParameterSet('smtp_user') && (!isPostRequestParameterSet('smtp_host'))) {
                // Hostname not set
-               addToInstallContent('<div class="para">' . getMessage('INSTALL_SMTP_HOSTNAME_EMPTY') . '</div>');
+               addToInstallContent('<div class="para">{--INSTALL_SMTP_HOSTNAME_EMPTY--}</div>');
                setGetRequestParameter('page', 3);
        } // END - if
 
        if ((!isPostRequestParameterSet('smtp_pass1')) && (isPostRequestParameterSet('smtp_pass2'))) {
                // Password is empty
-               addToInstallContent('<div class="para">' . getMessage('INSTALL_SMTP_PASS1_EMPTY') . '</div>');
+               addToInstallContent('<div class="para">{--INSTALL_SMTP_PASS1_EMPTY--}</div>');
                setGetRequestParameter('page', 3);
        } // END - if
 
        if ((isPostRequestParameterSet('smtp_pass1')) && (!isPostRequestParameterSet('smtp_pass2'))) {
                // Password repeat is empty
-               addToInstallContent('<div class="para">' . getMessage('INSTALL_SMTP_PASS2_EMPTY') . '</div>');
+               addToInstallContent('<div class="para">{--INSTALL_SMTP_PASS2_EMPTY--}</div>');
                setGetRequestParameter('page', 3);
        } // END - if
 
        if (postRequestParameter('smtp_pass1') != postRequestParameter('smtp_pass1')) {
                // Passwords are not matching
-               addToInstallContent('<div class="para">' . getMessage('INSTALL_SMTP_PASS_MISMATCH') . '</div>');
+               addToInstallContent('<div class="para">{--INSTALL_SMTP_PASS_MISMATCH--}</div>');
                setGetRequestParameter('page', 3);
        } // END - if
 } // END - if
@@ -101,12 +108,13 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        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">');
+                               addToInstallContent('<div class="install_fatal"><ul>');
                                foreach (getFatalArray() as $key => $err) {
-                                       addToInstallContent('<div class="para"><strong>&middot;</strong> {--FATAL_NO--}' . ($key + 1) . ': ' . $err . '</div>');
+                                       addToInstallContent('<li> {--FATAL_NO--}' . ($key + 1) . ': ' . $err . '</li>');
                                } // END - foreach
-                               addToInstallContent('</div>');
+                               addToInstallContent('</ol></div>');
                        } // END - if
+
                        $content['mysql_host']   = $GLOBALS['install_mysql']['host'];
                        $content['mysql_dbase']  = $GLOBALS['install_mysql']['dbase'];
                        $content['mysql_prefix'] = $GLOBALS['install_mysql']['prefix'];
@@ -131,10 +139,10 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        $content['email']      = postRequestParameter('email');
 
                        // Use default SMTP data
-                       $smtpHost  = getConfig('SMTP_HOSTNAME');
-                       $smtpUser  = getConfig('SMTP_USER');
-                       $smtpPass1 = getConfig('SMTP_PASSWORD');
-                       $smtpPass2 = getConfig('SMTP_PASSWORD');
+                       $smtpHost  = '{?SMTP_HOSTNAME?}';
+                       $smtpUser  = '{?SMTP_USER?}';
+                       $smtpPass1 = '{?SMTP_PASSWORD?}';
+                       $smtpPass2 = '{?SMTP_PASSWORD?}';
 
                        // Overwrite it with the data from sent (failed) form
                        if (isPostRequestParameterSet('smtp_host')) $smtpHost = postRequestParameter('smtp_host');
@@ -179,7 +187,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        // MySQL data
                        $OUT = '';
                        foreach ($GLOBALS['install_mysql'] as $key => $value) {
-                               $OUT .= "    <input type=\"hidden\" name=\"mysql[" . $key . "]\" value=\"" . $value . "\" />\n";
+                               $OUT .= '    <input type="hidden" name="mysql[' . $key . ']" value="' . $value . '" />';
                        } // END - foreach
                        $content['mysql_hidden'] = $OUT;
 
@@ -192,6 +200,11 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                // You have submitted data then we have to reset the SQLs
                                initSqls();
 
+                               // Restore PHPs error handler to prevent ours to handle errors,
+                               // e.g. failed connection attempts. We want to handle them on
+                               // our own.
+                               restore_error_handler();
+
                                // Connect to MySQL server
                                SQL_CONNECT($GLOBALS['install_mysql']['host'], $GLOBALS['install_mysql']['login'], $GLOBALS['install_mysql']['pass1'], __FILE__, __LINE__);
 
@@ -202,7 +215,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                                // 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'));
+                                                       addFatalMessage(__FILE__, __LINE__, '{--INSTALL_MISSING_DUMPS--}');
                                                        return;
                                                } // END - if
 
@@ -226,7 +239,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                                                        mergeSqls(explode(";\n", $fileContent), 'install');
                                                                } else {
                                                                        // Not readable!
-                                                                       debug_report_bug(sprintf("SQL dump %s is not readable!", $dump));
+                                                                       debug_report_bug(__FILE__, __LINE__, sprintf("SQL dump %s is not readable!", $dump));
                                                                }
                                                        } // END - foreach
                                                        //* DEBUG: */ die(__FUNCTION__.'['.__LINE__.']:'<pre>'.print_r(getSqls(), true).'</pre>');
@@ -234,7 +247,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                                        // Are some SQLs found?
                                                        if (countSqls() == 0) {
                                                                // Abort here
-                                                               addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_SQL_IMPORT_FAILED'));
+                                                               addFatalMessage(__FILE__, __LINE__, '{--INSTALL_SQL_IMPORT_FAILED--}');
                                                                return;
                                                        } // END - if
 
@@ -267,13 +280,16 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 
                                        // Load template
                                        addTemplateToInstallContent('install_fatal_errors', $content);
+
+                                       // We have handled all fatal errors here
+                                       initFatalMessages();
                                } else {
                                        // Installation is done!
                                        redirectToUrl('install.php?page=finished');
                                }
                        } else {
                                // Something goes wrong during installation! :-(
-                               addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_FINALIZER_FAILED'));
+                               addFatalMessage(__FILE__, __LINE__, '{--INSTALL_FINALIZER_FAILED--}');
                        }
                        break;
 
@@ -289,12 +305,12 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
 
                default:
                        logDebugMessage(__FILE__, __LINE__, sprintf("Wrong page %s detected", getRequestParameter('page')));
-                       addTemplateToInstallContent('admin_settings_saved', '<div class="install_error">{--WRONG_PAGE--}</div>');
+                       addTemplateToInstallContent('admin_settings_unsaved', '{--WRONG_PAGE--}');
                        break;
        } // END - switch
 } else {
        // Already installed!
-       addFatalMessage(__FILE__, __LINE__, getMessage('ALREADY_INSTALLED'));
+       addFatalMessage(__FILE__, __LINE__, '{--ALREADY_INSTALLED--}');
 }
 
 // [EOF]