goodspeed/Cloudlog
1
0
派生 0
代码 工单 合并请求 项目 版本发布 软件包 百科 动态 Actions

Use LoTW as official abbreviation

浏览代码
这个提交包含在：
phl0 2023-07-27 09:16:55 +02:00
父节点 54b05bf5e8
当前提交 318fc29449
找不到此签名对应的密钥
GPG 密钥 ID: 48EA1E640798CA9A
共有 20 个文件被更改，包括 38 次插入 和 38 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

2
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
*
*/

2
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();

2
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
*
*/

2
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();

2
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');

28
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) {

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

2
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 <a href="https://p1k.arrl.org/lotwuser/qsos?qsoscmd=adif" target="_blank">Download Report</a> 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 <a href="https://p1k.arrl.org/lotwuser/qsos?qsoscmd=adif" target="_blank">Download Report</a> 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';

2
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 <a href="https://p1k.arrl.org/lotwuser/qsos?qsoscmd=adif" target="_blank">Download Report</a> Area, to mark QSOs as confirmed on LOTW.';
$lang['lotw_upload_exported_adif_file_from_lotw'] = 'Nahraj exportovaný soubor z LoTW z <a href="https://p1k.arrl.org/lotwuser/qsos?qsoscmd=adif" target="_blank">Download Report</a> 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';

2
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 <a href="https://p1k.arrl.org/lotwuser/qsos?qsoscmd=adif" target="_blank">Download Report</a> 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 <a href="https://p1k.arrl.org/lotwuser/qsos?qsoscmd=adif" target="_blank">Download Report</a> 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';

4
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';

4
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 <a href="https://p1k.arrl.org/lotwuser/qsos?qsoscmd=adif" target="_blank">Download Report</a>, 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 <a href="https://p1k.arrl.org/lotwuser/qsos?qsoscmd=adif" target="_blank">Download Report</a>, 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';

2
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 από την περιοχή <a href="https://p1k.arrl.org/lotwuser/qsos?qsoscmd=adif" target="_blank">Download Report</a>, για να επισημάνετε τα QSO ως επιβεβαιώθηκε στο LOTW.';
$lang['lotw_upload_exported_adif_file_from_lotw'] = 'Μεταφορτώστε το εξαγόμενο αρχείο ADIF από το LoTW από την περιοχή <a href="https://p1k.arrl.org/lotwuser/qsos?qsoscmd=adif" target="_blank">Download Report</a>, για να επισημάνετε τα QSO ως επιβεβαιώθηκε στο LoTW.';
$lang['lotw_upload_type_must_be_adi'] = 'Τα αρχεία καταγραφής πρέπει να έχουν τον τύπο αρχείου .adi';
$lang['lotw_pull_lotw_data_for_me'] = 'Τραβήξτε δεδομένα LoTW για μένα';

4
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 <a href="https://p1k.arrl.org/lotwuser/qsos?qsoscmd=adif" target="_blank">Download Report</a>, 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 <a href="https://p1k.arrl.org/lotwuser/qsos?qsoscmd=adif" target="_blank">Download Report</a>, 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';

6
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 <a href="https://p1k.arrl.org/lotwuser/qsos?qsoscmd=adif" target="_blank">Linku</a>, aby oznaczyć łączności jako potwierdzone przez LOTW.';
$lang['lotw_upload_exported_adif_file_from_lotw'] = 'Wyślij pobrany plik ADIF z LoTW z <a href="https://p1k.arrl.org/lotwuser/qsos?qsoscmd=adif" target="_blank">Linku</a>, 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';

2
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 <a href="https://p1k.arrl.org/lotwuser/qsos?qsoscmd=adif" target="_blank">Download Report</a> 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 <a href="https://p1k.arrl.org/lotwuser/qsos?qsoscmd=adif" target="_blank">Download Report</a> 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';

2
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ı <a href="https://p1k.arrl.org/lotwuser/qsos?qsoscmd=adif" target="_blank">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ı <a href="https://p1k.arrl.org/lotwuser/qsos?qsoscmd=adif" target="_blank">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';

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

2
application/views/qso/edit_ajax.php
查看文件

@ -419,7 +419,7 @@
<a class="nav-link" id="profile-tab" data-toggle="tab" href="#profile" role="tab" aria-controls="profile" aria-selected="false">eQSL</a>
</li>
<li class="nav-item">
<a class="nav-link" id="contact-tab" data-toggle="tab" href="#contact" role="tab" aria-controls="contact" aria-selected="false">LOTW</a>
<a class="nav-link" id="contact-tab" data-toggle="tab" href="#contact" role="tab" aria-controls="contact" aria-selected="false">LoTW</a>
</li>
</ul>
<div class="tab-content" id="myTabContent">

2
application/views/welcome/index.php
查看文件

@ -75,7 +75,7 @@
# Upload QSOs to QRZ Logbook (ignore cron job if this integration is not required) <br>
0 */6 * * * curl --silent <?php echo site_url();?>/qrz/upload &>/dev/null <br>
<br>
# Update LOTW Users Database <br>
# Update LoTW Users Database <br>
@weekly curl --silent <?php echo site_url();?>/lotw/load_users &>/dev/null <br>
<br>
# Update Clublog SCP Database File <br>