X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Finstall-inc.php;h=84d5e0c1076a3170647b5971baafeef3bc1494d2;hb=5218bbd0719cf81f947b18c704906f053d725171;hp=1b8d1f486c1219b135e18b62ac8f6415cfe80e74;hpb=f2d00900560e9efffebdbc7de172893710667307;p=mailer.git
diff --git a/inc/install-inc.php b/inc/install-inc.php
index 1b8d1f486c..84d5e0c107 100644
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -1,7 +1,7 @@
");
- $_GET['page'] = 3;
+ addToInstallContent(getMessage('INSTALL_SMTP_HOSTNAME_EMPTY') . '
');
+ setRequestGetElement('page', 3);
} // END - if
- if ((empty($_POST['smtp_pass1'])) && (!empty($_POST['smtp_pass2']))) {
+ if ((!isPostRequestElementSet('smtp_pass1')) && (isPostRequestElementSet('smtp_pass2'))) {
// Password is empty
- OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS1_EMPTY')."
");
- $_GET['page'] = 3;
+ addToInstallContent(getMessage('INSTALL_SMTP_PASS1_EMPTY') . '
');
+ setRequestGetElement('page', 3);
} // END - if
- if ((!empty($_POST['smtp_pass1'])) && (empty($_POST['smtp_pass2']))) {
+ if ((isPostRequestElementSet('smtp_pass1')) && (!isPostRequestElementSet('smtp_pass2'))) {
// Password repeat is empty
- OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS2_EMPTY')."
");
- $_GET['page'] = 3;
+ addToInstallContent(getMessage('INSTALL_SMTP_PASS2_EMPTY') . '
');
+ setRequestGetElement('page', 3);
} // END - if
- if ($_POST['smtp_pass1'] != $_POST['smtp_pass1']) {
+ if (postRequestElement('smtp_pass1') != postRequestElement('smtp_pass1')) {
// Passwords are not matching
- OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS_MISMATCH')."
");
- $_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 ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered')))
-{
- // Set URL for FORM actions
- define('__BURL_ACTION', constant('URL'));
-
+// Is the mailer installed or no admin registered so far?
+if ((!isInstalled()) || (!isAdminRegistered())) {
// Output page for entered value
- switch ($_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;
-
- 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 (getTotalFatalErrors() > 0) {
- OUTPUT_HTML("");
- foreach ($FATAL as $key => $err) {
- OUTPUT_HTML(" · {--FATAL_NO--}".($key + 1).": ".$err."
");
+ switch (getRequestElement('page')) {
+ case 'welcome': // Welcome to the installation!
+ addTemplateToInstallContent('install_welcome');
+ break;
+
+ case '1': // Server path, base URL
+ // Load template
+ 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) {
+ addToInstallContent('');
+ foreach (getFatalArray() as $key => $err) {
+ addToInstallContent('· {--FATAL_NO--}' . ($key + 1) . ': ' . $err . '
');
+ }
+ addToInstallContent('
');
}
- OUTPUT_HTML("
");
- }
- define('__MYSQL_HOST' , $mysql['host']);
- define('__MYSQL_DBASE' , $mysql['dbase']);
- define('__MYSQL_PREFIX', $mysql['prefix']);
- define('__MYSQL_LOGIN' , $mysql['login']);
- define('__SPATH_VALUE' , $_POST['spath']);
- define('__BURL_VALUE' , $_POST['burl']);
- define('__TITLE_VALUE' , $_POST['title']);
- define('__SLOGAN_VALUE', $_POST['slogan']);
- define('__EMAIL_VALUE' , $_POST['email']);
-
- // Load template
- LOAD_TEMPLATE("install_page2");
- break;
-
- case "3":
- // Set more values
- define('__SPATH_VALUE' , $_POST['spath']);
- define('__BURL_VALUE' , $_POST['burl']);
- define('__TITLE_VALUE' , $_POST['title']);
- define('__SLOGAN_VALUE' , $_POST['slogan']);
- define('__EMAIL_VALUE' , $_POST['email']);
-
- // Use default SMTP data
- $smtpHost = constant('SMTP_HOSTNAME');
- $smtpUser = constant('SMTP_USER');
- $smtpPass1 = constant('SMTP_PASSWORD');
- $smtpPass2 = constant('SMTP_PASSWORD');
-
- // Overwrite it with the data from sent (failed) form
- if (!empty($_POST['smtp_host'])) $smtpHost = $_POST['smtp_host'];
- if (!empty($_POST['smtp_user'])) $smtpUser = $_POST['smtp_user'];
-
- // MySQL settings
- define('__MYSQL_HOST' , $mysql['host']);
- define('__MYSQL_DBASE' , $mysql['dbase']);
- define('__MYSQL_PREFIX' , $mysql['prefix']);
- define('__MYSQL_LOGIN' , $mysql['login']);
- define('__MYSQL_PASS1' , $mysql['pass1']);
- define('__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);
-
- // Load template
- LOAD_TEMPLATE("install_page3");
- break;
-
- case "5": // Misc settings
- // General settings
- define('__SPATH_VALUE' , $_POST['spath']);
- define('__BURL_VALUE' , $_POST['burl']);
- define('__TITLE_VALUE' , $_POST['title']);
- define('__SLOGAN_VALUE' , $_POST['slogan']);
- define('__EMAIL_VALUE' , $_POST['email']);
-
- // MySQL settings
- define('__MYSQL_HOST' , $mysql['host']);
- define('__MYSQL_DBASE' , $mysql['dbase']);
- define('__MYSQL_PREFIX' , $mysql['prefix']);
- define('__MYSQL_LOGIN' , $mysql['login']);
-
- // SMTP settings
- define('__SMTP_HOST' , $_POST['smtp_host']);
- define('__SMTP_USER' , $_POST['smtp_user']);
- define('__SMTP_PASS' , $_POST['smtp_pass1']);
- OUTPUT_HTML("
'.print_r(getSqls(), true).''); + + // Are some SQLs found? + if (countSqls() == '0') { + // Abort here + addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_SQL_IMPORT_FAILED')); + return; } // END - if - } // END - foreach - - // Ok, all done. So we can write the config data to the php files - if ($_POST['spath'] != constant('PATH')) changeDataInFile($_POST['spath']."inc/config.php", "SERVER-PATH", "define('PATH', \"", "\");", $_POST['spath'], 0); - if ($_POST['burl'] != constant('URL')) changeDataInFile($_POST['spath']."inc/config.php", "HOST-URL", "define('URL', \"", "\");", $_POST['burl'], 0); - changeDataInFile($_POST['spath']."inc/config.php", "MAIN_TITLE", "define('MAIN_TITLE', \"", "\");", $_POST['title'], 0); - changeDataInFile($_POST['spath']."inc/config.php", "SLOGAN", "define('SLOGAN', \"", "\");", $_POST['slogan'], 0); - changeDataInFile($_POST['spath']."inc/config.php", "WEBMASTER", "define('WEBMASTER', \"", "\");", $_POST['email'], 0); - changeDataInFile($_POST['spath']."inc/config.php", "NULLPASS-WARNING", "define('warn_no_pass', ", ");", $_POST['warn_no_pass'], 0); - changeDataInFile($_POST['spath']."inc/config.php", "WRITE-FOOTER", "define('WRITE_FOOTER', ", ");", $_POST['wfooter'], 0); - changeDataInFile($_POST['spath']."inc/config.php", "BACKLINK", "define('ENABLE_BACKLINK', ", ");", $_POST['blink'], 0); - // changeDataInFile($_POST['spath']."inc/config.php", "OUTPUT-MODE", "define('OUTPUT_MODE', \"", "\");", $_POST['omode'], 0); - changeDataInFile($_POST['spath']."inc/config.php", "MYSQL-HOST", " 'host' => \"", "\",", $mysql['host'], 0); - changeDataInFile($_POST['spath']."inc/config.php", "MYSQL-DBASE", " 'dbase' => \"", "\",", $mysql['dbase'], 0); - changeDataInFile($_POST['spath']."inc/config.php", "MYSQL-LOGIN", " 'login' => \"", "\",", $mysql['login'], 0); - changeDataInFile($_POST['spath']."inc/config.php", "MYSQL-PASSWORD", " 'password' => \"", "\",", $mysql['pass1'], 0); - changeDataInFile($_POST['spath']."inc/config.php", "MYSQL-PREFIX", "define('_MYSQL_PREFIX', \"", "\");", $mysql['prefix'], 0); - changeDataInFile($_POST['spath']."inc/config.php", "SMTP-HOSTNAME", "define('SMTP_HOSTNAME', \"", "\");", $_POST['smtp_host'], 0); - changeDataInFile($_POST['spath']."inc/config.php", "SMTP-USER", "define('SMTP_USER', \"", "\");", $_POST['smtp_user'], 0); - changeDataInFile($_POST['spath']."inc/config.php", "SMTP-PASSWORD", "define('SMTP_PASSWORD', \"", "\");", $_POST['smtp_pass'], 0); - changeDataInFile($_POST['spath']."inc/config.php", "INSTALLED", "define('mxchange_installed', ", ");", "true", 0); - } else { - // Installation area not found! - addFatalMessage(getMessage('INSTALL_MISSING_DUMPS')); - } + + // Now run all queries through and try to keep out empty or comment queries + runFilterChain('run_sqls'); + + // Copy the config template and verify it + doInstallWriteLocalConfig(); + } // END - if + } // END - if } // END - if - } // END - if - if (getTotalFatalErrors() > 0) { - $OUT = ""; - foreach ($FATAL as $value) { - $OUT .= "