X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=install.php;h=44559e8996c18575855e1465f0f924df3eee409f;hp=7f0946e36c242c7043198f27be617112ee85538f;hb=d1cf572ce023d55e2dbb810d1d6f9301c3d4e3db;hpb=07474b65575a50d2d61f120337ec25f187edeae2

diff --git a/install.php b/install.php
index 7f0946e36c..44559e8996 100644
--- a/install.php
+++ b/install.php
@@ -14,12 +14,10 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * 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 *
  * it under the terms of the GNU General Public License as published by *
@@ -44,16 +42,14 @@
 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
-$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');
@@ -61,18 +57,19 @@ require('inc/config-global.php');
 // 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?
-if ((isInstalled()) && (getRequestParameter('page' != 'finished'))) {
+if ((isInstalled()) && (getRequestElement('install_page') != 'finished')) {
 	// Add fatal message
-	addFatalMessage(__FILE__, __LINE__, '{--ALREADY_INSTALLED--}');
+	addFatalMessage(__FILE__, __LINE__, '{--MAILER_ALREADY_INSTALLED--}');
 } // END - if
 
 // Load header here
@@ -81,11 +78,36 @@ loadIncludeOnce('inc/header.php');
 // 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());
+// Is plain or AJAX-enabled installation used?
+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');