From d94828772c3bebd845ede6aa1d8c3bb9452fadda Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Tue, 9 Jul 2024 22:04:47 +0200
Subject: [PATCH] Rework 5th step of installation, to fix some pointless
 message about Cache

---
 install/steps/5-database.php | 83 ++++++++++++++++++------------------
 install/tools/5-database.php |  3 ++
 system/database.php          |  1 +
 3 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/install/steps/5-database.php b/install/steps/5-database.php
index d0db8cfc..ed8f82a1 100644
--- a/install/steps/5-database.php
+++ b/install/steps/5-database.php
@@ -41,57 +41,56 @@ if(!$error) {
 	$configToSave['cache_engine'] = 'auto';
 	$configToSave['cache_prefix'] = 'myaac_' . generateRandomString(8, true, false, true);
 
-	require BASE . 'install/includes/config.php';
-
 	if(!$error) {
-		require BASE . 'install/includes/database.php';
+		$content = '';
+		$saved = Settings::saveConfig($configToSave, BASE . 'config.local.php', $content);
+		if ($saved) {
+			success($locale['step_database_config_saved']);
+			$_SESSION['saved'] = true;
 
-		$locale['step_database_importing'] = str_replace('$DATABASE_NAME$', config('database_name'), $locale['step_database_importing']);
-		success($locale['step_database_importing']);
+			require BASE . 'config.local.php';
+			require BASE . 'install/includes/config.php';
 
-		if(isset($database_error)) { // we failed connect to the database
-			error($database_error);
-		}
-		else {
-			if(!$db->hasTable('accounts')) {
-				$tmp = str_replace('$TABLE$', 'accounts', $locale['step_database_error_table']);
-				error($tmp);
-				$error = true;
-			}
+			if (!$error) {
+				require BASE . 'install/includes/database.php';
 
-			if(!$db->hasTable('players')) {
-				$tmp = str_replace('$TABLE$', 'players', $locale['step_database_error_table']);
-				error($tmp);
-				$error = true;
-			}
-
-			if(!$db->hasTable('guilds')) {
-				$tmp = str_replace('$TABLE$', 'guilds', $locale['step_database_error_table']);
-				error($tmp);
-				$error = true;
-			}
-
-			if(!$error) {
-				$content = '';
-				$saved = Settings::saveConfig($configToSave, BASE . 'config.local.php', $content);
-				if($saved) {
-					success($locale['step_database_config_saved']);
-					$_SESSION['saved'] = true;
-
-					$twig->display('install.installer.html.twig', array(
-						'url' => 'tools/5-database.php',
-						'message' => $locale['loading_spinner']
-					));
+				if (isset($database_error)) { // we failed connect to the database
+					error($database_error);
 				}
 				else {
-					$_SESSION['config_content'] = $content;
-					unset($_SESSION['saved']);
+					if (!$db->hasTable('accounts')) {
+						$tmp = str_replace('$TABLE$', 'accounts', $locale['step_database_error_table']);
+						error($tmp);
+						$error = true;
+					}
 
-					$locale['step_database_error_file'] = str_replace('$FILE$', '<b>' . BASE . 'config.php</b>', $locale['step_database_error_file']);
-					error($locale['step_database_error_file'] . '<br/>
-						<textarea cols="70" rows="10">' . $content . '</textarea>');
+					if (!$db->hasTable('players')) {
+						$tmp = str_replace('$TABLE$', 'players', $locale['step_database_error_table']);
+						error($tmp);
+						$error = true;
+					}
+
+					if (!$db->hasTable('guilds')) {
+						$tmp = str_replace('$TABLE$', 'guilds', $locale['step_database_error_table']);
+						error($tmp);
+						$error = true;
+					}
+
+					if (!$error) {
+						$twig->display('install.installer.html.twig', array(
+							'url' => 'tools/5-database.php',
+							'message' => $locale['loading_spinner']
+						));
+					}
 				}
 			}
+		} else {
+			$_SESSION['config_content'] = $content;
+			unset($_SESSION['saved']);
+
+			$locale['step_database_error_file'] = str_replace('$FILE$', '<b>' . BASE . 'config.php</b>', $locale['step_database_error_file']);
+			error($locale['step_database_error_file'] . '<br/>
+				<textarea cols="70" rows="10">' . $content . '</textarea>');
 		}
 	}
 }
diff --git a/install/tools/5-database.php b/install/tools/5-database.php
index 3ad4348a..ff0bcbbb 100644
--- a/install/tools/5-database.php
+++ b/install/tools/5-database.php
@@ -32,6 +32,9 @@ if($db->hasTable(TABLE_PREFIX . 'account_actions')) {
 else {
 	// import schema
 	try {
+		$locale['step_database_importing'] = str_replace('$DATABASE_NAME$', config('database_name'), $locale['step_database_importing']);
+		success($locale['step_database_importing']);
+
 		$db->query(file_get_contents(BASE . 'install/includes/schema.sql'));
 
 		$locale['step_database_success_schema'] = str_replace('$PREFIX$', TABLE_PREFIX, $locale['step_database_success_schema']);
diff --git a/system/database.php b/system/database.php
index f20ca720..34b4574a 100644
--- a/system/database.php
+++ b/system/database.php
@@ -127,6 +127,7 @@ try {
 	}
 
 	if(defined('MYAAC_INSTALL')) {
+		$error = $e->getMessage();
 		return; // installer will take care of this
 	}