Added more wrapper, commented out another noisy debug line

[mailer.git] / install.php

diff --git a/install.php b/install.php
index cdf507ee1c86f2f7600237dee6b4325aaca1a223..fb26cff9eb067c8f1472d91e43011ba898c20b3f 100644 (file)
--- a/install.php
+++ b/install.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *

- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *

  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *


@@ -42,16 +42,14 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
 require('inc/libs/security_functions.php');
 
 // Init start time

-$GLOBALS['startTime'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(true);

 
 // Tell every module / require file we are installing
 
 // Tell every module / require file we are installing

-$GLOBALS['mailer_installing'] = true;
+$GLOBALS['__mailer_installing'] = true;

 
 

-// Set CSS variable for "normal mode"
-$GLOBALS['output_mode'] = '0';
-
-// Set module
-$GLOBALS['module'] = 'install';
+// Set module and output mode
+$GLOBALS['__module']      = 'install';
+$GLOBALS['__output_mode'] = '0';

 
 // Load config file
 require('inc/config-global.php');
 
 // Load config file
 require('inc/config-global.php');


@@ -59,16 +57,17 @@ require('inc/config-global.php');
 // Set content type
 setContentType('text/html');
 
 // Set content type
 setContentType('text/html');
 

-// Reload page to page=welcome when it is not specified
-if (!isGetRequestParameterSet('page')) {
-       redirectToUrl('install.php?page=welcome');
+// Is 'install_page' set?
+if (!isGetRequestElementSet('install_page')) {
+       // No, so set it to 'welcome'
+       setGetRequestElement('install_page', 'welcome');

 } // END - if
 
 // Set username
 setUsername('{--USERNAME_INSTALLER--}');
 
 // Already installed?
 } // END - if
 
 // Set username
 setUsername('{--USERNAME_INSTALLER--}');
 
 // Already installed?

-if ((isInstalled()) && (getRequestParameter('page' != 'finished'))) {
+if ((isInstalled()) && (getRequestElement('install_page') != 'finished')) {

        // Add fatal message
        addFatalMessage(__FILE__, __LINE__, '{--ALREADY_INSTALLED--}');
 } // END - if
        // Add fatal message
        addFatalMessage(__FILE__, __LINE__, '{--ALREADY_INSTALLED--}');
 } // END - if


@@ -79,11 +78,36 @@ loadIncludeOnce('inc/header.php');
 // Handle fatal errors
 runFilterChain('handle_fatal_errors');
 
 // Handle fatal errors
 runFilterChain('handle_fatal_errors');
 

-// Here start's our installtion stuff
-loadIncludeOnce('inc/install-inc.php');
-
-// Load main installation table
-loadTemplate('install_main', false, getInstallerContent());
+// Do we have plain or AJAX-enabled installation?
+if (isGetRequestElementSet('installer')) {
+       // Set installer type
+       setSession('installer', getRequestElement('installer'));
+
+       // Redirect to install.php again
+       redirectToUrl('install.php');
+} elseif (isAjaxInstaller()) {
+       // AJAX-enabled installer:
+       // Load 'init' page
+       addTemplateToInstallContent('install_page_init');
+
+       // Prepare content
+       $content = array(
+               'install_page' => getRequestElement('install_page')
+       );
+
+       // Load main installation table
+       loadTemplate('install_main_ajax', false, $content);
+} elseif (isPlainInstaller()) {
+       // Plain installer:
+       // Load include file
+       loadIncludeOnce('inc/install-inc.php');
+
+       // Load main template
+       loadTemplate('install_main_plain');
+} else {
+       // What do you want, red or blue pill? AJAX or plain installer? ;-)
+       loadTemplate('install_selector');
+}

 
 // Footer
 loadIncludeOnce('inc/footer.php');
 
 // Footer
 loadIncludeOnce('inc/footer.php');