Added stuff for PHP extension selection in both installers.

[mailer.git] / inc / install / install_page_3.php

diff --git a/inc/install/install_page_3.php b/inc/install/install_page_3.php
index 60ef83c0cd2f4f83dc7b1f7bc74bf7f7c18e7c49..1e975bb28ab4b865475dabedb24b6b78ad76ad60 100644 (file)
--- a/inc/install/install_page_3.php
+++ b/inc/install/install_page_3.php
@@ -36,7 +36,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!isInstallationPhase())) {
+if ((!defined('__SECURITY')) || (!isInstaller())) {
        die();
 } // END - if
 
@@ -56,19 +56,20 @@ $smtpPass2 = '{?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 (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_password1'] = $GLOBALS['install_mysql']['password1'];
-$content['mysql_password2'] = $GLOBALS['install_mysql']['password2'];
+$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;