X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Finstall.php;h=d2d322b3b93cdb7eb83805c72bded8e636d64029;hb=b8e8b771d4ead88ae08b062fa9fce9352ba3b5b4;hp=11031acf460b1f0a82ffa00856628c73ca23fb8d;hpb=ecea7425f8ad11ace4af39d476919e3203bff44f;p=friendica.git

diff --git a/mod/install.php b/mod/install.php
index 11031acf46..d2d322b3b9 100644
--- a/mod/install.php
+++ b/mod/install.php
@@ -26,8 +26,6 @@ function install_init(App $a) {
 	$a->setConfigValue('system', 'value', '../install');
 	$a->theme['stylesheet'] = System::baseUrl()."/view/install/style.css";
 
-	Install::setInstallMode();
-
 	global $install_wizard_pass;
 	if (x($_POST, 'pass')) {
 		$install_wizard_pass = intval($_POST['pass']);
@@ -72,7 +70,20 @@ function install_post(App $a) {
 			// connect to db
 			DBA::connect($dbhost, $dbuser, $dbpass, $dbdata);
 
-			Install::install($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail);
+			$errors = Install::createConfig($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail);
+
+			if ($errors) {
+				$a->data['db_failed'] = $errors;
+				return;
+			}
+
+			$errors = Install::installDatabaseStructure();
+
+			if ($errors) {
+				$a->data['db_failed'] = $errors;
+			} else {
+				$a->data['db_installed'] = true;
+			}
 
 			return;
 		break;