X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Finstall-inc.php;h=1f70d3aa550c524d7e69bad93157f918e42a65e8;hp=8dbe1a834b57ca38979d826e5f7dd91709b9b929;hb=4b7f401f2a4680ae46ca41c57f749cfe35163660;hpb=039203d5428c9c6a3bed61fb3a9a16958c6fd44c diff --git a/inc/install-inc.php b/inc/install-inc.php index 8dbe1a834b..1f70d3aa55 100644 --- a/inc/install-inc.php +++ b/inc/install-inc.php @@ -18,6 +18,7 @@ * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * + * Copyright (c) 2009, 2010 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,44 +47,44 @@ if (!defined('__SECURITY')) { } // END - if // Init variables -$mysql = array(); -if ((isPostRequestElementSet('mysql')) && (is_array(postRequestElement('mysql')))) { +$GLOBALS['install_mysql'] = array(); +if ((isPostRequestParameterSet('mysql')) && (is_array(postRequestParameter('mysql')))) { // Transfer 'mysql' array - $mysql = postRequestElement('mysql'); + $GLOBALS['install_mysql'] = postRequestParameter('mysql'); } // END - if // Check if both passwords from SMTP are matching -if ((isGetRequestElementSet('page') && (getRequestElement('page') == 5))) { +if ((isGetRequestParameterSet('page') && (getRequestParameter('page') == 5))) { // Okay, we have to check it - if (isPostRequestElementSet('smtp_user') && (!isPostRequestElementSet('smtp_host'))) { + if (isPostRequestParameterSet('smtp_user') && (!isPostRequestParameterSet('smtp_host'))) { // Hostname not set addToInstallContent('
' . getMessage('INSTALL_SMTP_HOSTNAME_EMPTY') . '
'); - setRequestGetElement('page', 3); + setGetRequestParameter('page', 3); } // END - if - if ((!isPostRequestElementSet('smtp_pass1')) && (isPostRequestElementSet('smtp_pass2'))) { + if ((!isPostRequestParameterSet('smtp_pass1')) && (isPostRequestParameterSet('smtp_pass2'))) { // Password is empty addToInstallContent('
' . getMessage('INSTALL_SMTP_PASS1_EMPTY') . '
'); - setRequestGetElement('page', 3); + setGetRequestParameter('page', 3); } // END - if - if ((isPostRequestElementSet('smtp_pass1')) && (!isPostRequestElementSet('smtp_pass2'))) { + if ((isPostRequestParameterSet('smtp_pass1')) && (!isPostRequestParameterSet('smtp_pass2'))) { // Password repeat is empty addToInstallContent('
' . getMessage('INSTALL_SMTP_PASS2_EMPTY') . '
'); - setRequestGetElement('page', 3); + setGetRequestParameter('page', 3); } // END - if - if (postRequestElement('smtp_pass1') != postRequestElement('smtp_pass1')) { + if (postRequestParameter('smtp_pass1') != postRequestParameter('smtp_pass1')) { // Passwords are not matching addToInstallContent('
' . getMessage('INSTALL_SMTP_PASS_MISMATCH') . '
'); - setRequestGetElement('page', 3); + setGetRequestParameter('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 (getRequestElement('page')) { + switch (getRequestParameter('page')) { case 'welcome': // Welcome to the installation! addTemplateToInstallContent('install_welcome'); break; @@ -94,28 +95,28 @@ if ((!isInstalled()) || (!isAdminRegistered())) { 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) { + 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) { - addToInstallContent('
· {--FATAL_NO--}' . ($key + 1) . ': ' . $err . '
'); - } + addToInstallContent('
· {--FATAL_NO--}' . ($key + 1) . ': ' . $err . '
'); + } // END - foreach addToInstallContent('
'); - } - $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']; - $content['spath'] = postRequestElement('spath'); - $content['burl'] = postRequestElement('burl'); - $content['title'] = postRequestElement('title'); - $content['slogan'] = postRequestElement('slogan'); - $content['email'] = postRequestElement('email'); + } // 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 addTemplateToInstallContent('install_page2', $content); @@ -123,11 +124,11 @@ if ((!isInstalled()) || (!isAdminRegistered())) { case '3': // Set more values - $content['spath'] = postRequestElement('spath'); - $content['burl'] = postRequestElement('burl'); - $content['title'] = postRequestElement('title'); - $content['slogan'] = postRequestElement('slogan'); - $content['email'] = postRequestElement('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'); @@ -136,21 +137,21 @@ if ((!isInstalled()) || (!isAdminRegistered())) { $smtpPass2 = getConfig('SMTP_PASSWORD'); // Overwrite it with the data from sent (failed) form - 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'); + 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 - $content['mysql_host'] = $mysql['host']; - $content['mysql_dbase'] = $mysql['dbase']; - $content['mysql_prefix'] = $mysql['prefix']; - $content['table_type'] = $mysql['type']; - $content['mysql_login'] = $mysql['login']; - $content['mysql_pass1'] = $mysql['pass1']; - $content['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 $content['smtp_host'] = $smtpHost; @@ -164,20 +165,20 @@ if ((!isInstalled()) || (!isAdminRegistered())) { case '5': // Misc settings // General settings - $content['spath'] = postRequestElement('spath'); - $content['burl'] = postRequestElement('burl'); - $content['title'] = postRequestElement('title'); - $content['slogan'] = postRequestElement('slogan'); - $content['email'] = postRequestElement('email'); + $content['spath'] = postRequestParameter('spath'); + $content['burl'] = postRequestParameter('burl'); + $content['title'] = postRequestParameter('title'); + $content['slogan'] = postRequestParameter('slogan'); + $content['email'] = postRequestParameter('email'); // SMTP settings - $content['smtp_host'] = postRequestElement('smtp_host'); - $content['smtp_user'] = postRequestElement('smtp_user'); - $content['smtp_pass'] = postRequestElement('smtp_pass1'); + $content['smtp_host'] = postRequestParameter('smtp_host'); + $content['smtp_user'] = postRequestParameter('smtp_user'); + $content['smtp_pass'] = postRequestParameter('smtp_pass1'); // MySQL data $OUT = ''; - foreach ($mysql as $key => $value) { + foreach ($GLOBALS['install_mysql'] as $key => $value) { $OUT .= " \n"; } // END - foreach $content['mysql_hidden'] = $OUT; @@ -187,50 +188,51 @@ if ((!isInstalled()) || (!isAdminRegistered())) { break; case 'finalize': // Write captured data to files - if ((isPostRequestElementSet('finalize')) && (!isInstalled())) { + if ((isPostRequestParameterSet('finalize')) && (!isInstalled())) { // You have submitted data then we have to reset the 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(postRequestElement('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestElement('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')); + return; } // END - if - if (getTotalFatalErrors() == '0') { + // Any errors detected? + if (!ifFatalErrorsDetected()) { // Set type and prefix from POST data - setConfigEntry('_TABLE_TYPE' , postRequestElement('mysql', 'type')); - setConfigEntry('_MYSQL_PREFIX', postRequestElement('mysql', 'prefix')); + 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 = postRequestElement('spath') . 'install/' . $dump . '.sql'; + $FQFN = postRequestParameter('spath') . 'install/' . $dump . '.sql'; // Is the file readable? if (isFileReadable($FQFN)) { // Read the file - $fileContent = readFromFile($FQFN, true); - - // Compile all config entries (we use a filter here, yes...) - $fileContent = FILTER_COMPILE_CONFIG($fileContent); + $fileContent = readSqlDump($FQFN); // Split it up against ";\n" and merge it into existing SQLs 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('
'.print_r(getSqls(), true).'
'); + //* DEBUG: */ die(__FUNCTION__.'['.__LINE__.']:'
'.print_r(getSqls(), true).'
'); // Are some SQLs found? - if (countSqls() == '0') { + if (countSqls() == 0) { // Abort here addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_SQL_IMPORT_FAILED')); return; @@ -245,23 +247,23 @@ if ((!isInstalled()) || (!isAdminRegistered())) { } // END - if } // END - if - if (getTotalFatalErrors() > 0) { + if (ifFatalErrorsDetected()) { $OUT = ''; foreach (getFatalArray() as $value) { $OUT .= '
  • ' . $value . '
    • '; } // END foreach $content['fatal_errors'] = $OUT; $OUT = ''; - foreach ($mysql as $key => $value) { + foreach ($GLOBALS['install_mysql'] as $key => $value) { $OUT .= ' '; } // END foreach $content['mysql_hidden'] = $OUT; - $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'); + $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 addTemplateToInstallContent('install_fatal_errors', $content); @@ -286,7 +288,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) { break; default: - logDebugMessage(__FILE__, __LINE__, sprintf("Wrong page %s detected", getRequestElement('page'))); + logDebugMessage(__FILE__, __LINE__, sprintf("Wrong page %s detected", getRequestParameter('page'))); addTemplateToInstallContent('admin_settings_saved', '
    {--WRONG_PAGE--}
    '); break; } // END - switch