X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Finstall-inc.php;h=378c60bdea5beafd27f242788311c8481604aa54;hp=137257c89eb38d47fd03b58585a54af691c593e8;hb=2379934be6a196a54f4155bb8e24c49b20736969;hpb=7618bd22d09e9bddab2ca39308f6523c06dd1521 diff --git a/inc/install-inc.php b/inc/install-inc.php index 137257c89e..378c60bdea 100644 --- a/inc/install-inc.php +++ b/inc/install-inc.php @@ -14,11 +14,9 @@ * $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 * + * Copyright (c) 2009 - 2011 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,45 +44,54 @@ 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(array()); + // Init variables $GLOBALS['install_mysql'] = array(); -if ((isPostRequestParameterSet('mysql')) && (is_array(postRequestParameter('mysql')))) { +if ((isPostRequestElementSet('mysql')) && (is_array(postRequestElement('mysql')))) { // Transfer 'mysql' array - $GLOBALS['install_mysql'] = postRequestParameter('mysql'); + $GLOBALS['install_mysql'] = postRequestElement('mysql'); } // END - if // Check if both passwords from SMTP are matching -if ((isGetRequestParameterSet('page') && (getRequestParameter('page') == 5))) { +if ((isGetRequestElementSet('page') && (getRequestElement('page') == 5))) { // Okay, we have to check it - if (isPostRequestParameterSet('smtp_user') && (!isPostRequestParameterSet('smtp_host'))) { + if (isPostRequestElementSet('smtp_user') && (!isPostRequestElementSet('smtp_host'))) { // Hostname not set - addToInstallContent('
' . getMessage('INSTALL_SMTP_HOSTNAME_EMPTY') . '
'); - setGetRequestParameter('page', 3); + addToInstallContent('
{--INSTALL_SMTP_HOSTNAME_EMPTY--}
'); + setGetRequestElement('page', 3); } // END - if - if ((!isPostRequestParameterSet('smtp_pass1')) && (isPostRequestParameterSet('smtp_pass2'))) { + if ((!isPostRequestElementSet('smtp_pass1')) && (isPostRequestElementSet('smtp_pass2'))) { // Password is empty - addToInstallContent('
' . getMessage('INSTALL_SMTP_PASS1_EMPTY') . '
'); - setGetRequestParameter('page', 3); + addToInstallContent('
{--INSTALL_SMTP_PASSWORD1_EMPTY--}
'); + setGetRequestElement('page', 3); } // END - if - if ((isPostRequestParameterSet('smtp_pass1')) && (!isPostRequestParameterSet('smtp_pass2'))) { + if ((isPostRequestElementSet('smtp_pass1')) && (!isPostRequestElementSet('smtp_pass2'))) { // Password repeat is empty - addToInstallContent('
' . getMessage('INSTALL_SMTP_PASS2_EMPTY') . '
'); - setGetRequestParameter('page', 3); + addToInstallContent('
{--INSTALL_SMTP_PASSWORD2_EMPTY--}
'); + setGetRequestElement('page', 3); } // END - if - if (postRequestParameter('smtp_pass1') != postRequestParameter('smtp_pass1')) { + if (postRequestElement('smtp_pass1') != postRequestElement('smtp_pass1')) { // Passwords are not matching - addToInstallContent('
' . getMessage('INSTALL_SMTP_PASS_MISMATCH') . '
'); - setGetRequestParameter('page', 3); + addToInstallContent('
{--INSTALL_SMTP_PASS_MISMATCH--}
'); + setGetRequestElement('page', 3); } // END - if } // END - if // Is the mailer installed or no admin registered so far? if ((!isInstalled()) || (!isAdminRegistered())) { // Output page for entered value - switch (getRequestParameter('page')) { + switch (getRequestElement('page')) { case 'welcome': // Welcome to the installation! addTemplateToInstallContent('install_welcome'); break; @@ -94,29 +101,30 @@ if ((!isInstalled()) || (!isAdminRegistered())) { 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']['prefix'])) $GLOBALS['install_mysql']['prefix'] = 'mailer'; if (empty($GLOBALS['install_mysql']['type'])) $GLOBALS['install_mysql']['type'] = 'MyISAM'; if (ifFatalErrorsDetected()) { - addToInstallContent('
'); + addToInstallContent('
'); + addToInstallContent('
'); } // 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'); - $content['slogan'] = postRequestParameter('slogan'); - $content['email'] = postRequestParameter('email'); + $content['spath'] = postRequestElement('spath'); + $content['burl'] = postRequestElement('burl'); + $content['title'] = postRequestElement('title'); + $content['slogan'] = postRequestElement('slogan'); + $content['email'] = postRequestElement('email'); // Load template addTemplateToInstallContent('install_page2', $content); @@ -124,27 +132,27 @@ if ((!isInstalled()) || (!isAdminRegistered())) { case '3': // Set more values - $content['spath'] = postRequestParameter('spath'); - $content['burl'] = postRequestParameter('burl'); - $content['title'] = postRequestParameter('title'); - $content['slogan'] = postRequestParameter('slogan'); - $content['email'] = postRequestParameter('email'); + $content['spath'] = postRequestElement('spath'); + $content['burl'] = postRequestElement('burl'); + $content['title'] = postRequestElement('title'); + $content['slogan'] = postRequestElement('slogan'); + $content['email'] = postRequestElement('email'); // Use default SMTP data - $smtpHost = '{?SMTP_HOSTNAME'); + $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'); - if (isPostRequestParameterSet('smtp_user')) $smtpUser = postRequestParameter('smtp_user'); - if (isPostRequestParameterSet('smtp_pass')) { - $smtpPass1 = postRequestParameter('smtp_pass'); - $smtpPass2 = postRequestParameter('smtp_pass'); + if (isPostRequestElementSet('smtp_host')) $smtpHost = postRequestElement('smtp_host'); + if (isPostRequestElementSet('smtp_user')) $smtpUser = postRequestElement('smtp_user'); + if (isPostRequestElementSet('smtp_pass')) { + $smtpPass1 = postRequestElement('smtp_pass'); + $smtpPass2 = postRequestElement('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']; @@ -165,18 +173,18 @@ if ((!isInstalled()) || (!isAdminRegistered())) { case '5': // Misc settings // General settings - $content['spath'] = postRequestParameter('spath'); - $content['burl'] = postRequestParameter('burl'); - $content['title'] = postRequestParameter('title'); - $content['slogan'] = postRequestParameter('slogan'); - $content['email'] = postRequestParameter('email'); + $content['spath'] = postRequestElement('spath'); + $content['burl'] = postRequestElement('burl'); + $content['title'] = postRequestElement('title'); + $content['slogan'] = postRequestElement('slogan'); + $content['email'] = postRequestElement('email'); // SMTP settings - $content['smtp_host'] = postRequestParameter('smtp_host'); - $content['smtp_user'] = postRequestParameter('smtp_user'); - $content['smtp_pass'] = postRequestParameter('smtp_pass1'); + $content['smtp_host'] = postRequestElement('smtp_host'); + $content['smtp_user'] = postRequestElement('smtp_user'); + $content['smtp_pass'] = postRequestElement('smtp_pass1'); - // MySQL data + // Database login data $OUT = ''; foreach ($GLOBALS['install_mysql'] as $key => $value) { $OUT .= ' '; @@ -188,11 +196,18 @@ if ((!isInstalled()) || (!isAdminRegistered())) { break; case 'finalize': // Write captured data to files - if ((isPostRequestParameterSet('finalize')) && (!isInstalled())) { + if ((isPostRequestElementSet('finalize')) && (!isInstalled())) { // 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? @@ -200,22 +215,22 @@ if ((!isInstalled()) || (!isAdminRegistered())) { // Seems to work, also right database? 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')); + if ((!isFileReadable(postRequestElement('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestElement('spath') . 'install/menu-'.getLanguage().'.sql'))) { + // Installation area not found + debug_report_bug(__FILE__, __LINE__, 'SQL dumps not found. Please extract ALL files from the archive or checkout all files out from SVN.'); return; } // END - if // Any errors detected? if (!ifFatalErrorsDetected()) { // Set type and prefix from POST data - setConfigEntry('_TABLE_TYPE' , postRequestParameter('mysql', 'type')); - setConfigEntry('_MYSQL_PREFIX', postRequestParameter('mysql', 'prefix')); + setConfigEntry('_TABLE_TYPE' , postRequestElement('mysql', 'type')); + setConfigEntry('_MYSQL_PREFIX', postRequestElement('mysql', 'prefix')); // Both exists so import them foreach (array('tables', 'menu-'.getLanguage()) as $dump) { // Should be save here because file_exists() is there but we check it again. :) - $FQFN = postRequestParameter('spath') . 'install/' . $dump . '.sql'; + $FQFN = postRequestElement('spath') . 'install/' . $dump . '.sql'; // Is the file readable? if (isFileReadable($FQFN)) { @@ -234,7 +249,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 @@ -258,22 +273,25 @@ if ((!isInstalled()) || (!isAdminRegistered())) { $OUT .= ' '; } // END foreach $content['mysql_hidden'] = $OUT; - $content['spath'] = postRequestParameter('spath'); - $content['burl'] = postRequestParameter('burl'); - $content['title'] = postRequestParameter('title'); - $content['smtp_host'] = postRequestParameter('smtp_host'); - $content['smtp_user'] = postRequestParameter('smtp_user'); - $content['smtp_pass'] = postRequestParameter('smtp_pass1'); + $content['spath'] = postRequestElement('spath'); + $content['burl'] = postRequestElement('burl'); + $content['title'] = postRequestElement('title'); + $content['smtp_host'] = postRequestElement('smtp_host'); + $content['smtp_user'] = postRequestElement('smtp_user'); + $content['smtp_pass'] = postRequestElement('smtp_pass1'); // 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; @@ -288,13 +306,13 @@ if ((!isInstalled()) || (!isAdminRegistered())) { break; default: - logDebugMessage(__FILE__, __LINE__, sprintf("Wrong page %s detected", getRequestParameter('page'))); - addTemplateToInstallContent('admin_settings_saved', '
{--WRONG_PAGE--}
'); + logDebugMessage(__FILE__, __LINE__, sprintf("Wrong page %s detected", getRequestElement('page'))); + addTemplateToInstallContent('admin_settings_unsaved', '{--WRONG_PAGE--}'); break; } // END - switch } else { // Already installed! - addFatalMessage(__FILE__, __LINE__, getMessage('ALREADY_INSTALLED')); + addFatalMessage(__FILE__, __LINE__, '{--ALREADY_INSTALLED--}'); } // [EOF]