* $Author:: $ *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team *
+ * Copyright (c) 2009 - 2016 by Mailer Developer Team *
* For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
************************************************************************/
// Some security stuff...
-if ((!defined('__SECURITY')) || (!isInstallationPhase())) {
+if ((!defined('__SECURITY')) || (!isInstaller())) {
die();
} // END - if
// 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 (isPostRequestElementSet('smtp_password')) {
+ $smtpPass1 = postRequestElement('smtp_password');
+ $smtpPass2 = postRequestElement('smtp_password');
} // END - if
// Database login data
-$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'];
+$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['database_extension'] = $GLOBALS['install_mysql']['extension'];
+$content['mysql_login'] = $GLOBALS['install_mysql']['login'];
+$content['mysql_password1'] = $GLOBALS['install_mysql']['password1'];
+$content['mysql_password2'] = $GLOBALS['install_mysql']['password2'];
// Set constants for SMTP data
-$content['smtp_host'] = $smtpHost;
-$content['smtp_user'] = $smtpUser;
-$content['smtp_pass1'] = $smtpPass1;
-$content['smtp_pass2'] = $smtpPass2;
+$content['smtp_host'] = $smtpHost;
+$content['smtp_user'] = $smtpUser;
+$content['smtp_password1'] = $smtpPass1;
+$content['smtp_password2'] = $smtpPass2;
// Load template
addTemplateToInstallContent('install_page3', $content);