Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

drop doubled locator input

Browse Source
This commit is contained in:
HB9HIL
2024-07-24 13:14:34 +02:00
parent 20886e5d69
commit ec87c01504
2 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/includes/core/core_class.php
View File

@@ -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);

17
install/index.php
View File

@@ -328,13 +328,6 @@ if (!file_exists('.lock')) {
<?= __("This field can't be empty and have to end with a slash 'example/'!"); ?>
</div>
</div>
<div class="mb-3 position-relative">
<label for="locator" class="form-label required"><?= __("Default Gridsquare/Locator"); ?></label><i id="gridsquare_tooltip" data-bs-toggle="tooltip" data-bs-placement="top" class="fas fa-question-circle text-muted ms-2" data-bs-custom-class="custom-tooltip" data-bs-html="true" data-bs-title="<?= __("This is the default maidenhead locator which is used as falback. You can use the locator of your Home QTH."); ?>"></i>
<input type="text" id="locator" placeholder="HA44AA" class="form-control" name="locator" />
<div class="invalid-tooltip">
<?= __("Type in a valid locator"); ?>
</div>
</div>
<div class="mb-3">
<label for="global_call_lookup" class="form-label"><?= __("Optional: Global Callbook Lookup"); ?><i id="callbook_tooltip" data-bs-toggle="tooltip" data-bs-placement="top" class="fas fa-question-circle text-muted ms-2" data-bs-custom-class="custom-tooltip" data-bs-html="true" data-bs-title="<?= __("This configuration is optional. The callsign lookup will be available for all users of this installation. You can choose between QRZ.com and HamQTH. While HamQTH also works without username and password, you will need credentials for QRZ.com. To also get the Call Locator in QRZ.com you'll need an XML subscription. HamQTH does not always provide the locator information."); ?>"></i></label>
<select id="global_call_lookup" class="form-select" name="global_call_lookup">
@@ -1326,11 +1319,6 @@ if (!file_exists('.lock')) {
maidenhead_checks(userLocatorField);
});
const locatorField = '#locator';
$(locatorField).on('change', function() {
maidenhead_checks(locatorField);
});
function maidenhead_checks(field) {
if (!isValidMaidenheadLocator($(field).val())) {
$(field).addClass('is-invalid');
@@ -1428,7 +1416,7 @@ if (!file_exists('.lock')) {
// Checklist Stuff
checklist_configuration();
$('#directory, #websiteurl, #locator').on('change', function() {
$('#directory, #websiteurl').on('change', function() {
directory_check();
websiteurl_check();
checklist_configuration();
@@ -1512,9 +1500,6 @@ if (!file_exists('.lock')) {
if ($('#websiteurl').val() == '' || $('#websiteurl').hasClass('is-invalid')) {
checklist_configuration = false;
}
if ($('#locator').val() == '' || $('#locator').hasClass('is-invalid')) {
checklist_configuration = false;
}
if (checklist_configuration) {
$('#checklist_configuration').removeClass('fa-times-circle');