From 54f5717dabf8c6eecb88df9afebe106fc3c9dd41 Mon Sep 17 00:00:00 2001 From: int2001 Date: Sun, 28 Jan 2024 18:45:10 +0000 Subject: [PATCH 1/3] Userspecific things at installer.sql --- install/assets/install.sql | 2 +- install/includes/database_class.php | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/install/assets/install.sql b/install/assets/install.sql index 413102620..967f2427b 100755 --- a/install/assets/install.sql +++ b/install/assets/install.sql @@ -437,7 +437,7 @@ CREATE TABLE `users` ( -- ---------------------------- -- Records of users -- ---------------------------- -INSERT INTO `users` VALUES ('4', '4w7est', '$2y$10$WFGFdNK.I4X0z1qXxjqrEeMvy65M2OyxJiNcNCY0gQ4KzeCCKms02', 'demo@demo.com', '99', '4W7EST', 'HH44aa', 'Demo', 'Account', '0', null, null, null, null, null); +INSERT INTO `users` VALUES ('4', '%%FIRSTUSER_NAME%%', '%%FIRSTUSER_PASS%%', '%%FIRSTUSER_MAIL%%', '99', '%%FIRSTUSER_CALL%%', '%%FIRSTUSER_LOCATOR%%', 'FIRSTUSER_FIRSTNAME%%', '%%FIRSTUSER_LASTNAME%%', '%%FIRSTUSER_TIMEZONE%%', null, null, null, null, null); diff --git a/install/includes/database_class.php b/install/includes/database_class.php index 0e2aeb2b3..62d44b9dc 100644 --- a/install/includes/database_class.php +++ b/install/includes/database_class.php @@ -34,10 +34,21 @@ class Database { // Open the default SQL file $query = file_get_contents('assets/install.sql'); + $newpw=password_hash($data['password'], PASSWORD_DEFAULT); + $newquery = str_replace("%%FIRSTUSER_NAME%%%",$data['username'],$query); + $newquery = str_replace("%%FIRSTUSER_PASS%%%",$data['password'],$newquery); + $newquery = str_replace("%%FIRSTUSER_MAIL%%",$data['user_email'],$newquery); + $newquery = str_replace("%%FIRSTUSER_CALL%%",$data['callsign'],$newquery); + $newquery = str_replace("%%FIRSTUSER_LOCATOR%%",$data['userlocator'],$newquery); + $newquery = str_replace("%%FIRSTUSER_FIRSTNAME%%",$data['firstname'],$newquery); + $newquery = str_replace("%%FIRSTUSER_LASTNAME%%",$data['lastname'],$newquery); + $newquery = str_replace("%%FIRSTUSER_TIMEZONE%%",$data['timezone'],$newquery); + + mysqli_report(MYSQLI_REPORT_ERROR | MYSQLI_REPORT_STRICT); // Execute a multi query - $mysqli->multi_query($query); + $mysqli->multi_query($newquery); // MultiQuery is NON-Blocking,so wait until everything is done do { null; } while($mysqli->next_result()); From c4a878502052ed33dbca137ee59de185c2abfce6 Mon Sep 17 00:00:00 2001 From: DJ7NT Date: Sun, 28 Jan 2024 19:09:20 +0000 Subject: [PATCH 2/3] Modified for auto-user --- install/assets/install.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/assets/install.sql b/install/assets/install.sql index 967f2427b..c494e2323 100755 --- a/install/assets/install.sql +++ b/install/assets/install.sql @@ -437,7 +437,7 @@ CREATE TABLE `users` ( -- ---------------------------- -- Records of users -- ---------------------------- -INSERT INTO `users` VALUES ('4', '%%FIRSTUSER_NAME%%', '%%FIRSTUSER_PASS%%', '%%FIRSTUSER_MAIL%%', '99', '%%FIRSTUSER_CALL%%', '%%FIRSTUSER_LOCATOR%%', 'FIRSTUSER_FIRSTNAME%%', '%%FIRSTUSER_LASTNAME%%', '%%FIRSTUSER_TIMEZONE%%', null, null, null, null, null); +INSERT INTO `users` VALUES ('4', '%%FIRSTUSER_NAME%%', '%%FIRSTUSER_PASS%%', '%%FIRSTUSER_MAIL%%', '99', '%%FIRSTUSER_CALL%%', '%%FIRSTUSER_LOCATOR%%', '%%FIRSTUSER_FIRSTNAME%%', '%%FIRSTUSER_LASTNAME%%', '%%FIRSTUSER_TIMEZONE%%', null, null, null, null, null); From 31cb0860e9e5928579ea91636153d8b0bcb6a1cf Mon Sep 17 00:00:00 2001 From: DJ7NT Date: Sun, 28 Jan 2024 19:09:36 +0000 Subject: [PATCH 3/3] modified for auto-user --- install/includes/database_class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/includes/database_class.php b/install/includes/database_class.php index 62d44b9dc..94e2b28dc 100644 --- a/install/includes/database_class.php +++ b/install/includes/database_class.php @@ -35,8 +35,8 @@ class Database { $query = file_get_contents('assets/install.sql'); $newpw=password_hash($data['password'], PASSWORD_DEFAULT); - $newquery = str_replace("%%FIRSTUSER_NAME%%%",$data['username'],$query); - $newquery = str_replace("%%FIRSTUSER_PASS%%%",$data['password'],$newquery); + $newquery = str_replace("%%FIRSTUSER_NAME%%",$data['username'],$query); + $newquery = str_replace("%%FIRSTUSER_PASS%%",$newpw,$newquery); $newquery = str_replace("%%FIRSTUSER_MAIL%%",$data['user_email'],$newquery); $newquery = str_replace("%%FIRSTUSER_CALL%%",$data['callsign'],$newquery); $newquery = str_replace("%%FIRSTUSER_LOCATOR%%",$data['userlocator'],$newquery);