X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Finstall-inc.php;h=e8304bb0c4fe90a78d24af2d9b2aa3712a77296d;hb=dcab53bf379a6e7a0224b255dfab06512cb694dd;hp=9d68191e9ef1de86caa3a3931a935162339fd058;hpb=4ccc02299e123d24c043c917fb16208d0338f300;p=mailer.git
diff --git a/inc/install-inc.php b/inc/install-inc.php
index 9d68191e9e..e8304bb0c4 100644
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -17,9 +17,7 @@
* 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 *
+ * Copyright (c) 2003 - 2009 by Roland Haeder *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -44,56 +42,55 @@
// Some security stuff...
if (!defined('__SECURITY')) {
- $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
- require($INC);
+ die();
} // END - if
// Init variables
$mysql = array();
-if ((REQUEST_ISSET_POST(('mysql'))) && (is_array(REQUEST_POST('mysql')))) $mysql = REQUEST_POST('mysql');
+if ((isPostRequestElementSet('mysql')) && (is_array(postRequestElement('mysql')))) {
+ // Transfer 'mysql' array
+ $mysql = postRequestElement('mysql');
+} // END - if
// Check if both passwords from SMTP are matching
-if ((REQUEST_ISSET_GET('page') && (REQUEST_GET('page') == 5))) {
+if ((isGetRequestElementSet('page') && (getRequestElement('page') == 5))) {
// Okay, we have to check it
- if (REQUEST_ISSET_POST(('smtp_user')) && (!REQUEST_ISSET_POST(('smtp_host')))) {
+ if (isPostRequestElementSet('smtp_user') && (!isPostRequestElementSet('smtp_host'))) {
// Hostname not set
- OUTPUT_HTML(getMessage('INSTALL_SMTP_HOSTNAME_EMPTY')."
");
- REQUEST_SET_GET('page', 3);
+ addToInstallContent(getMessage('INSTALL_SMTP_HOSTNAME_EMPTY') . '
');
+ setRequestGetElement('page', 3);
} // END - if
- if ((!REQUEST_ISSET_POST(('smtp_pass1'))) && (REQUEST_ISSET_POST(('smtp_pass2')))) {
+ if ((!isPostRequestElementSet('smtp_pass1')) && (isPostRequestElementSet('smtp_pass2'))) {
// Password is empty
- OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS1_EMPTY')."
");
- REQUEST_SET_GET('page', 3);
+ addToInstallContent(getMessage('INSTALL_SMTP_PASS1_EMPTY') . '
');
+ setRequestGetElement('page', 3);
} // END - if
- if ((REQUEST_ISSET_POST(('smtp_pass1'))) && (!REQUEST_ISSET_POST(('smtp_pass2')))) {
+ if ((isPostRequestElementSet('smtp_pass1')) && (!isPostRequestElementSet('smtp_pass2'))) {
// Password repeat is empty
- OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS2_EMPTY')."
");
- REQUEST_SET_GET('page', 3);
+ addToInstallContent(getMessage('INSTALL_SMTP_PASS2_EMPTY') . '
');
+ setRequestGetElement('page', 3);
} // END - if
- if (REQUEST_POST('smtp_pass1') != REQUEST_POST('smtp_pass1')) {
+ if (postRequestElement('smtp_pass1') != postRequestElement('smtp_pass1')) {
// Passwords are not matching
- OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS_MISMATCH')."
");
- REQUEST_SET_GET('page', 3);
+ addToInstallContent(getMessage('INSTALL_SMTP_PASS_MISMATCH') . '
');
+ setRequestGetElement('page', 3);
} // END - if
} // END - if
// Is MXChange 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 (getRequestElement('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!)
@@ -103,34 +100,34 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
if (empty($mysql['prefix'])) $mysql['prefix'] = 'mxchange';
if (empty($mysql['type'])) $mysql['type'] = 'MyISAM';
if (getTotalFatalErrors() > 0) {
- OUTPUT_HTML("");
+ addToInstallContent('');
foreach (getFatalArray() as $key => $err) {
- OUTPUT_HTML(" · {--FATAL_NO--}".($key + 1).": ".$err."
");
+ addToInstallContent('· {--FATAL_NO--}' . ($key + 1) . ': ' . $err . '
');
}
- OUTPUT_HTML("
");
+ addToInstallContent('
');
}
- 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'));
+ $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');
// 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'] = postRequestElement('spath');
+ $content['burl'] = postRequestElement('burl');
+ $content['title'] = postRequestElement('title');
+ $content['slogan'] = postRequestElement('slogan');
+ $content['email'] = postRequestElement('email');
// Use default SMTP data
$smtpHost = getConfig('SMTP_HOSTNAME');
@@ -139,130 +136,60 @@ 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'))) {
- $smtpPass1 = REQUEST_POST('smtp_pass');
- $smtpPass2 = REQUEST_POST('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
- 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'] = $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'];
// 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'] = postRequestElement('spath');
+ $content['burl'] = postRequestElement('burl');
+ $content['title'] = postRequestElement('title');
+ $content['slogan'] = postRequestElement('slogan');
+ $content['email'] = postRequestElement('email');
// SMTP settings
- define('__SMTP_HOST', REQUEST_POST('smtp_host'));
- define('__SMTP_USER', REQUEST_POST('smtp_user'));
- define('__SMTP_PASS', REQUEST_POST('smtp_pass1'));
- OUTPUT_HTML("
'.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')); return; @@ -312,36 +240,7 @@ 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 @@ -351,21 +250,21 @@ if ((!isInstalled()) || (!isAdminRegistered())) { foreach (getFatalArray() as $value) { $OUT .= "