diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index 8e55a95b0..920d15839 100644 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -84,11 +84,10 @@ class Logbook extends CI_Controller { echo json_encode($return, JSON_PRETTY_PRINT); } - function json($tempcallsign, $temptype, $tempband, $tempmode, $tempstation_id = null) { + function json($tempcallsign, $tempband, $tempmode, $tempstation_id = null) { session_write_close(); // Cleaning for security purposes $callsign = $this->security->xss_clean($tempcallsign); - $type = $this->security->xss_clean($temptype); $band = $this->security->xss_clean($tempband); $mode = $this->security->xss_clean($tempmode); $station_id = $this->security->xss_clean($tempstation_id); @@ -152,8 +151,8 @@ class Logbook extends CI_Controller { $return['qsl_manager'] = $this->nval($callbook['qslmgr'] ?? '', $this->logbook_model->call_qslvia($callsign)); $return['callsign_state'] = $this->nval($callbook['state'] ?? '', $this->logbook_model->call_state($callsign)); $return['callsign_us_county'] = $this->nval($callbook['us_county'] ?? '', $this->logbook_model->call_us_county($callsign)); - $return['workedBefore'] = $this->worked_grid_before($return['callsign_qra'], $type, $band, $mode); - $return['confirmed'] = $this->confirmed_grid_before($return['callsign_qra'], $type, $band, $mode); + $return['workedBefore'] = $this->worked_grid_before($return['callsign_qra'], $band, $mode); + $return['confirmed'] = $this->confirmed_grid_before($return['callsign_qra'], $band, $mode); $return['timesWorked'] = $this->logbook_model->times_worked($lookupcall); if ($this->session->userdata('user_show_profile_image')) { @@ -201,7 +200,7 @@ class Logbook extends CI_Controller { return (($val2 ?? "") === "" ? ($val1 ?? "") : ($val2 ?? "")); } - function confirmed_grid_before($gridsquare, $type, $band, $mode) { + function confirmed_grid_before($gridsquare, $band, $mode) { if (strlen($gridsquare) < 4) return false; @@ -235,7 +234,7 @@ class Logbook extends CI_Controller { } - if($type == "SAT") { + if($band == "SAT") { $this->db->where('COL_PROP_MODE', 'SAT'); if ($extrawhere != '') { $this->db->where('('.$extrawhere.')'); @@ -270,7 +269,7 @@ class Logbook extends CI_Controller { return false; } - function worked_grid_before($gridsquare, $type, $band, $mode) + function worked_grid_before($gridsquare, $band, $mode) { if (strlen($gridsquare) < 4) return false; @@ -279,7 +278,7 @@ class Logbook extends CI_Controller { $logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); if(!empty($logbooks_locations_array)) { - if($type == "SAT") { + if($band == "SAT") { $this->db->where('COL_PROP_MODE', 'SAT'); } else { $this->db->where('COL_MODE', $this->logbook_model->get_main_mode_from_mode($mode)); diff --git a/assets/js/sections/contesting.js b/assets/js/sections/contesting.js index acab7338e..60e3376a3 100644 --- a/assets/js/sections/contesting.js +++ b/assets/js/sections/contesting.js @@ -300,7 +300,7 @@ $("#callsign").keyup(async function (e) { async function getCallbook() { var call = $("#callsign").val(); if (call.length >= 3) { - $.getJSON(base_url + 'index.php/logbook/json/' + call + '/0/'+$("#band").val()+'/'+$("#band").val() + '/' + current_active_location, function(result) { + $.getJSON(base_url + 'index.php/logbook/json/' + call + '/'+$("#band").val()+'/'+$("#band").val() + '/' + current_active_location, function(result) { try { $('#bearing_info').html(result.bearing); } catch {} diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js index 8abdcdf03..a5e166cb6 100644 --- a/assets/js/sections/qso.js +++ b/assets/js/sections/qso.js @@ -752,14 +752,11 @@ $( document ).ready(function() { $('.callsign-suggest').hide(); if($("#sat_name").val() != ""){ - var sat_type = "SAT"; - var json_band = "0"; - var json_mode = "0"; + var json_band = "SAT"; } else { - var sat_type = "0"; var json_band = $("#band").val(); - var json_mode = $("#mode").val(); } + var json_mode = $("#mode").val(); var find_callsign = $(this).val().toUpperCase(); var callsign = find_callsign; @@ -768,7 +765,7 @@ $( document ).ready(function() { find_callsign=find_callsign.replace('Ø', '0'); // Replace / in a callsign with - to stop urls breaking - $.getJSON(base_url + 'index.php/logbook/json/' + find_callsign + '/' + sat_type + '/' + json_band + '/' + json_mode + '/' + $('#stationProfile').val(), async function(result) + $.getJSON(base_url + 'index.php/logbook/json/' + find_callsign + '/' + json_band + '/' + json_mode + '/' + $('#stationProfile').val(), async function(result) { // Make sure the typed callsign and json result match