From b8d2032ed6af92fca0b46336c2bd9ae3c6ce5e9f Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Fri, 29 Jan 2021 20:11:35 +0000 Subject: [PATCH] [QSO] Fixes #557 Where /P wasn't handled properly --- application/controllers/Logbook.php | 3 +++ application/views/interface_assets/footer.php | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index d7a78199..1ae8696d 100755 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -67,6 +67,9 @@ class Logbook extends CI_Controller { $this->load->model('user_model'); if(!$this->user_model->authorize($this->config->item('auth_mode'))) { return; } + // Convert - in Callsign to / Used for URL processing + $callsign = str_replace("-","/",$callsign); + // Check if callsign is an LOTW User $lotw_member = ""; $lotw_file_name = "./updates/lotw_users.csv"; diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index bbbe3473..6119dfe3 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -31,7 +31,7 @@ - + @@ -781,8 +781,12 @@ $(document).on('change', 'input', function(){ var json_mode = $("#mode").val(); } + var find_callsign = $(this).val().toUpperCase(); - $.getJSON('logbook/json/' + $(this).val().toUpperCase() + '/' + sat_type + '/' + json_band + '/' + json_mode, function(result) + find_callsign.replace(/\//g, "-"); + + // Replace / in a callsign with - to stop urls breaking + $.getJSON('logbook/json/' + find_callsign.replace(/\//g, "-") + '/' + sat_type + '/' + json_band + '/' + json_mode, function(result) { //$('#country').val(result); lotw_info if(result.dxcc.entity != undefined) {