From 318fc294494bbdefa23890af1dff42fd57548c36 Mon Sep 17 00:00:00 2001 From: phl0 Date: Thu, 27 Jul 2023 09:16:55 +0200 Subject: [PATCH] Use LoTW as official abbreviation --- application/config/lotw.php | 2 +- application/controllers/Activated_grids.php | 2 +- application/controllers/Api.php | 2 +- application/controllers/Gridsquares.php | 2 +- application/controllers/Logbook.php | 2 +- application/controllers/Lotw.php | 28 ++++++++++---------- application/controllers/Visitor.php | 2 +- application/language/bulgarian/lotw_lang.php | 2 +- application/language/czech/lotw_lang.php | 2 +- application/language/english/lotw_lang.php | 2 +- application/language/finnish/lotw_lang.php | 4 +-- application/language/french/lotw_lang.php | 4 +-- application/language/greek/lotw_lang.php | 2 +- application/language/italian/lotw_lang.php | 4 +-- application/language/polish/lotw_lang.php | 6 ++--- application/language/swedish/lotw_lang.php | 2 +- application/language/turkish/lotw_lang.php | 2 +- application/models/Logbook_model.php | 2 +- application/views/qso/edit_ajax.php | 2 +- application/views/welcome/index.php | 2 +- 20 files changed, 38 insertions(+), 38 deletions(-) diff --git a/application/config/lotw.php b/application/config/lotw.php index 36274f40..43d14b94 100644 --- a/application/config/lotw.php +++ b/application/config/lotw.php @@ -3,7 +3,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); /* * -* Configuration file for all things relating to LOTW +* Configuration file for all things relating to LoTW * */ diff --git a/application/controllers/Activated_grids.php b/application/controllers/Activated_grids.php index 3800fe20..57853c6f 100644 --- a/application/controllers/Activated_grids.php +++ b/application/controllers/Activated_grids.php @@ -68,7 +68,7 @@ class Activated_grids extends CI_Controller { $grid_6char_confirmed = ""; - // Get Confirmed LOTW & Paper Activated Squares (non VUCC) + // Get Confirmed LoTW & Paper Activated Squares (non VUCC) $query = $this->activated_grids_model->get_activated_confirmed_sat_squares(); diff --git a/application/controllers/Api.php b/application/controllers/Api.php index b39d3f21..4c371ea2 100644 --- a/application/controllers/Api.php +++ b/application/controllers/Api.php @@ -808,7 +808,7 @@ class API extends CI_Controller { /* * - * Check if callsign is active on LOTW + * Check if callsign is active on LoTW * */ diff --git a/application/controllers/Gridsquares.php b/application/controllers/Gridsquares.php index 02e67a28..477e78a1 100644 --- a/application/controllers/Gridsquares.php +++ b/application/controllers/Gridsquares.php @@ -68,7 +68,7 @@ class Gridsquares extends CI_Controller { $grid_6char_confirmed = ""; - // Get Confirmed LOTW & Paper Squares (non VUCC) + // Get Confirmed LoTW & Paper Squares (non VUCC) $query = $this->gridsquares_model->get_confirmed_sat_squares(); diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index 2bcae681..1b631efe 100644 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -97,7 +97,7 @@ class Logbook extends CI_Controller { // Convert - in Callsign to / Used for URL processing $callsign = str_replace("-","/",$callsign); - // Check if callsign is an LOTW User + // Check if callsign is an LoTW User // Check Database for all other data $this->load->model('logbook_model'); diff --git a/application/controllers/Lotw.php b/application/controllers/Lotw.php index d3d480be..f3a9f7a1 100644 --- a/application/controllers/Lotw.php +++ b/application/controllers/Lotw.php @@ -6,7 +6,7 @@ class Lotw extends CI_Controller { | Controller: Lotw |-------------------------------------------------------------------------- | - | This Controller handles all things LOTW, upload and download. + | This Controller handles all things LoTW, upload and download. | | | Note: @@ -49,7 +49,7 @@ class Lotw extends CI_Controller { // Load required models for page generation $this->load->model('LotwCert'); - // Get Array of the logged in users LOTW certs. + // Get Array of the logged in users LoTW certs. $data['lotw_cert_results'] = $this->LotwCert->lotw_certs($this->session->userdata('user_id')); // Set Page Title @@ -166,7 +166,7 @@ class Lotw extends CI_Controller { // p12 certificate processed time to delete the file unlink($data['upload_data']['full_path']); - // Get Array of the logged in users LOTW certs. + // Get Array of the logged in users LoTW certs. $data['lotw_cert_results'] = $this->LotwCert->lotw_certs($this->session->userdata('user_id')); // Set Page Title @@ -187,7 +187,7 @@ class Lotw extends CI_Controller { | Function: lotw_upload |-------------------------------------------------------------------------- | - | This function Uploads to LOTW + | This function Uploads to LoTW | */ public function lotw_upload() { @@ -225,7 +225,7 @@ class Lotw extends CI_Controller { $data['station_profile'] = $station_profile; $data['lotw_cert_info'] = $this->LotwCert->lotw_cert_details($station_profile->station_callsign, $station_profile->station_dxcc); - // If Station Profile has no LOTW Cert continue on. + // If Station Profile has no LoTW Cert continue on. if(!isset($data['lotw_cert_info']->cert_dxcc_id)) { continue; } @@ -349,7 +349,7 @@ class Lotw extends CI_Controller { unlink(realpath($filename_for_saving)); } } else { - echo "No Station Profiles found to upload to LOTW"; + echo "No Station Profiles found to upload to LoTW"; } /* @@ -369,7 +369,7 @@ class Lotw extends CI_Controller { | Function: delete_cert |-------------------------------------------------------------------------- | - | Deletes LOTW certificate from the MySQL table + | Deletes LoTW certificate from the MySQL table | */ public function delete_cert($cert_id) { @@ -392,7 +392,7 @@ class Lotw extends CI_Controller { |-------------------------------------------------------------------------- | | Accepts p12 file and optional password and encrypts the file returning - | the required fields for LOTW and the PEM Key + | the required fields for LoTW and the PEM Key | */ public function decrypt_key($file, $password = "") { @@ -420,7 +420,7 @@ class Lotw extends CI_Controller { // Error Log Error Message log_message('error', openssl_error_string()); - // Set warning message redirect to LOTW main page + // Set warning message redirect to LoTW main page $this->session->set_flashdata('Warning', openssl_error_string()); redirect('/lotw/'); } @@ -428,7 +428,7 @@ class Lotw extends CI_Controller { // Reading p12 failed log error message log_message('error', openssl_error_string()); - // Set warning message redirect to LOTW main page + // Set warning message redirect to LoTW main page $this->session->set_flashdata('Warning', openssl_error_string()); redirect('/lotw/'); } @@ -682,7 +682,7 @@ class Lotw extends CI_Controller { } return $results; } else { - return "No LOTW User details found to carry out matches."; + return "No LoTW User details found to carry out matches."; } } @@ -898,7 +898,7 @@ class Lotw extends CI_Controller { } /* - Load the ARRL LOTW User Activity CSV and saves into uploads/lotw_users.csv + Load the ARRL LoTW User Activity CSV and saves into uploads/lotw_users.csv */ public function load_users() { $contents = file_get_contents('https://lotw.arrl.org/lotw-user-activity.csv', true); @@ -917,7 +917,7 @@ class Lotw extends CI_Controller { } /* - Check if callsign is an active LOTW user and return whether its true or not + Check if callsign is an active LoTW user and return whether its true or not */ function lotw_usercheck($callsign) { $f = fopen('./updates/lotw_users.csv', "r"); @@ -961,7 +961,7 @@ class Lotw extends CI_Controller { | Function: lotw_satellite_map | Requires: OSCAR Satellite name $satname | - | Outputs if LOTW uses a different satellite name + | Outputs if LoTW uses a different satellite name | */ function lotw_satellite_map($satname) { diff --git a/application/controllers/Visitor.php b/application/controllers/Visitor.php index f2864135..1eec26ff 100644 --- a/application/controllers/Visitor.php +++ b/application/controllers/Visitor.php @@ -294,7 +294,7 @@ class Visitor extends CI_Controller { $grid_6char_confirmed = ""; - // Get Confirmed LOTW & Paper Squares (non VUCC) + // Get Confirmed LoTW & Paper Squares (non VUCC) $query = $this->gridsquares_model->get_confirmed_sat_squares($logbooks_locations_array); diff --git a/application/language/bulgarian/lotw_lang.php b/application/language/bulgarian/lotw_lang.php index 975aa1de..eb633132 100644 --- a/application/language/bulgarian/lotw_lang.php +++ b/application/language/bulgarian/lotw_lang.php @@ -27,7 +27,7 @@ $lang['lotw_certificate_dxcc_help_text'] = 'Certificate DXCC entity. Напри $lang['lotw_input_a_file'] = 'Качете файл'; -$lang['lotw_upload_exported_adif_file_from_lotw'] = 'Upload the Exported ADIF file from LoTW from the Download Report Area, to mark QSOs as confirmed on LOTW.'; +$lang['lotw_upload_exported_adif_file_from_lotw'] = 'Upload the Exported ADIF file from LoTW from the Download Report Area, to mark QSOs as confirmed on LoTW.'; $lang['lotw_upload_type_must_be_adi'] = 'Log files must have the file type .adi'; $lang['lotw_pull_lotw_data_for_me'] = 'Pull LoTW data for me'; diff --git a/application/language/czech/lotw_lang.php b/application/language/czech/lotw_lang.php index 4bd50b77..0256c15b 100644 --- a/application/language/czech/lotw_lang.php +++ b/application/language/czech/lotw_lang.php @@ -26,7 +26,7 @@ $lang['lotw_certificate_dxcc_help_text'] = 'Certifikát zěmě DXCC. Například $lang['lotw_input_a_file'] = 'Nahraj soubor'; -$lang['lotw_upload_exported_adif_file_from_lotw'] = 'Nahraj exportovaný soubor z LoTW z Download Report Area, to mark QSOs as confirmed on LOTW.'; +$lang['lotw_upload_exported_adif_file_from_lotw'] = 'Nahraj exportovaný soubor z LoTW z Download Report Area, to mark QSOs as confirmed on LoTW.'; $lang['lotw_upload_type_must_be_adi'] = 'Deník musí být ve formátu .adi'; $lang['lotw_pull_lotw_data_for_me'] = 'Stáhni data z LoTW'; diff --git a/application/language/english/lotw_lang.php b/application/language/english/lotw_lang.php index 44953b5b..4ef6691c 100644 --- a/application/language/english/lotw_lang.php +++ b/application/language/english/lotw_lang.php @@ -30,7 +30,7 @@ $lang['lotw_certificate_dxcc_help_text'] = 'Certificate DXCC entity. For example $lang['lotw_input_a_file'] = 'Upload a File'; -$lang['lotw_upload_exported_adif_file_from_lotw'] = 'Upload the Exported ADIF file from LoTW from the Download Report Area, to mark QSOs as confirmed on LOTW.'; +$lang['lotw_upload_exported_adif_file_from_lotw'] = 'Upload the Exported ADIF file from LoTW from the Download Report Area, to mark QSOs as confirmed on LoTW.'; $lang['lotw_upload_type_must_be_adi'] = 'Log files must have the file type .adi'; $lang['lotw_pull_lotw_data_for_me'] = 'Pull LoTW data for me'; diff --git a/application/language/finnish/lotw_lang.php b/application/language/finnish/lotw_lang.php index be3072d7..240d326e 100644 --- a/application/language/finnish/lotw_lang.php +++ b/application/language/finnish/lotw_lang.php @@ -54,8 +54,8 @@ $lang['lotw_p12_export_step_four'] = 'Lataa ja tuo äsken tallentamasi tiedosto $lang['lotw_confirmed'] = 'Tämä QSO on kuitattu LoTW:ssa'; // LoTW Expiry -$lang['lotw_cert_expiring'] = 'Vähintään yksi LOTW:n kutsumerkin varmenteesi on vanhentumassa!'; -$lang['lotw_cert_expired'] = 'Vähintään yksi LOTW:n kutsumerkin varmenteesi on vanhentunut!!'; +$lang['lotw_cert_expiring'] = 'Vähintään yksi LoTW:n kutsumerkin varmenteesi on vanhentumassa!'; +$lang['lotw_cert_expired'] = 'Vähintään yksi LoTW:n kutsumerkin varmenteesi on vanhentunut!!'; // Lotw User $lang['lotw_user'] = 'Tämä asmea käyttää LoTW-palvelua. Viimeinen yhteyksien lähetys oli'; diff --git a/application/language/french/lotw_lang.php b/application/language/french/lotw_lang.php index 2240e459..eaa5d2b5 100644 --- a/application/language/french/lotw_lang.php +++ b/application/language/french/lotw_lang.php @@ -10,7 +10,7 @@ $lang['lotw_title_export_p12_file_instruction'] = 'Instruction pour l\'export de $lang['lotw_title_adif_import'] = 'Import ADIF'; $lang['lotw_title_adif_import_options'] = 'Options d\'import'; -$lang['lotw_beta_warning'] = 'Attention la synchro LOTW est au stage BETA, voir le wiki pour l\'aide.'; +$lang['lotw_beta_warning'] = 'Attention la synchro LoTW est au stage BETA, voir le wiki pour l\'aide.'; $lang['lotw_no_certs_uploaded'] = 'Vous devez envoyer des certificats p1 pour utiliser cette zone.'; $lang['lotw_date_created'] = 'Date Création'; @@ -26,7 +26,7 @@ $lang['lotw_certificate_dxcc_help_text'] = 'Entité Certificat DXCC. Par example $lang['lotw_input_a_file'] = 'Envoyer un fichier'; -$lang['lotw_upload_exported_adif_file_from_lotw'] = 'Envoyer le fichier ADIF exporté depuis la zone LoTW à l\'adresse Download Report, pour marquer les QSO comme "confirmés" sur LOTW.'; +$lang['lotw_upload_exported_adif_file_from_lotw'] = 'Envoyer le fichier ADIF exporté depuis la zone LoTW à l\'adresse Download Report, pour marquer les QSO comme "confirmés" sur LoTW.'; $lang['lotw_upload_type_must_be_adi'] = 'Les fichiers de log doivent être au format .adi'; $lang['lotw_pull_lotw_data_for_me'] = 'Récuperer mes données LoTW'; diff --git a/application/language/greek/lotw_lang.php b/application/language/greek/lotw_lang.php index 8bbe5e21..e9d8ccbc 100644 --- a/application/language/greek/lotw_lang.php +++ b/application/language/greek/lotw_lang.php @@ -30,7 +30,7 @@ $lang['lotw_certificate_dxcc_help_text'] = 'Πιστοποιητικό οντό $lang['lotw_input_a_file'] = 'Ανέβασε ένα αρχείο'; -$lang['lotw_upload_exported_adif_file_from_lotw'] = 'Μεταφορτώστε το εξαγόμενο αρχείο ADIF από το LoTW από την περιοχή Download Report, για να επισημάνετε τα QSO ως επιβεβαιώθηκε στο LOTW.'; +$lang['lotw_upload_exported_adif_file_from_lotw'] = 'Μεταφορτώστε το εξαγόμενο αρχείο ADIF από το LoTW από την περιοχή Download Report, για να επισημάνετε τα QSO ως επιβεβαιώθηκε στο LoTW.'; $lang['lotw_upload_type_must_be_adi'] = 'Τα αρχεία καταγραφής πρέπει να έχουν τον τύπο αρχείου .adi'; $lang['lotw_pull_lotw_data_for_me'] = 'Τραβήξτε δεδομένα LoTW για μένα'; diff --git a/application/language/italian/lotw_lang.php b/application/language/italian/lotw_lang.php index c5b67745..0fa40c9c 100644 --- a/application/language/italian/lotw_lang.php +++ b/application/language/italian/lotw_lang.php @@ -11,7 +11,7 @@ $lang['lotw_title_export_p12_file_instruction'] = 'Esporta Istruzioni File .p12' $lang['lotw_title_adif_import'] = 'Importa ADIF'; $lang['lotw_title_adif_import_options'] = 'Importa Opzioni'; -$lang['lotw_beta_warning'] = 'Attenzione, la Sincronia LOTW è in BETA, guarda la documentazione per un aiuto.'; +$lang['lotw_beta_warning'] = 'Attenzione, la Sincronia LoTW è in BETA, guarda la documentazione per un aiuto.'; $lang['lotw_no_certs_uploaded'] = 'Devi caricare dei certificati p12 LoTW per abilitare questa area.'; $lang['lotw_date_created'] = 'Data di Creazione'; @@ -29,7 +29,7 @@ $lang['lotw_certificate_dxcc_help_text'] = 'Certificato entità DXCC. Per esempi $lang['lotw_input_a_file'] = 'Carica un File'; -$lang['lotw_upload_exported_adif_file_from_lotw'] = 'Carica il file ADIF Esportato da LoTW dalla area Download Report, per segnare i QSO come confermati su LOTW.'; +$lang['lotw_upload_exported_adif_file_from_lotw'] = 'Carica il file ADIF Esportato da LoTW dalla area Download Report, per segnare i QSO come confermati su LoTW.'; $lang['lotw_upload_type_must_be_adi'] = 'I file di log devono essere di tipo .adi'; $lang['lotw_pull_lotw_data_for_me'] = 'Ottieni dati da LoTW per me'; diff --git a/application/language/polish/lotw_lang.php b/application/language/polish/lotw_lang.php index 319df21d..5e3f638b 100644 --- a/application/language/polish/lotw_lang.php +++ b/application/language/polish/lotw_lang.php @@ -27,12 +27,12 @@ $lang['lotw_certificate_dxcc_help_text'] = 'Podmiot DXCC dla którego wydany zos $lang['lotw_input_a_file'] = 'Prześlij plik'; -$lang['lotw_upload_exported_adif_file_from_lotw'] = 'Wyślij pobrany plik ADIF z LoTW z Linku, aby oznaczyć łączności jako potwierdzone przez LOTW.'; +$lang['lotw_upload_exported_adif_file_from_lotw'] = 'Wyślij pobrany plik ADIF z LoTW z Linku, aby oznaczyć łączności jako potwierdzone przez LoTW.'; $lang['lotw_upload_type_must_be_adi'] = 'Pliki logu muszą mieć rozszerzenie .adi'; -$lang['lotw_pull_lotw_data_for_me'] = 'Pobierz dane z LOTW za mnie'; +$lang['lotw_pull_lotw_data_for_me'] = 'Pobierz dane z LoTW za mnie'; -$lang['lotw_report_download_overview_helptext'] ='Cloudlog będzie używał loginu i hasła podanego w profilu, aby pobierać raporty z LOTW.Raport będzie zawierał wszystkie potwierdzenia od wybranej daty, lub ostatniej potwierdzonej łączności z LOTW (wybranej z logiu), do teraz.'; +$lang['lotw_report_download_overview_helptext'] ='Cloudlog będzie używał loginu i hasła podanego w profilu, aby pobierać raporty z LoTW.Raport będzie zawierał wszystkie potwierdzenia od wybranej daty, lub ostatniej potwierdzonej łączności z LoTW (wybranej z logiu), do teraz.'; // Buttons $lang['lotw_btn_lotw_import'] = 'LoTW Import'; diff --git a/application/language/swedish/lotw_lang.php b/application/language/swedish/lotw_lang.php index b9d94100..9d3ff436 100644 --- a/application/language/swedish/lotw_lang.php +++ b/application/language/swedish/lotw_lang.php @@ -29,7 +29,7 @@ $lang['lotw_certificate_dxcc_help_text'] = 'Certifikat DXCC entity. Som exemple: $lang['lotw_input_a_file'] = 'Ladda upp en fil'; -$lang['lotw_upload_exported_adif_file_from_lotw'] = 'Ladda upp exporterad ADIF fil från LoTW från Download Report area, för att markera QSOs som bekräftade på LOTW.'; +$lang['lotw_upload_exported_adif_file_from_lotw'] = 'Ladda upp exporterad ADIF fil från LoTW från Download Report area, för att markera QSOs som bekräftade på LoTW.'; $lang['lotw_upload_type_must_be_adi'] = 'Loggfil måste vara av format .adi'; $lang['lotw_pull_lotw_data_for_me'] = 'Hämta LoTW data'; diff --git a/application/language/turkish/lotw_lang.php b/application/language/turkish/lotw_lang.php index f7a40279..a3c4752f 100644 --- a/application/language/turkish/lotw_lang.php +++ b/application/language/turkish/lotw_lang.php @@ -29,7 +29,7 @@ $lang['lotw_certificate_dxcc_help_text'] = 'Sertifika DXCC varlığı. Örneğin $lang['lotw_input_a_file'] = 'Bir Dosya Yükle'; -$lang['lotw_upload_exported_adif_file_from_lotw'] = 'LoTW\'den Dışa Aktarılan ADIF dosyasını Raporu İndir<\'den yükleyin /a> Alan, QSO\'ları LOTW\'da onaylandı olarak işaretlemek için.'; +$lang['lotw_upload_exported_adif_file_from_lotw'] = 'LoTW\'den Dışa Aktarılan ADIF dosyasını Raporu İndir<\'den yükleyin /a> Alan, QSO\'ları LoTW\'da onaylandı olarak işaretlemek için.'; $lang['lotw_upload_type_must_be_adi'] = 'Günlük dosyaları .adi dosya tipine sahip olmalıdır'; $lang['lotw_pull_lotw_data_for_me'] = 'Benim için LoTW verilerini çek'; diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 0d6e0c23..cd14052c 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -2994,7 +2994,7 @@ class Logbook_model extends CI_Model { } /* - Validate LOTW Fields + Validate LoTW Fields */ if (isset($record['lotw_qsl_rcvd'])){ $input_lotw_qsl_rcvd = mb_strimwidth($record['lotw_qsl_rcvd'], 0, 1); diff --git a/application/views/qso/edit_ajax.php b/application/views/qso/edit_ajax.php index a7547e7d..f7e7d097 100644 --- a/application/views/qso/edit_ajax.php +++ b/application/views/qso/edit_ajax.php @@ -419,7 +419,7 @@ eQSL
  • - LOTW + LoTW
    • diff --git a/application/views/welcome/index.php b/application/views/welcome/index.php index 6a6bd7b5..cac64152 100644 --- a/application/views/welcome/index.php +++ b/application/views/welcome/index.php @@ -75,7 +75,7 @@ # Upload QSOs to QRZ Logbook (ignore cron job if this integration is not required)
    0 */6 * * * curl --silent /qrz/upload &>/dev/null

    - # Update LOTW Users Database
    + # Update LoTW Users Database
    @weekly curl --silent /lotw/load_users &>/dev/null

    # Update Clublog SCP Database File