Bootstrap the installation.

joomla · Aug 16, 2012 · 9b3bd99 · 9b3bd99
1 parent 96f4e03
commit 9b3bd99
Show file tree

Hide file tree

Showing 104 changed files with 2,707 additions and 2,700 deletions.
diff --git a/installation/controller.php b/installation/controller.php
@@ -43,7 +43,7 @@ public function display($cachable = false, $urlparams = false)
 		}
 		else
 		{
-			$default_view = 'language';
+			$default_view = 'site';
 		}
 
 		$vName   = $this->input->getWord('view', $default_view);
@@ -59,6 +59,29 @@ public function display($cachable = false, $urlparams = false)
 		if ($view)
 		{
 			$model = $this->getModel('Setup', 'InstallationModel', array('dbo' => null));
+			$sufficient = $model->getPhpOptionsSufficient();
+
+			switch ($vName)
+			{
+				case 'preinstall':
+					$checkOptions = false;
+					if ($sufficient) {
+						$this->setRedirect('index.php');
+					}
+					break;
+				default:
+					$checkOptions = true;
+					if (!$sufficient) {
+						$this->setRedirect('index.php?view=preinstall');
+					}
+					break;
+			}
+
+			$options = $model->getOptions();
+			if ($vName != $default_view && ($checkOptions && empty($options)))
+			{
+				$this->setRedirect('index.php');
+			}
 
 			// Push the model into the view (as default).
 			$view->setModel($model, true);
@@ -67,6 +90,9 @@ public function display($cachable = false, $urlparams = false)
 			// Push document object into the view.
 			$view->document = $document;
 
+			// Include the component HTML helpers.
+			JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
 			$view->display();
 		}