From 6dbc69440997bf853576a9d57cbde8674873cea6 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sun, 26 Mar 2023 00:23:50 +0100
Subject: [PATCH] Do not allow continue install when there is no server
 database imported

---
 install/steps/5-database.php | 28 +++++++++++++++++++++++-----
 install/tools/5-database.php | 18 ------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/install/steps/5-database.php b/install/steps/5-database.php
index f5e4eb07..13a79d56 100644
--- a/install/steps/5-database.php
+++ b/install/steps/5-database.php
@@ -55,12 +55,30 @@ if(!$error) {
 			error($database_error);
 		}
 		else {
-			$twig->display('install.installer.html.twig', array(
-				'url' => 'tools/5-database.php',
-				'message' => $locale['loading_spinner']
-			));
+			if(!$db->hasTable('accounts')) {
+				$tmp = str_replace('$TABLE$', 'accounts', $locale['step_database_error_table']);
+				error($tmp);
+				$error = true;
+			}
+
+			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']
+				));
+
 				if(!Validator::email($_SESSION['var_mail_admin'])) {
 					error($locale['step_config_mail_admin_error']);
 					$error = true;
@@ -101,4 +119,4 @@ if(!$error) {
 		<?php echo next_buttons(true, $error ? false : true);
 		?>
 	</form>
-</div>
\ No newline at end of file
+</div>
diff --git a/install/tools/5-database.php b/install/tools/5-database.php
index f2861c32..8188bd1c 100644
--- a/install/tools/5-database.php
+++ b/install/tools/5-database.php
@@ -23,24 +23,6 @@ if(!$error) {
 	}
 }
 
-if(!$db->hasTable('accounts')) {
-	$locale['step_database_error_table'] = str_replace('$TABLE$', 'accounts', $locale['step_database_error_table']);
-	error($locale['step_database_error_table']);
-	return;
-}
-
-if(!$db->hasTable('players')) {
-	$locale['step_database_error_table'] = str_replace('$TABLE$', 'players', $locale['step_database_error_table']);
-	error($locale['step_database_error_table']);
-	return;
-}
-
-if(!$db->hasTable('guilds')) {
-	$locale['step_database_error_table'] = str_replace('$TABLE$', 'guilds', $locale['step_database_error_table']);
-	error($locale['step_database_error_table']);
-	return;
-}
-
 if($db->hasTable(TABLE_PREFIX . 'account_actions')) {
 	$locale['step_database_error_table_exist'] = str_replace('$TABLE$', TABLE_PREFIX . 'account_actions', $locale['step_database_error_table_exist']);
 	warning($locale['step_database_error_table_exist']);