X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Finstall-inc.php;h=0b8928b27ce1bfc126c2da8a6c11284b2f161d04;hp=561967bd61dc3848ba5307ae49bf7315373342e4;hb=30ae22f62ae87c53a56baf0d134569ba91011111;hpb=3f51c40f4fede87228216f9285b745a339e3891d diff --git a/inc/install-inc.php b/inc/install-inc.php index 561967bd61..0b8928b27c 100644 --- a/inc/install-inc.php +++ b/inc/install-inc.php @@ -1,7 +1,7 @@ '); - REQUEST_SET_GET('page', 3); + addToInstallContent('
{--INSTALL_SMTP_HOSTNAME_EMPTY--}
'); + setGetRequestParameter('page', 3); } // END - if - if ((!REQUEST_ISSET_POST('smtp_pass1')) && (REQUEST_ISSET_POST('smtp_pass2'))) { + if ((!isPostRequestParameterSet('smtp_pass1')) && (isPostRequestParameterSet('smtp_pass2'))) { // Password is empty - OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS1_EMPTY') . '
'); - REQUEST_SET_GET('page', 3); + addToInstallContent('
{--INSTALL_SMTP_PASS1_EMPTY--}
'); + setGetRequestParameter('page', 3); } // END - if - if ((REQUEST_ISSET_POST('smtp_pass1')) && (!REQUEST_ISSET_POST('smtp_pass2'))) { + if ((isPostRequestParameterSet('smtp_pass1')) && (!isPostRequestParameterSet('smtp_pass2'))) { // Password repeat is empty - OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS2_EMPTY') . '
'); - REQUEST_SET_GET('page', 3); + addToInstallContent('
{--INSTALL_SMTP_PASS2_EMPTY--}
'); + setGetRequestParameter('page', 3); } // END - if - if (REQUEST_POST('smtp_pass1') != REQUEST_POST('smtp_pass1')) { + if (postRequestParameter('smtp_pass1') != postRequestParameter('smtp_pass1')) { // Passwords are not matching - OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS_MISMATCH') . '
'); - REQUEST_SET_GET('page', 3); + addToInstallContent('
{--INSTALL_SMTP_PASS_MISMATCH--}
'); + setGetRequestParameter('page', 3); } // END - if } // END - if -// Is MXChange installed or no admin registered so far? +// Is the mailer installed or no admin registered so far? if ((!isInstalled()) || (!isAdminRegistered())) { - // Set URL for FORM actions - define('__BURL_ACTION', constant('URL')); - // Output page for entered value - switch (REQUEST_GET('page')) { + switch (getRequestParameter('page')) { case 'welcome': // Welcome to the installation! - LOAD_TEMPLATE('install_welcome'); + addTemplateToInstallContent('install_welcome'); break; case '1': // Server path, base URL // Load template - LOAD_TEMPLATE('install_page1'); + addTemplateToInstallContent('install_page1'); 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) { - OUTPUT_HTML(''); + 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('
'); foreach (getFatalArray() as $key => $err) { - OUTPUT_HTML('· {--FATAL_NO--}' . ($key + 1) . ': ' . $err . '
'); - } - OUTPUT_HTML('
'); - } - define('__MYSQL_HOST' , $mysql['host']); - define('__MYSQL_DBASE' , $mysql['dbase']); - define('__MYSQL_PREFIX', $mysql['prefix']); - define('__TABLE_TYPE' , $mysql['type']); - define('__MYSQL_LOGIN' , $mysql['login']); - define('__SPATH_VALUE' , REQUEST_POST('spath')); - define('__BURL_VALUE' , REQUEST_POST('burl')); - define('__TITLE_VALUE' , REQUEST_POST('title')); - define('__SLOGAN_VALUE', REQUEST_POST('slogan')); - define('__EMAIL_VALUE' , REQUEST_POST('email')); + addToInstallContent('
· {--FATAL_NO--}' . ($key + 1) . ': ' . $err . '
'); + } // END - foreach + 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'); // Load template - LOAD_TEMPLATE('install_page2'); + addTemplateToInstallContent('install_page2', $content); break; case '3': // Set more values - define('__SPATH_VALUE' , REQUEST_POST('spath')); - define('__BURL_VALUE' , REQUEST_POST('burl')); - define('__TITLE_VALUE' , REQUEST_POST('title')); - define('__SLOGAN_VALUE', REQUEST_POST('slogan')); - define('__EMAIL_VALUE' , REQUEST_POST('email')); + $content['spath'] = postRequestParameter('spath'); + $content['burl'] = postRequestParameter('burl'); + $content['title'] = postRequestParameter('title'); + $content['slogan'] = postRequestParameter('slogan'); + $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 (REQUEST_ISSET_POST('smtp_host')) $smtpHost = REQUEST_POST('smtp_host'); - if (REQUEST_ISSET_POST('smtp_user')) $smtpUser = REQUEST_POST('smtp_user'); - if (REQUEST_ISSET_POST('smtp_pass')) { - $smtpPass1 = REQUEST_POST('smtp_pass'); - $smtpPass2 = REQUEST_POST('smtp_pass'); + 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'); } // END - if // MySQL settings - define('__MYSQL_HOST' , $mysql['host']); - define('__MYSQL_DBASE' , $mysql['dbase']); - define('__MYSQL_PREFIX', $mysql['prefix']); - define('__TABLE_TYPE' , $mysql['type']); - define('__MYSQL_LOGIN' , $mysql['login']); - define('__MYSQL_PASS1' , $mysql['pass1']); - define('__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 - define('__SMTP_HOST' , $smtpHost); - define('__SMTP_USER' , $smtpUser); - define('__SMTP_PASS1', $smtpPass1); - define('__SMTP_PASS2', $smtpPass2); + $content['smtp_host'] = $smtpHost; + $content['smtp_user'] = $smtpUser; + $content['smtp_pass1'] = $smtpPass1; + $content['smtp_pass2'] = $smtpPass2; // Load template - LOAD_TEMPLATE('install_page3'); + addTemplateToInstallContent('install_page3', $content); break; case '5': // Misc settings // General settings - define('__SPATH_VALUE' , REQUEST_POST('spath')); - define('__BURL_VALUE' , REQUEST_POST('burl')); - define('__TITLE_VALUE' , REQUEST_POST('title')); - define('__SLOGAN_VALUE', REQUEST_POST('slogan')); - define('__EMAIL_VALUE' , REQUEST_POST('email')); - - // MySQL settings - define('__MYSQL_HOST' , $mysql['host']); - define('__MYSQL_DBASE' , $mysql['dbase']); - define('__MYSQL_PREFIX', $mysql['prefix']); - define('__TABLE_TYPE' , $mysql['type']); - define('__MYSQL_LOGIN' , $mysql['login']); + $content['spath'] = postRequestParameter('spath'); + $content['burl'] = postRequestParameter('burl'); + $content['title'] = postRequestParameter('title'); + $content['slogan'] = postRequestParameter('slogan'); + $content['email'] = postRequestParameter('email'); // SMTP settings - define('__SMTP_HOST', REQUEST_POST('smtp_host')); - define('__SMTP_USER', REQUEST_POST('smtp_user')); - define('__SMTP_PASS', REQUEST_POST('smtp_pass1')); + $content['smtp_host'] = postRequestParameter('smtp_host'); + $content['smtp_user'] = postRequestParameter('smtp_user'); + $content['smtp_pass'] = postRequestParameter('smtp_pass1'); // MySQL data - $content = ''; - foreach ($mysql as $key => $value) { - $content .= " \n"; - } - define('__MYSQL_DATA', $content); + $OUT = ''; + foreach ($GLOBALS['install_mysql'] as $key => $value) { + $OUT .= ' '; + } // END - foreach + $content['mysql_hidden'] = $OUT; // Load template - LOAD_TEMPLATE('install_page5'); + addTemplateToInstallContent('install_page5', $content); break; case 'finalize': // Write captured data to files - if ((REQUEST_ISSET_POST('finalize')) && (!isInstalled())) { + if ((isPostRequestParameterSet('finalize')) && (!isInstalled())) { // You have submitted data then we have to reset the SQLs - INIT_SQLS(); + 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 ((!isFileReadable(REQUEST_POST('spath') . 'install/tables.sql')) || (!isFileReadable(REQUEST_POST('spath') . 'install/menu-'.getLanguage().'.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')); + addFatalMessage(__FILE__, __LINE__, '{--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')); + // 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 = REQUEST_POST('spath') . 'install/' . $dump . '.sql'; + $FQFN = postRequestParameter('spath') . 'install/' . $dump . '.sql'; // Is the file readable? if (isFileReadable($FQFN)) { // Read the file - $fileContent = readFromFile($FQFN, true); - - // Replace the {!prefix/type!} with actual one - foreach (array('prefix', 'type') as $replace) { - while (strpos($fileContent, '{!' . $replace . '!}') !== false) { - $fileContent = str_replace('{!' . $replace . '!}', $mysql[$replace], $fileContent); - } // END - while - } // END - foreach + $fileContent = readSqlDump($FQFN); // Split it up against ";\n" and merge it into existing SQLs - MERGE_SQLS(explode(";\n", $fileContent)); + 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__.']:'
'.print_r(getSqls(), true).'
'); // Are some SQLs found? - if (COUNT_SQLS() == 0) { + if (countSqls() == 0) { // Abort here - addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_SQL_IMPORT_FAILED')); + addFatalMessage(__FILE__, __LINE__, '{--INSTALL_SQL_IMPORT_FAILED--}'); return; } // END - if @@ -249,75 +242,45 @@ if ((!isInstalled()) || (!isAdminRegistered())) { runFilterChain('run_sqls'); // Copy the config template and verify it - copyFileVerified(REQUEST_POST('spath') . 'inc/config-local.php.dist', REQUEST_POST('spath') . 'inc/cache/config-local.php', 0644); - - // Ok, all done. So we can write the config data to the php files - if (REQUEST_POST('spath') != constant('PATH')) changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'SERVER-PATH', "define('PATH', '", "');", REQUEST_POST('spath'), 0); - if (REQUEST_POST('burl') != constant('URL')) changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'HOST-URL', "define('URL', '", "');", REQUEST_POST('burl'), 0); - changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'MAIN-TITLE', "define('MAIN_TITLE', '", "');", REQUEST_POST('title'), 0); - changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'SLOGAN', "define('SLOGAN', '", "');", REQUEST_POST('slogan'), 0); - changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'WEBMASTER', "define('WEBMASTER', '", "');", REQUEST_POST('email'), 0); - changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'NULLPASS-WARNING', "setConfigEntry('WARN_NO_PASS', '", "');", REQUEST_POST('warn_no_pass'), 0); - changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'WRITE-FOOTER', "setConfigEntry('WRITE_FOOTER', '", "');", REQUEST_POST('wfooter'), 0); - changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'BACKLINK', "setConfigEntry('ENABLE_BACKLINK', '", "');", REQUEST_POST('blink'), 0); - // DEACTIVATED: changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'OUTPUT-MODE', "define('OUTPUT_MODE', '", "');", REQUEST_POST('omode'), 0); - changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'MYSQL-HOST', " 'host' => '", "',", $mysql['host'], 0); - changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'MYSQL-DBASE', " 'dbase' => '", "',", $mysql['dbase'], 0); - changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'MYSQL-LOGIN', " 'login' => '", "',", $mysql['login'], 0); - changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'MYSQL-PASSWORD', " 'password' => '", "',", $mysql['pass1'], 0); - changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'MYSQL-PREFIX', "setConfigEntry('_MYSQL_PREFIX', '", "');", $mysql['prefix'], 0); - changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'TABLE-TYPE', "setConfigEntry('_TABLE_TYPE', '", "');", $mysql['type'], 0); - changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'SMTP-HOSTNAME', "setConfigEntry('SMTP_HOSTNAME', '", "');", REQUEST_POST('smtp_host'), 0); - changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'SMTP-USER', "setConfigEntry('SMTP_USER', '", "');", REQUEST_POST('smtp_user'), 0); - changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'SMTP-PASSWORD', "setConfigEntry('SMTP_PASSWORD', '", "');", REQUEST_POST('smtp_pass1'), 0); - - // Generate a long site key - $siteKey = generatePassword(50); - - // And write it - changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'SITE-KEY', "setConfigEntry('SITE_KEY', '", "');", $siteKey, 0); - - // Script is now installed - changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'INSTALLED', "setConfigEntry('MXCHANGE_INSTALLED', '", "');", 'Y', 0); + doInstallWriteLocalConfig(); } // END - if } // END - if } // END - if - if (getTotalFatalErrors() > 0) { + if (ifFatalErrorsDetected()) { $OUT = ''; foreach (getFatalArray() as $value) { - $OUT .= "
  • " . $value . "
    • \n"; + $OUT .= '
  • ' . $value . '
    • '; } // END foreach - define('__FATAL_ERROR_LI', $OUT); + $content['fatal_errors'] = $OUT; $OUT = ''; - foreach ($mysql as $key => $value) { - $OUT .= " \n"; + foreach ($GLOBALS['install_mysql'] as $key => $value) { + $OUT .= ' '; } // END foreach - define('__MYSQL_DATA' , $OUT); - define('__SPATH_VALUE' , REQUEST_POST('spath')); - define('__BURL_VALUE' , REQUEST_POST('burl')); - define('__TITLE_VALUE' , REQUEST_POST('title')); - define('__SMTP_HOST' , REQUEST_POST('smtp_host')); - define('__SMTP_USER' , REQUEST_POST('smtp_user')); - define('__SMTP_PASS' , REQUEST_POST('smtp_pass1')); + $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'); // Load template - LOAD_TEMPLATE('install_fatal_errors'); + addTemplateToInstallContent('install_fatal_errors', $content); } else { // Installation is done! redirectToUrl('install.php?page=finished'); } } else { // Something goes wrong during installation! :-( - addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_FINALIZER_FAILED')); - loadInclude('inc/fatal_errors.php'); + addFatalMessage(__FILE__, __LINE__, '{--INSTALL_FINALIZER_FAILED--}'); } break; case 'finished': if (isInstalled()) { // Load template that we are finished - LOAD_TEMPLATE('install_finished'); + addTemplateToInstallContent('install_finished'); } else { // Not finished redirectToUrl('install.php'); @@ -325,14 +288,14 @@ if ((!isInstalled()) || (!isAdminRegistered())) { break; default: - DEBUG_LOG(__FILE__, __LINE__, sprintf("Wrong page %s detected", REQUEST_GET('page'))); - OUTPUT_HTML("
    {--WRONG_PAGE--}
    "); + logDebugMessage(__FILE__, __LINE__, sprintf("Wrong page %s detected", getRequestParameter('page'))); + addTemplateToInstallContent('admin_settings_saved', '
    {--WRONG_PAGE--}
    '); break; - } + } // END - switch } else { // Already installed! - addFatalMessage(__FILE__, __LINE__, getMessage('ALREADY_INSTALLED')); + addFatalMessage(__FILE__, __LINE__, '{--ALREADY_INSTALLED--}'); } -// +// [EOF] ?>