diff --git a/application/config/lotw.php b/application/config/lotw.php index 43d14b947..b49574250 100644 --- a/application/config/lotw.php +++ b/application/config/lotw.php @@ -11,9 +11,24 @@ defined('BASEPATH') OR exit('No direct script access allowed'); |-------------------------------------------------------------------------- | Folder location for storing P12 certificate files on the system |-------------------------------------------------------------------------- -| +| | This folder must be outside of your www root for security reasons | */ $config['lotw_keys_folder'] = ""; +/* +|-------------------------------------------------------------------------- +| Propagation modes that are not supported by LoTW +|-------------------------------------------------------------------------- +| +| As per tqsl config the following propagation modes are not supported by +| LoTW and ignored. So Wavelog will not handle them during LoTW sync. +| As per tqsl v2.7.3 these modes are: +| - RPT +| - INTERNET +| Please do not edit! +| +*/ +$config['lotw_unsupported_prop_modes'] = array('INTERNET', 'RPT'); + diff --git a/application/config/migration.php b/application/config/migration.php index d18693070..1bbb1a0a6 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE; | */ -$config['migration_version'] = 208; +$config['migration_version'] = 209; /* |-------------------------------------------------------------------------- diff --git a/application/controllers/Lotw.php b/application/controllers/Lotw.php index 2eb5da879..3c4412e23 100644 --- a/application/controllers/Lotw.php +++ b/application/controllers/Lotw.php @@ -236,6 +236,9 @@ class Lotw extends CI_Controller { $this->load->model('Logbook_model'); + // First mark QSOs with unsupported propagation modes as ignore + $this->Logbook_model->mark_lotw_ignore($data['station_profile']->station_id); + $data['qsos'] = $this->Logbook_model->get_lotw_qsos_to_upload($data['station_profile']->station_id, $data['lotw_cert_info']->qso_start_date, $data['lotw_cert_info']->qso_end_date); // Nothing to upload diff --git a/application/controllers/Qso.php b/application/controllers/Qso.php index f2b0a350c..5463a0681 100644 --- a/application/controllers/Qso.php +++ b/application/controllers/Qso.php @@ -618,6 +618,10 @@ class QSO extends CI_Controller { echo json_encode($return_json); } + public function unsupported_lotw_prop_modes() { + echo json_encode($this->config->item('lotw_unsupported_prop_modes')); + } + function check_locator($grid) { $grid = $this->input->post('locator'); // Allow empty locator diff --git a/application/locale/bg_BG/LC_MESSAGES/messages.po b/application/locale/bg_BG/LC_MESSAGES/messages.po index 2624d5052..4ea964f3d 100644 --- a/application/locale/bg_BG/LC_MESSAGES/messages.po +++ b/application/locale/bg_BG/LC_MESSAGES/messages.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-07-13 09:35+0000\n" +"POT-Creation-Date: 2024-07-14 09:36+0000\n" "PO-Revision-Date: 2024-07-09 13:25+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Bulgarian