Added missing 'extension' initialization in installer and used EL code there + fixed...

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

diff --git a/inc/install/install_page_2.php b/inc/install/install_page_2.php
index f286b4c72fa9c6bb94fad779b7561fac52675dfb..337e8df68d0280aa325a3e736476ee1d104175ed 100644 (file)
--- a/inc/install/install_page_2.php
+++ b/inc/install/install_page_2.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -36,16 +36,17 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!isInstallationPhase())) {
+if ((!defined('__SECURITY')) || (!isInstaller())) {
        die();
 } // END - if
 
 // Prepare emissing elements
-if (empty($GLOBALS['install_mysql']['dbase']))  $GLOBALS['install_mysql']['dbase']  = 'your_database';
-if (empty($GLOBALS['install_mysql']['login']))  $GLOBALS['install_mysql']['login']  = 'your_login';
-if (empty($GLOBALS['install_mysql']['host']))   $GLOBALS['install_mysql']['host']   = 'localhost';
-if (empty($GLOBALS['install_mysql']['prefix'])) $GLOBALS['install_mysql']['prefix'] = 'mailer';
-if (empty($GLOBALS['install_mysql']['type']))   $GLOBALS['install_mysql']['type']   = 'MyISAM';
+if (empty($GLOBALS['install_mysql']['dbase']))     $GLOBALS['install_mysql']['dbase']     = 'your_database';
+if (empty($GLOBALS['install_mysql']['login']))     $GLOBALS['install_mysql']['login']     = 'your_login';
+if (empty($GLOBALS['install_mysql']['host']))      $GLOBALS['install_mysql']['host']      = 'localhost';
+if (empty($GLOBALS['install_mysql']['prefix']))    $GLOBALS['install_mysql']['prefix']    = 'mailer';
+if (empty($GLOBALS['install_mysql']['type']))      $GLOBALS['install_mysql']['type']      = 'MyISAM';
+if (empty($GLOBALS['install_mysql']['extension'])) $GLOBALS['install_mysql']['extension'] = 'mysqli';
 
 // Are there errors?
 if (ifFatalErrorsDetected()) {
@@ -59,20 +60,21 @@ if (ifFatalErrorsDetected()) {
 
 // Prepare content array
 $content = array(
-       'mysql_host'   => $GLOBALS['install_mysql']['host'],
-
-// [EOF]
-?>
-       'mysql_dbase'  => $GLOBALS['install_mysql'['dbase',
-       'mysql_prefix' => $GLOBALS['install_mysql'['prefix',
-       'mysql_login'  => $GLOBALS['install_mysql'['login',
-       'table_type'   => $GLOBALS['install_mysql'['type',
-       'spath'        => postRequestElement('spath'),
-       'burl'         => postRequestElement('burl'),
-       'title'        => postRequestElement('title'),
-       'slogan'       => postRequestElement('slogan'),
-       'email'        => postRequestElement('email')
+       'mysql_host'         => $GLOBALS['install_mysql']['host'],
+       'mysql_dbase'        => $GLOBALS['install_mysql']['dbase'],
+       'mysql_prefix'       => $GLOBALS['install_mysql']['prefix'],
+       'mysql_login'        => $GLOBALS['install_mysql']['login'],
+       'table_type'         => $GLOBALS['install_mysql']['type'],
+       'database_extension' => $GLOBALS['install_mysql']['extension'],
+       'spath'              => postRequestElement('spath'),
+       'burl'               => postRequestElement('burl'),
+       'title'              => postRequestElement('title'),
+       'slogan'             => postRequestElement('slogan'),
+       'email'              => postRequestElement('email')
 );
 
 // Load template
 addTemplateToInstallContent('install_page2', $content);
+
+// [EOF]
+?>