X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Finstall-inc.php;h=561967bd61dc3848ba5307ae49bf7315373342e4;hb=3f51c40f4fede87228216f9285b745a339e3891d;hp=d2fb295a77c7c02fc72edc60713ca5a9048b37d4;hpb=5071030af40e69ca4284642f44758964e18f5be8;p=mailer.git
diff --git a/inc/install-inc.php b/inc/install-inc.php
index d2fb295a77..561967bd61 100644
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -17,6 +17,8 @@
* Needs to be in all Files and every File needs "svn propset *
* svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
+ * @TODO Rewrite all constants in this include file *
+ * -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2008 by Roland Haeder *
* For more information visit: http://www.mxchange.org *
* *
@@ -48,32 +50,32 @@ if (!defined('__SECURITY')) {
// Init variables
$mysql = array();
-if ((REQUEST_ISSET_POST(('mysql'))) && (is_array(REQUEST_POST('mysql')))) $mysql = REQUEST_POST('mysql');
+if ((REQUEST_ISSET_POST('mysql')) && (is_array(REQUEST_POST('mysql')))) $mysql = REQUEST_POST('mysql');
// Check if both passwords from SMTP are matching
if ((REQUEST_ISSET_GET('page') && (REQUEST_GET('page') == 5))) {
// Okay, we have to check it
- if (REQUEST_ISSET_POST(('smtp_user')) && (!REQUEST_ISSET_POST(('smtp_host')))) {
+ if (REQUEST_ISSET_POST('smtp_user') && (!REQUEST_ISSET_POST('smtp_host'))) {
// Hostname not set
- OUTPUT_HTML(getMessage('INSTALL_SMTP_HOSTNAME_EMPTY')."
");
+ OUTPUT_HTML(getMessage('INSTALL_SMTP_HOSTNAME_EMPTY') . '
');
REQUEST_SET_GET('page', 3);
} // END - if
- if ((!REQUEST_ISSET_POST(('smtp_pass1'))) && (REQUEST_ISSET_POST(('smtp_pass2')))) {
+ if ((!REQUEST_ISSET_POST('smtp_pass1')) && (REQUEST_ISSET_POST('smtp_pass2'))) {
// Password is empty
- OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS1_EMPTY')."
");
+ OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS1_EMPTY') . '
');
REQUEST_SET_GET('page', 3);
} // END - if
- if ((REQUEST_ISSET_POST(('smtp_pass1'))) && (!REQUEST_ISSET_POST(('smtp_pass2')))) {
+ if ((REQUEST_ISSET_POST('smtp_pass1')) && (!REQUEST_ISSET_POST('smtp_pass2'))) {
// Password repeat is empty
- OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS2_EMPTY')."
");
+ OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS2_EMPTY') . '
');
REQUEST_SET_GET('page', 3);
} // END - if
if (REQUEST_POST('smtp_pass1') != REQUEST_POST('smtp_pass1')) {
// Passwords are not matching
- OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS_MISMATCH')."
");
+ OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS_MISMATCH') . '
');
REQUEST_SET_GET('page', 3);
} // END - if
} // END - if
@@ -84,14 +86,12 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
define('__BURL_ACTION', constant('URL'));
// Output page for entered value
- switch (REQUEST_GET('page'))
- {
+ switch (REQUEST_GET('page')) {
case 'welcome': // Welcome to the installation!
LOAD_TEMPLATE('install_welcome');
break;
case '1': // Server path, base URL
- // @Profi-Concept: Hab meine Meinung doch geaendert! :-)
// Load template
LOAD_TEMPLATE('install_page1');
break;
@@ -103,11 +103,11 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
if (empty($mysql['prefix'])) $mysql['prefix'] = 'mxchange';
if (empty($mysql['type'])) $mysql['type'] = 'MyISAM';
if (getTotalFatalErrors() > 0) {
- OUTPUT_HTML("");
+ OUTPUT_HTML('');
foreach (getFatalArray() as $key => $err) {
- OUTPUT_HTML(" · {--FATAL_NO--}".($key + 1).": ".$err."
");
+ OUTPUT_HTML('· {--FATAL_NO--}' . ($key + 1) . ': ' . $err . '
');
}
- OUTPUT_HTML("
");
+ OUTPUT_HTML('
');
}
define('__MYSQL_HOST' , $mysql['host']);
define('__MYSQL_DBASE' , $mysql['dbase']);
@@ -139,9 +139,9 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
$smtpPass2 = getConfig('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'))) {
+ 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');
} // END - if
@@ -184,83 +184,20 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
define('__SMTP_HOST', REQUEST_POST('smtp_host'));
define('__SMTP_USER', REQUEST_POST('smtp_user'));
define('__SMTP_PASS', REQUEST_POST('smtp_pass1'));
- OUTPUT_HTML("
");
+ define('__MYSQL_DATA', $content);
+
+ // Load template
+ LOAD_TEMPLATE('install_page5');
break;
case 'finalize': // Write captured data to files
- if ((REQUEST_ISSET_POST(('finalize'))) && (!isInstalled())) {
+ if ((REQUEST_ISSET_POST('finalize')) && (!isInstalled())) {
// You have submitted data then we have to reset the SQLs
INIT_SQLS();
@@ -270,7 +207,12 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
// 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 ((!isFileReadable(REQUEST_POST('spath') . 'install/tables.sql')) || (!isFileReadable(REQUEST_POST('spath') . 'install/menu-'.getLanguage().'.sql'))) {
+ // Installation area not found!
+ addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_MISSING_DUMPS'));
+ } // END - if
+
+ if (getTotalFatalErrors() == 0) {
// 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. :)
@@ -310,49 +252,46 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
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);
+ 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);
+ 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);
- } else {
- // Installation area not found!
- addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_MISSING_DUMPS'));
- }
+ changeDataInFile(REQUEST_POST('spath') . 'inc/cache/config-local.php', 'INSTALLED', "setConfigEntry('MXCHANGE_INSTALLED', '", "');", 'Y', 0);
+ } // END - if
} // END - if
} // END - if
if (getTotalFatalErrors() > 0) {
$OUT = '';
foreach (getFatalArray() as $value) {
- $OUT .= " ".$value."\n";
+ $OUT .= " " . $value . "\n";
} // END foreach
define('__FATAL_ERROR_LI', $OUT);
$OUT = '';
foreach ($mysql as $key => $value) {
- $OUT .= " \n";
+ $OUT .= " \n";
} // END foreach
define('__MYSQL_DATA' , $OUT);
define('__SPATH_VALUE' , REQUEST_POST('spath'));
@@ -366,11 +305,8 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
LOAD_TEMPLATE('install_fatal_errors');
} else {
// Installation is done!
- redirectToUrl('install.php?page=finalize');
+ redirectToUrl('install.php?page=finished');
}
- } elseif (isInstalled()) {
- // Redirection after writing data... :-)
- LOAD_TEMPLATE('install_finished');
} else {
// Something goes wrong during installation! :-(
addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_FINALIZER_FAILED'));
@@ -378,6 +314,16 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
}
break;
+ case 'finished':
+ if (isInstalled()) {
+ // Load template that we are finished
+ LOAD_TEMPLATE('install_finished');
+ } else {
+ // Not finished
+ redirectToUrl('install.php');
+ }
+ break;
+
default:
DEBUG_LOG(__FILE__, __LINE__, sprintf("Wrong page %s detected", REQUEST_GET('page')));
OUTPUT_HTML(" {--WRONG_PAGE--}
");