@@ -1605,7 +1605,8 @@ if (!file_exists('.lock')) {
\ No newline at end of file
diff --git a/install/log/.keep b/install/log/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/install/run.php b/install/run.php
index 9ce9f164b..4617aa80e 100644
--- a/install/run.php
+++ b/install/run.php
@@ -38,6 +38,9 @@
@@ -61,6 +64,8 @@
$(document).ready(async function() {
init_read_log();
try {
+ await check_lockfile();
+
await config_file();
await database_file();
await database_tables();
@@ -68,19 +73,24 @@
await update_dxcc();
await installer_lock();
- // after all install steps went through we can show a success message and redirect to the user/login
- $("#success_message").show();
+ if($('#logContainer').css('display') == 'none') {
+ // after all install steps went through we can show a success message and redirect to the user/login
+ $("#success_message").show();
- // Initialize the countdown
- var countdown = 4;
- var countdownInterval = setInterval(function() {
- countdown--;
- $("#countdown").text(countdown);
- if (countdown <= 0) {
- clearInterval(countdownInterval);
- window.location.href = _POST.websiteurl + "index.php/user/login/1";
- }
- }, 1000);
+ // Initialize the countdown
+ var countdown = 4;
+ var countdownInterval = setInterval(function() {
+ countdown--;
+ $("#countdown").text(countdown);
+ if (countdown <= 0) {
+ clearInterval(countdownInterval);
+ window.location.href = _POST.websiteurl + "index.php/user/login/1";
+ }
+ }, 1000);
+ } else {
+ // after all install steps went through we can show the redirect button
+ $("#success_button").show();
+ }
} catch (error) {
$("#error_message").text("Installation failed: " + error).show();
}
@@ -90,7 +100,7 @@
setInterval(function() {
$.ajax({
type: 'POST',
- url: 'index.php',
+ url: 'ajax.php',
data: {
read_logfile: 1
},
@@ -112,16 +122,48 @@
}
});
+ // if a user goes back to the installer we need to redirect him
+ async function check_lockfile() {
+
+ log_message('error', "Attention! Installer was called again. Let's check for a lockfile.");
+
+ return new Promise((resolve, reject) => {
+ $.ajax({
+ type: 'POST',
+ url: 'ajax.php',
+ data: {
+ check_lockfile: 1
+ },
+ success: function(response) {
+ if (response != 'installer_locked') {
+ log_message('debug', "Seems like there is no .lock file. Let's try to run the installer again.");
+ resolve();
+ } else {
+ log_message('error', 'Installer is locked. Redirect to user/login.');
+ reject(response);
+ window.location.href = "" + "index.php/user/login";
+ }
+ },
+ error: function(error) {
+ log_message('error', "Install Lock Check wen't wrong...");
+ reject(error);
+ window.location.href = "" + "index.php/user/login";
+ }
+ });
+ });
+ }
+
async function config_file() {
var field = '#config_file';
running(field, true);
+ log_message('debug', 'Start writing config.php');
return new Promise((resolve, reject) => {
$.ajax({
type: 'POST',
- url: 'index.php',
+ url: 'ajax.php',
data: {
data: _POST,
run_config_file: 1
@@ -129,13 +171,16 @@
success: function(response) {
if (response == 'success') {
running(field, false);
+ log_message('debug', 'File: config.php successfully written');
resolve();
} else {
running(field, false, true);
+ log_message('error', 'File: Could not write file. Check Permissions.');
reject("");
}
},
error: function(error) {
+ log_message('error', 'File: Could not write file. Ajax failed.');
running(field, false, true);
reject(error);
}
@@ -148,11 +193,12 @@
var field = '#database_file';
running(field, true);
+ log_message('debug', 'Start writing database.php');
return new Promise((resolve, reject) => {
$.ajax({
type: 'POST',
- url: 'index.php',
+ url: 'ajax.php',
data: {
data: _POST,
run_database_file: 1
@@ -160,13 +206,16 @@
success: function(response) {
if (response == 'success') {
running(field, false);
+ log_message('debug', 'File: database.php successfully written');
resolve();
} else {
running(field, false, true);
+ log_message('error', 'File: Could not write file. Check Permissions.');
reject("");
}
},
error: function(error) {
+ log_message('error', 'File: Could not write file. Ajax failed.');
running(field, false, true);
reject(error);
}
@@ -178,26 +227,30 @@
var field = '#database_tables';
running(field, true);
+ log_message('debug', 'Start creating database structure with assets/install.sql');
return new Promise((resolve, reject) => {
$.ajax({
type: 'POST',
- url: 'index.php',
+ url: 'ajax.php',
data: {
data: _POST,
run_database_tables: 1
},
success: function(response) {
if (response == 'success') {
+ log_message('debug', 'Tables successfully created');
running(field, false);
resolve();
} else {
running(field, false, true);
+ log_message('error', 'Creating database tables from assets/install.sql failed.');
reject("");
}
},
error: function(error) {
running(field, false, true);
+ log_message('error', 'Creating database tables failed. Ajax crashed.');
reject(error);
}
});
@@ -208,21 +261,25 @@
var field = '#database_migrations';
running(field, true);
+ log_message('debug', 'Start migrating database to the newest version.');
return new Promise((resolve, reject) => {
$.ajax({
- url: "" + "index.php/migrate",
+ url: "" + "index.php/migrate",
success: function(response) {
if (response == 'success') {
running(field, false);
+ log_message('debug', 'Database successfully created.');
resolve();
} else {
running(field, false, true);
+ log_message('error', 'Could not migrate database.');
reject("");
}
},
error: function(error) {
running(field, false, true);
+ log_message('error', 'Could not migrate database. Ajax crashed.');
reject(error);
}
});
@@ -236,20 +293,24 @@
if(_POST.skip_dxcc_update == 0) {
running(field, true);
+ log_message('debug', 'Start updating DXCC database. This can take a moment or two... Please wait');
$.ajax({
- url: "" + "index.php/update/dxcc",
+ url: "" + "index.php/update/dxcc",
success: function(response) {
if (response == 'success') {
running(field, false);
+ log_message('debug', 'Successfully update DXCC database');
resolve();
} else {
running(field, false, true);
+ log_message('error', 'Could not update DXCC data.');
reject("");
}
},
error: function(error) {
running(field, false, true);
+ log_message('error', 'Could not update DXCC data. Ajax crashed.');
reject(error);
}
});
@@ -262,26 +323,30 @@
async function installer_lock() {
var field = '#installer_lock';
+ log_message('debug', 'Try to create .lock file for the installer');
running(field, true);
return new Promise((resolve, reject) => {
$.ajax({
type: 'POST',
- url: 'index.php',
+ url: 'ajax.php',
data: {
run_installer_lock: 1
},
success: function(response) {
if (response == 'success') {
running(field, false);
+ log_message('debug', 'Successfully created .lock file in folder /install');
resolve();
} else {
running(field, false, true);
+ log_message('error', 'Could not create .lock file.');
reject("");
}
},
error: function(error) {
running(field, false, true);
+ log_message('error', 'Could not create .lock file. Ajax crashed');
reject(error);
}
});
From 1e9c73ed31c42849551692cf01cc4ee857f97848 Mon Sep 17 00:00:00 2001
From: HB9HIL
Date: Mon, 22 Jul 2024 15:18:57 +0200
Subject: [PATCH 24/86] log_message
---
install/run.php | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/install/run.php b/install/run.php
index 4617aa80e..bd2176f95 100644
--- a/install/run.php
+++ b/install/run.php
@@ -125,8 +125,6 @@
// if a user goes back to the installer we need to redirect him
async function check_lockfile() {
- log_message('error', "Attention! Installer was called again. Let's check for a lockfile.");
-
return new Promise((resolve, reject) => {
$.ajax({
type: 'POST',
@@ -136,16 +134,15 @@
},
success: function(response) {
if (response != 'installer_locked') {
- log_message('debug', "Seems like there is no .lock file. Let's try to run the installer again.");
resolve();
} else {
- log_message('error', 'Installer is locked. Redirect to user/login.');
+ log_message('error', 'Attention: Installer is locked. Redirect to user/login.');
reject(response);
window.location.href = "" + "index.php/user/login";
}
},
error: function(error) {
- log_message('error', "Install Lock Check wen't wrong...");
+ log_message('error', "Install Lock Check went wrong...");
reject(error);
window.location.href = "" + "index.php/user/login";
}
From ba159725407af58ffa5b3c4260e30be54c782f02 Mon Sep 17 00:00:00 2001
From: HB9HIL
Date: Mon, 22 Jul 2024 17:15:01 +0200
Subject: [PATCH 25/86] added final log_message
---
install/run.php | 2 ++
1 file changed, 2 insertions(+)
diff --git a/install/run.php b/install/run.php
index bd2176f95..cf8798f08 100644
--- a/install/run.php
+++ b/install/run.php
@@ -73,6 +73,8 @@
await update_dxcc();
await installer_lock();
+ log_message('info', 'Finish. Installer went through successfully.');
+
if($('#logContainer').css('display') == 'none') {
// after all install steps went through we can show a success message and redirect to the user/login
$("#success_message").show();
From 0db802e9eafec23cf7edc8a552f7091c62d3686b Mon Sep 17 00:00:00 2001
From: HB9HIL
Date: Mon, 22 Jul 2024 17:34:24 +0200
Subject: [PATCH 26/86] fixed redirect link in success_button
---
install/run.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/install/run.php b/install/run.php
index cf8798f08..c0ca19d92 100644
--- a/install/run.php
+++ b/install/run.php
@@ -39,7 +39,7 @@
4"); ?>
From ec87c015049da2c5cad534eef2e91ae5a3a2dd3a Mon Sep 17 00:00:00 2001
From: HB9HIL
Date: Wed, 24 Jul 2024 13:14:34 +0200
Subject: [PATCH 27/86] drop doubled locator input
---
install/includes/core/core_class.php | 2 +-
install/index.php | 17 +----------------
2 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/install/includes/core/core_class.php b/install/includes/core/core_class.php
index dbf4403fb..25d7cc566 100644
--- a/install/includes/core/core_class.php
+++ b/install/includes/core/core_class.php
@@ -161,7 +161,7 @@ class Core
// creating a unique encryption key
$encryptionkey = uniqid(bin2hex(random_bytes(8)), false);
- $new = str_replace("%baselocator%", $data['locator'], $database_file);
+ $new = str_replace("%baselocator%", $data['userlocator'], $database_file);
$new = str_replace("%websiteurl%", $data['websiteurl'], $new);
$new = str_replace("%directory%", $data['directory'], $new);
$new = str_replace("%callbook%", $data['global_call_lookup'], $new);
diff --git a/install/index.php b/install/index.php
index 2e24f7c5d..5f689129f 100644
--- a/install/index.php
+++ b/install/index.php
@@ -328,13 +328,6 @@ if (!file_exists('.lock')) {