* $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 *
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')))) {
// 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
addTemplateToInstallContent('install_page1');
break;
- case '2': // MySQL data (alone!)
+ case '2': // Database login data
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">');
+ addToInstallContent('<div class="install_fatal"><ul>');
foreach (getFatalArray() as $key => $err) {
- addToInstallContent('<div class="para"><strong>·</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'];
$smtpPass2 = postRequestParameter('smtp_pass');
} // END - if
- // MySQL settings
+ // Database login data
$content['mysql_host'] = $GLOBALS['install_mysql']['host'];
$content['mysql_dbase'] = $GLOBALS['install_mysql']['dbase'];
$content['mysql_prefix'] = $GLOBALS['install_mysql']['prefix'];
$content['smtp_user'] = postRequestParameter('smtp_user');
$content['smtp_pass'] = postRequestParameter('smtp_pass1');
- // MySQL data
+ // Database login data
$OUT = '';
foreach ($GLOBALS['install_mysql'] as $key => $value) {
$OUT .= ' <input type="hidden" name="mysql[' . $key . ']" value="' . $value . '" />';
// You have submitted data then we have to reset the SQLs
initSqls();
- // Connect to MySQL server
+ // 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 database server
SQL_CONNECT($GLOBALS['install_mysql']['host'], $GLOBALS['install_mysql']['login'], $GLOBALS['install_mysql']['pass1'], __FILE__, __LINE__);
// Is the link up?
// 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
// 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
// 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;
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]