NOOOOOOOOOOOOOOOOOOOOOOOOO

Digital-Peak · Jun 4, 2017 · faaca17 · faaca17
1 parent 3eec79d
commit faaca17
Show file tree

Hide file tree

Showing 8 changed files with 78 additions and 43 deletions.
diff --git a/installation/controller/default.php b/installation/controller/default.php
@@ -71,6 +71,7 @@ public function execute()
 
 					break;
 				case 'summary':
+				case 'install':
 					$model        = new InstallationModelSetup;
 //					InstallationModelConfiguration;
 					$checkOptions = true;
@@ -87,14 +88,14 @@ public function execute()
 				default:
 					$model        = new InstallationModelSetup;
 					$checkOptions = true;
-					$options      = [];
+					$options      = $model->getOptions();
 
 					break;
 			}
 
 			if ($vName != $defaultView && ($checkOptions && empty($options)))
 			{
-				$app->redirect('index.php');
+//				$app->redirect('index.php');
 			}
 		}
 

diff --git a/installation/controller/install/config.php b/installation/controller/install/config.php
@@ -30,18 +30,18 @@ public function execute()
 		$app = $this->getApplication();
 
 		// Check for request forgeries.
-		JSession::checkToken() or $app->sendJsonResponse(new Exception(JText::_('JINVALID_TOKEN'), 403));
+//		JSession::checkToken() or $app->sendJsonResponse(new Exception(JText::_('JINVALID_TOKEN'), 403));
 
 		// Get the options from the session
 		$options = (new InstallationModelSetup)->getOptions();
 
 		$r = new stdClass;
-		$r->view = 'complete';
+		$r->view = 'summary';
 
 		// Attempt to setup the configuration.
 		if (!(new InstallationModelConfiguration)->setup($options))
 		{
-			$r->view = 'database';
+			$r->view = 'site';
 		}
 
 		$app->sendJsonResponse($r);

diff --git a/installation/model/configuration.php b/installation/model/configuration.php
@@ -63,7 +63,7 @@ public function createConfiguration($options)
 		$registry = new Registry;
 
 		// Site settings.
-		$registry->set('offline', $options->site_offline);
+		$registry->set('offline', '0');
 		$registry->set('offline_message', JText::_('INSTL_STD_OFFLINE_MSG'));
 		$registry->set('display_offline_message', 1);
 		$registry->set('offline_image', '');
@@ -121,7 +121,7 @@ public function createConfiguration($options)
 		$registry->set('cache_platformprefix', 0);
 
 		// Meta settings.
-		$registry->set('MetaDesc', $options->site_metadesc);
+		$registry->set('MetaDesc', '');
 		$registry->set('MetaKeys', '');
 		$registry->set('MetaTitle', 1);
 		$registry->set('MetaAuthor', 1);

diff --git a/installation/template/js/installation.js b/installation/template/js/installation.js
@@ -510,7 +510,7 @@ console.log(data)
 // Init on dom content loaded event
 document.addEventListener('DOMContentLoaded', function() {
 
-	var url = document.location;
+	var url = Joomla.getOptions('system.installation').url ? Joomla.getOptions('system.installation').url.replace(/&amp;/g, '&') : 'index.php';
 	// Show the container
 	if (document.getElementById('container-installation')) {
 		document.getElementById('container-installation').classList.remove('no-js');
@@ -645,11 +645,27 @@ document.addEventListener('DOMContentLoaded', function() {
 		document.getElementById('jform_db_prefix').value = Joomla.makeRandomDbPrefix();
 console.log(Joomla.makeRandomDbPrefix())
 
-		Install.install(['config', 'database'])
+		window.location = url + '?view=install'
+		// Install.goToPage('summary');
+		// Install.install(['Config']);
 
 		//if (state === true) Install.install(['config']);
 	};
 
+
+	if (document.getElementById('submitForm')) {
+		document.getElementById('submitForm').addEventListener('click', function(e) {
+			e.preventDefault();
+			Joomla.checkInputs();
+
+		})
+	}
+
+	var langSel = document.getElementById('languageForm');
+
+	if (langSel)
+		document.getElementById('top-header').appendChild(langSel);
+
 	var inputs = [].slice.call(document.querySelectorAll('input[type="password"], input[type="text"], input[type="email"], select'));
 	console.log(inputs)
 	//<select id="jform_language" class="custom-select required ml-2"></select>

diff --git a/installation/view/install/html.php b/installation/view/install/html.php
@@ -55,20 +55,20 @@ public function render()
 		 * Prepare the tasks array
 		 * Note: The first character of the task *MUST* be capitalised or the application will not find the task
 		 */
-		$this->tasks[] = ($this->options['db_old'] == 'remove') ? 'Database_remove' : 'Database_backup';
+//		$this->tasks[] = ($this->options['db_old'] == 'remove') ? 'Database_remove' : 'Database_backup';
 		$this->tasks[] = 'Database';
-
-		if ($this->options['sample_file'])
-		{
-			$this->tasks[] = 'Sample';
-		}
+//
+//		if ($this->options['sample_file'])
+//		{
+//			$this->tasks[] = 'Sample';
+//		}
 
 		$this->tasks[] = 'Config';
-
-		if ($this->options['summary_email'])
-		{
-			$this->tasks[] = 'Email';
-		}
+//
+//		if ($this->options['summary_email'])
+//		{
+//			$this->tasks[] = 'Email';
+//		}
 
 		return parent::render();
 	}

diff --git a/installation/view/install/tmpl/default.php b/installation/view/install/tmpl/default.php
@@ -48,20 +48,25 @@ class="progress-bar progress-bar-striped progress-bar-animated"
 	<?php echo JHtml::_('form.token'); ?>
 </form>
 
-<script type="text/javascript">
+<?php
+$tasks = implode("','", $this->tasks);
+JFactory::getDocument()->addScriptDeclaration(
+<<<JS
 	jQuery(function()
 	{
-		doInstall();
+		Install.install(['Config']); //
+		window.location = window.location.replace(/installation\/index\?view=install/g) + '?view=remove'
 	});
-	function doInstall()
-	{
-		if (document.getElementById('install_progress') != null)
-		{
-			Install.install(['<?php echo implode("','", $this->tasks); ?>']);
-		}
-		else
-		{
-			(function(){doInstall();}).delay(500);
-		}
-	}
-</script>
+	// function doInstall()
+	// {
+	// 	if (document.getElementById('install_progress'))
+	// 	{
+	// 		Install.install(['Database', 'Config']);
+	// 	}
+	// 	else
+	// 	{
+	// 		(function(){doInstall();}).delay(500);
+	// 	}
+	// }
+JS
+);
diff --git a/installation/view/site/tmpl/default.php b/installation/view/site/tmpl/default.php
@@ -126,4 +126,4 @@
 	<input type="hidden" name="task" value="site">
 	<input type="hidden" name="format" value="json">
 	<?php echo JHtml::_('form.token'); ?>
-</form>
+</form>
diff --git a/installation/view/summary/tmpl/default.php b/installation/view/summary/tmpl/default.php
@@ -350,11 +350,24 @@
 	<?php echo JHtml::_('form.token'); ?>
 </form>
 
-<script type="text/javascript">
-	jQuery('input[name="jform[summary_email]"]').each(function(index, el) {
-        jQuery(el).parent().on('click', function() {
-            Install.toggle('email_passwords', 'summary_email', 0);
-        });
-        Install.toggle('email_passwords', 'summary_email', 1);
-    });
-</script>
+<?php
+JFactory::getDocument()->addScriptDeclaration(
+	<<<JS
+	jQuery(function()
+	{
+		Install.submitform();
+		window.location = window.location.replace(/installation\/index\?view=install/g) + '?view=remove'
+	});
+	// function doInstall()
+	// {
+	// 	if (document.getElementById('install_progress'))
+	// 	{
+	// 		Install.install(['Database', 'Config']);
+	// 	}
+	// 	else
+	// 	{
+	// 		(function(){doInstall();}).delay(500);
+	// 	}
+	// }
+JS
+);