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

Beautify DCL sync output and add some more useful information

浏览代码
这个提交包含在：
phl0 2023-10-18 11:31:15 +02:00
父节点 f026b8518f
当前提交 5de2f2a93b
找不到此签名对应的密钥
GPG 密钥 ID: 48EA1E640798CA9A
共有 18 个文件被更改，包括 248 次插入 和 73 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

16
application/controllers/Adif.php
查看文件

@ -256,7 +256,7 @@ class adif extends CI_Controller {
$this->adif_parser->load_from_file('./uploads/'.$data['upload_data']['file_name']);
$this->adif_parser->initialize();
$error_count = array(0, 0);
$error_count = array(0, 0, 0);
$custom_errors = "";
while($record = $this->adif_parser->get_record())
{
@ -266,11 +266,17 @@ class adif extends CI_Controller {
$dok_result = $this->logbook_model->update_dok($record, $this->input->post('ignoreAmbiguous'), $this->input->post('onlyConfirmed'), $this->input->post('overwriteDok'));
if (!empty($dok_result)) {
if ($dok_result[0] != 0) {
$custom_errors .= $dok_result[1]."<br/>";
$error_count[1]++;
} else {
switch ($dok_result[0]) {
case 0:
$error_count[0]++;
break;
case 1:
$custom_errors .= $dok_result[1];
$error_count[1]++;
break;
case 2:
$custom_errors .= $dok_result[1];
$error_count[2]++;
}
}
};

17
application/language/bulgarian/adif_lang.php
查看文件

@ -123,8 +123,17 @@ ________________________________________________________________________________
$lang['dcl_results'] = "Results of DCL DOK Update";
$lang['dcl_info_updated'] = "DCL information for DOKs has been updated.";
$lang['dcl_qsos_updated'] = "QSOs updated:";
$lang['dcl_qsos_ignored'] = "QSOs ignored:";
$lang['dcl_no_qsos_updated'] = "No QSOs updated.";
$lang['dcl_qsos_updated'] = "QSOs updated";
$lang['dcl_qsos_ignored'] = "QSOs ignored";
$lang['dcl_qsos_unmatched'] = "QSOs unmatched";
$lang['dcl_no_qsos_updated'] = "No QSOs found which could be updated.";
$lang['dcl_dok_errors'] = "DOK Errors";
$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL:";
$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL";
$lang['dcl_qsl_status'] = "DCL QSL Status";
$lang['dcl_qsl_status_c'] = "confirmed by LoTW/Clublog/eQSL/Contest";
$lang['dcl_qsl_status_mno'] = "confirmed by award manager";
$lang['dcl_qsl_status_i'] = "confirmed by cross-check of DCL data";
$lang['dcl_qsl_status_w'] = "confirmation pending";
$lang['dcl_qsl_status_x'] = "unconfirmed";
$lang['dcl_qsl_status_unknown'] = "unknown";
$lang['dcl_no_match'] = "QSO could not be matched";

17
application/language/chinese_simplified/adif_lang.php
查看文件

@ -123,8 +123,17 @@ ________________________________________________________________________________
$lang['dcl_results'] = "Results of DCL DOK Update";
$lang['dcl_info_updated'] = "DCL information for DOKs has been updated.";
$lang['dcl_qsos_updated'] = "QSOs updated:";
$lang['dcl_qsos_ignored'] = "QSOs ignored:";
$lang['dcl_no_qsos_updated'] = "No QSOs updated.";
$lang['dcl_qsos_updated'] = "QSOs updated";
$lang['dcl_qsos_ignored'] = "QSOs ignored";
$lang['dcl_qsos_unmatched'] = "QSOs unmatched";
$lang['dcl_no_qsos_updated'] = "No QSOs found which could be updated.";
$lang['dcl_dok_errors'] = "DOK Errors";
$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL:";
$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL";
$lang['dcl_qsl_status'] = "DCL QSL Status";
$lang['dcl_qsl_status_c'] = "confirmed by LoTW/Clublog/eQSL/Contest";
$lang['dcl_qsl_status_mno'] = "confirmed by award manager";
$lang['dcl_qsl_status_i'] = "confirmed by cross-check of DCL data";
$lang['dcl_qsl_status_w'] = "confirmation pending";
$lang['dcl_qsl_status_x'] = "unconfirmed";
$lang['dcl_qsl_status_unknown'] = "unknown";
$lang['dcl_no_match'] = "QSO could not be matched";

17
application/language/czech/adif_lang.php
查看文件

@ -123,8 +123,17 @@ ________________________________________________________________________________
$lang['dcl_results'] = "Results of DCL DOK Update";
$lang['dcl_info_updated'] = "DCL information for DOKs has been updated.";
$lang['dcl_qsos_updated'] = "QSOs updated:";
$lang['dcl_qsos_ignored'] = "QSOs ignored:";
$lang['dcl_no_qsos_updated'] = "No QSOs updated.";
$lang['dcl_qsos_updated'] = "QSOs updated";
$lang['dcl_qsos_ignored'] = "QSOs ignored";
$lang['dcl_qsos_unmatched'] = "QSOs unmatched";
$lang['dcl_no_qsos_updated'] = "No QSOs found which could be updated.";
$lang['dcl_dok_errors'] = "DOK Errors";
$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL:";
$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL";
$lang['dcl_qsl_status'] = "DCL QSL Status";
$lang['dcl_qsl_status_c'] = "confirmed by LoTW/Clublog/eQSL/Contest";
$lang['dcl_qsl_status_mno'] = "confirmed by award manager";
$lang['dcl_qsl_status_i'] = "confirmed by cross-check of DCL data";
$lang['dcl_qsl_status_w'] = "confirmation pending";
$lang['dcl_qsl_status_x'] = "unconfirmed";
$lang['dcl_qsl_status_unknown'] = "unknown";
$lang['dcl_no_match'] = "QSO could not be matched";

17
application/language/dutch/adif_lang.php
查看文件

@ -123,8 +123,17 @@ ________________________________________________________________________________
$lang['dcl_results'] = "Results of DCL DOK Update";
$lang['dcl_info_updated'] = "DCL information for DOKs has been updated.";
$lang['dcl_qsos_updated'] = "QSOs updated:";
$lang['dcl_qsos_ignored'] = "QSOs ignored:";
$lang['dcl_no_qsos_updated'] = "No QSOs updated.";
$lang['dcl_qsos_updated'] = "QSOs updated";
$lang['dcl_qsos_ignored'] = "QSOs ignored";
$lang['dcl_qsos_unmatched'] = "QSOs unmatched";
$lang['dcl_no_qsos_updated'] = "No QSOs found which could be updated.";
$lang['dcl_dok_errors'] = "DOK Errors";
$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL:";
$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL";
$lang['dcl_qsl_status'] = "DCL QSL Status";
$lang['dcl_qsl_status_c'] = "confirmed by LoTW/Clublog/eQSL/Contest";
$lang['dcl_qsl_status_mno'] = "confirmed by award manager";
$lang['dcl_qsl_status_i'] = "confirmed by cross-check of DCL data";
$lang['dcl_qsl_status_w'] = "confirmation pending";
$lang['dcl_qsl_status_x'] = "unconfirmed";
$lang['dcl_qsl_status_unknown'] = "unknown";
$lang['dcl_no_match'] = "QSO could not be matched";

17
application/language/english/adif_lang.php
查看文件

@ -123,8 +123,17 @@ ________________________________________________________________________________
$lang['dcl_results'] = "Results of DCL DOK Update";
$lang['dcl_info_updated'] = "DCL information for DOKs has been updated.";
$lang['dcl_qsos_updated'] = "QSOs updated:";
$lang['dcl_qsos_ignored'] = "QSOs ignored:";
$lang['dcl_no_qsos_updated'] = "No QSOs updated.";
$lang['dcl_qsos_updated'] = "QSOs updated";
$lang['dcl_qsos_ignored'] = "QSOs ignored";
$lang['dcl_qsos_unmatched'] = "QSOs unmatched";
$lang['dcl_no_qsos_updated'] = "No QSOs found which could be updated.";
$lang['dcl_dok_errors'] = "DOK Errors";
$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL:";
$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL";
$lang['dcl_qsl_status'] = "DCL QSL Status";
$lang['dcl_qsl_status_c'] = "confirmed by LoTW/Clublog/eQSL/Contest";
$lang['dcl_qsl_status_mno'] = "confirmed by award manager";
$lang['dcl_qsl_status_i'] = "confirmed by cross-check of DCL data";
$lang['dcl_qsl_status_w'] = "confirmation pending";
$lang['dcl_qsl_status_x'] = "unconfirmed";
$lang['dcl_qsl_status_unknown'] = "unknown";
$lang['dcl_no_match'] = "QSO could not be matched";

16
application/language/finnish/adif_lang.php
查看文件

@ -123,8 +123,16 @@ ________________________________________________________________________________
$lang['dcl_results'] = "Results of DCL DOK Update";
$lang['dcl_info_updated'] = "DCL information for DOKs has been updated.";
$lang['dcl_qsos_updated'] = "QSOs updated:";
$lang['dcl_qsos_ignored'] = "QSOs ignored:";
$lang['dcl_no_qsos_updated'] = "No QSOs updated.";
$lang['dcl_qsos_updated'] = "QSOs updated";
$lang['dcl_qsos_ignored'] = "QSOs ignored";
$lang['dcl_no_qsos_updated'] = "No QSOs found which could be updated.";
$lang['dcl_dok_errors'] = "DOK Errors";
$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL:";
$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL";
$lang['dcl_qsl_status'] = "DCL QSL Status";
$lang['dcl_qsl_status_c'] = "confirmed by LoTW/Clublog/eQSL/Contest";
$lang['dcl_qsl_status_mno'] = "confirmed by award manager";
$lang['dcl_qsl_status_i'] = "confirmed by cross-check of DCL data";
$lang['dcl_qsl_status_w'] = "confirmation pending";
$lang['dcl_qsl_status_x'] = "unconfirmed";
$lang['dcl_qsl_status_unknown'] = "unknown";
$lang['dcl_no_qsos_updated'] = "No QSOs found which could be updated.";

17
application/language/french/adif_lang.php
查看文件

@ -123,8 +123,17 @@ ________________________________________________________________________________
$lang['dcl_results'] = "Results of DCL DOK Update";
$lang['dcl_info_updated'] = "DCL information for DOKs has been updated.";
$lang['dcl_qsos_updated'] = "QSOs updated:";
$lang['dcl_qsos_ignored'] = "QSOs ignored:";
$lang['dcl_no_qsos_updated'] = "No QSOs updated.";
$lang['dcl_qsos_updated'] = "QSOs updated";
$lang['dcl_qsos_ignored'] = "QSOs ignored";
$lang['dcl_qsos_unmatched'] = "QSOs unmatched";
$lang['dcl_no_qsos_updated'] = "No QSOs found which could be updated.";
$lang['dcl_dok_errors'] = "DOK Errors";
$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL:";
$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL";
$lang['dcl_qsl_status'] = "DCL QSL Status";
$lang['dcl_qsl_status_c'] = "confirmed by LoTW/Clublog/eQSL/Contest";
$lang['dcl_qsl_status_mno'] = "confirmed by award manager";
$lang['dcl_qsl_status_i'] = "confirmed by cross-check of DCL data";
$lang['dcl_qsl_status_w'] = "confirmation pending";
$lang['dcl_qsl_status_x'] = "unconfirmed";
$lang['dcl_qsl_status_unknown'] = "unknown";
$lang['dcl_no_match'] = "QSO could not be matched";

17
application/language/german/adif_lang.php
查看文件

@ -123,8 +123,17 @@ ________________________________________________________________________________
$lang['dcl_results'] = "Ergebnisse des DCL DOK Updates";
$lang['dcl_info_updated'] = "QSOs wurden mit der DOK Information aus dem DCL aktualisiert.";
$lang['dcl_qsos_updated'] = "Aktualisierte QSOs:";
$lang['dcl_qsos_ignored'] = "Ignorierte QSOs:";
$lang['dcl_no_qsos_updated'] = "Keine QSOs aktualisiert.";
$lang['dcl_qsos_updated'] = "Aktualisierte QSOs";
$lang['dcl_qsos_ignored'] = "Ignorierte QSOs";
$lang['dcl_qsos_unmatched'] = "Nicht gefundene QSOs";
$lang['dcl_no_qsos_updated'] = "Keine QSOs gefunden, die aktualisiert werden konnten.";
$lang['dcl_dok_errors'] = "DOK Fehler";
$lang['dcl_dok_errors_details'] = "Die DOK Informationen im Logbuch weichen von denen im DCL ab:";
$lang['dcl_dok_errors_details'] = "Die DOK Informationen im Logbuch weichen von denen im DCL ab";
$lang['dcl_qsl_status'] = "DCL QSL Status";
$lang['dcl_qsl_status_c'] = "bestätigt durch LoTW/Clublog/eQSL/Contest";
$lang['dcl_qsl_status_mno'] = "bestätigt durch Diplommananger";
$lang['dcl_qsl_status_i'] = "bestätigt durch Cross-Check von DCL-Daten";
$lang['dcl_qsl_status_w'] = "Bestätigung ausstehend";
$lang['dcl_qsl_status_x'] = "nicht bestätigt";
$lang['dcl_qsl_status_unknown'] = "unbekannt";
$lang['dcl_no_match'] = "QSO konnte nicht gefunden werden";

17
application/language/greek/adif_lang.php
查看文件

@ -123,8 +123,17 @@ ________________________________________________________________________________
$lang['dcl_results'] = "Results of DCL DOK Update";
$lang['dcl_info_updated'] = "DCL information for DOKs has been updated.";
$lang['dcl_qsos_updated'] = "QSOs updated:";
$lang['dcl_qsos_ignored'] = "QSOs ignored:";
$lang['dcl_no_qsos_updated'] = "No QSOs updated.";
$lang['dcl_qsos_updated'] = "QSOs updated";
$lang['dcl_qsos_ignored'] = "QSOs ignored";
$lang['dcl_qsos_unmatched'] = "QSOs unmatched";
$lang['dcl_no_qsos_updated'] = "No QSOs found which could be updated.";
$lang['dcl_dok_errors'] = "DOK Errors";
$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL:";
$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL";
$lang['dcl_qsl_status'] = "DCL QSL Status";
$lang['dcl_qsl_status_c'] = "confirmed by LoTW/Clublog/eQSL/Contest";
$lang['dcl_qsl_status_mno'] = "confirmed by award manager";
$lang['dcl_qsl_status_i'] = "confirmed by cross-check of DCL data";
$lang['dcl_qsl_status_w'] = "confirmation pending";
$lang['dcl_qsl_status_x'] = "unconfirmed";
$lang['dcl_qsl_status_unknown'] = "unknown";
$lang['dcl_no_match'] = "QSO could not be matched";

17
application/language/italian/adif_lang.php
查看文件

@ -123,8 +123,17 @@ ________________________________________________________________________________
$lang['dcl_results'] = "Results of DCL DOK Update";
$lang['dcl_info_updated'] = "DCL information for DOKs has been updated.";
$lang['dcl_qsos_updated'] = "QSOs updated:";
$lang['dcl_qsos_ignored'] = "QSOs ignored:";
$lang['dcl_no_qsos_updated'] = "No QSOs updated.";
$lang['dcl_qsos_updated'] = "QSOs updated";
$lang['dcl_qsos_ignored'] = "QSOs ignored";
$lang['dcl_qsos_unmatched'] = "QSOs unmatched";
$lang['dcl_no_qsos_updated'] = "No QSOs found which could be updated.";
$lang['dcl_dok_errors'] = "DOK Errors";
$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL:";
$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL";
$lang['dcl_qsl_status'] = "DCL QSL Status";
$lang['dcl_qsl_status_c'] = "confirmed by LoTW/Clublog/eQSL/Contest";
$lang['dcl_qsl_status_mno'] = "confirmed by award manager";
$lang['dcl_qsl_status_i'] = "confirmed by cross-check of DCL data";
$lang['dcl_qsl_status_w'] = "confirmation pending";
$lang['dcl_qsl_status_x'] = "unconfirmed";
$lang['dcl_qsl_status_unknown'] = "unknown";
$lang['dcl_no_match'] = "QSO could not be matched";

17
application/language/polish/adif_lang.php
查看文件

@ -123,8 +123,17 @@ ________________________________________________________________________________
$lang['dcl_results'] = "Results of DCL DOK Update";
$lang['dcl_info_updated'] = "DCL information for DOKs has been updated.";
$lang['dcl_qsos_updated'] = "QSOs updated:";
$lang['dcl_qsos_ignored'] = "QSOs ignored:";
$lang['dcl_no_qsos_updated'] = "No QSOs updated.";
$lang['dcl_qsos_updated'] = "QSOs updated";
$lang['dcl_qsos_ignored'] = "QSOs ignored";
$lang['dcl_qsos_unmatched'] = "QSOs unmatched";
$lang['dcl_no_qsos_updated'] = "No QSOs found which could be updated.";
$lang['dcl_dok_errors'] = "DOK Errors";
$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL:";
$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL";
$lang['dcl_qsl_status'] = "DCL QSL Status";
$lang['dcl_qsl_status_c'] = "confirmed by LoTW/Clublog/eQSL/Contest";
$lang['dcl_qsl_status_mno'] = "confirmed by award manager";
$lang['dcl_qsl_status_i'] = "confirmed by cross-check of DCL data";
$lang['dcl_qsl_status_w'] = "confirmation pending";
$lang['dcl_qsl_status_x'] = "unconfirmed";
$lang['dcl_qsl_status_unknown'] = "unknown";
$lang['dcl_no_match'] = "QSO could not be matched";

17
application/language/russian/adif_lang.php
查看文件

@ -123,8 +123,17 @@ ________________________________________________________________________________
$lang['dcl_results'] = "Results of DCL DOK Update";
$lang['dcl_info_updated'] = "DCL information for DOKs has been updated.";
$lang['dcl_qsos_updated'] = "QSOs updated:";
$lang['dcl_qsos_ignored'] = "QSOs ignored:";
$lang['dcl_no_qsos_updated'] = "No QSOs updated.";
$lang['dcl_qsos_updated'] = "QSOs updated";
$lang['dcl_qsos_ignored'] = "QSOs ignored";
$lang['dcl_qsos_unmatched'] = "QSOs unmatched";
$lang['dcl_no_qsos_updated'] = "No QSOs found which could be updated.";
$lang['dcl_dok_errors'] = "DOK Errors";
$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL:";
$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL";
$lang['dcl_qsl_status'] = "DCL QSL Status";
$lang['dcl_qsl_status_c'] = "confirmed by LoTW/Clublog/eQSL/Contest";
$lang['dcl_qsl_status_mno'] = "confirmed by award manager";
$lang['dcl_qsl_status_i'] = "confirmed by cross-check of DCL data";
$lang['dcl_qsl_status_w'] = "confirmation pending";
$lang['dcl_qsl_status_x'] = "unconfirmed";
$lang['dcl_qsl_status_unknown'] = "unknown";
$lang['dcl_no_match'] = "QSO could not be matched";

17
application/language/spanish/adif_lang.php
查看文件

@ -123,8 +123,17 @@ ________________________________________________________________________________
$lang['dcl_results'] = "Results of DCL DOK Update";
$lang['dcl_info_updated'] = "DCL information for DOKs has been updated.";
$lang['dcl_qsos_updated'] = "QSOs updated:";
$lang['dcl_qsos_ignored'] = "QSOs ignored:";
$lang['dcl_no_qsos_updated'] = "No QSOs updated.";
$lang['dcl_qsos_updated'] = "QSOs updated";
$lang['dcl_qsos_ignored'] = "QSOs ignored";
$lang['dcl_qsos_unmatched'] = "QSOs unmatched";
$lang['dcl_no_qsos_updated'] = "No QSOs found which could be updated.";
$lang['dcl_dok_errors'] = "DOK Errors";
$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL:";
$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL";
$lang['dcl_qsl_status'] = "DCL QSL Status";
$lang['dcl_qsl_status_c'] = "confirmed by LoTW/Clublog/eQSL/Contest";
$lang['dcl_qsl_status_mno'] = "confirmed by award manager";
$lang['dcl_qsl_status_i'] = "confirmed by cross-check of DCL data";
$lang['dcl_qsl_status_w'] = "confirmation pending";
$lang['dcl_qsl_status_x'] = "unconfirmed";
$lang['dcl_qsl_status_unknown'] = "unknown";
$lang['dcl_no_match'] = "QSO could not be matched";

17
application/language/swedish/adif_lang.php
查看文件

@ -123,8 +123,17 @@ ________________________________________________________________________________
$lang['dcl_results'] = "Results of DCL DOK Update";
$lang['dcl_info_updated'] = "DCL information for DOKs has been updated.";
$lang['dcl_qsos_updated'] = "QSOs updated:";
$lang['dcl_qsos_ignored'] = "QSOs ignored:";
$lang['dcl_no_qsos_updated'] = "No QSOs updated.";
$lang['dcl_qsos_updated'] = "QSOs updated";
$lang['dcl_qsos_ignored'] = "QSOs ignored";
$lang['dcl_qsos_unmatched'] = "QSOs unmatched";
$lang['dcl_no_qsos_updated'] = "No QSOs found which could be updated.";
$lang['dcl_dok_errors'] = "DOK Errors";
$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL:";
$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL";
$lang['dcl_qsl_status'] = "DCL QSL Status";
$lang['dcl_qsl_status_c'] = "confirmed by LoTW/Clublog/eQSL/Contest";
$lang['dcl_qsl_status_mno'] = "confirmed by award manager";
$lang['dcl_qsl_status_i'] = "confirmed by cross-check of DCL data";
$lang['dcl_qsl_status_w'] = "confirmation pending";
$lang['dcl_qsl_status_x'] = "unconfirmed";
$lang['dcl_qsl_status_unknown'] = "unknown";
$lang['dcl_no_match'] = "QSO could not be matched";

17
application/language/turkish/adif_lang.php
查看文件

@ -123,8 +123,17 @@ ________________________________________________________________________________
$lang['dcl_results'] = "Results of DCL DOK Update";
$lang['dcl_info_updated'] = "DCL information for DOKs has been updated.";
$lang['dcl_qsos_updated'] = "QSOs updated:";
$lang['dcl_qsos_ignored'] = "QSOs ignored:";
$lang['dcl_no_qsos_updated'] = "No QSOs updated.";
$lang['dcl_qsos_updated'] = "QSOs updated";
$lang['dcl_qsos_ignored'] = "QSOs ignored";
$lang['dcl_qsos_unmatched'] = "QSOs unmatched";
$lang['dcl_no_qsos_updated'] = "No QSOs found which could be updated.";
$lang['dcl_dok_errors'] = "DOK Errors";
$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL:";
$lang['dcl_dok_errors_details'] = "There is different data for DOK in your log compared to DCL";
$lang['dcl_qsl_status'] = "DCL QSL Status";
$lang['dcl_qsl_status_c'] = "confirmed by LoTW/Clublog/eQSL/Contest";
$lang['dcl_qsl_status_mno'] = "confirmed by award manager";
$lang['dcl_qsl_status_i'] = "confirmed by cross-check of DCL data";
$lang['dcl_qsl_status_w'] = "confirmation pending";
$lang['dcl_qsl_status_x'] = "unconfirmed";
$lang['dcl_qsl_status_unknown'] = "unknown";
$lang['dcl_no_match'] = "QSO could not be matched";

31
application/models/Logbook_model.php
查看文件

@ -3477,6 +3477,7 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray =
function update_dok($record, $ignoreAmbiguous, $onlyConfirmed, $overwriteDok) {
$CI =& get_instance();
$CI->load->model('logbooks_model');
$custom_date_format = $this->session->userdata('user_date_format');
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
if(isset($record['call'])) {
@ -3523,9 +3524,31 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray =
if ($ignoreAmbiguous == '1') {
return array();
} else {
return array(2, $result['message'] = $time_on." ".$call." ".$band." ".$mode." QSO could not be matched.");
return array(2, $result['message'] = "<tr><td>".date($custom_date_format, strtotime($record['qso_date']))."</td><td>".date('H:i', strtotime($record['time_on']))."</td><td>".str_replace('0', 'Ø', $call)."</td><td>".$band."</td><td>".$mode."</td><td></td><td>".(preg_match('/^[A-Y]\d{2}$/', $darc_dok) ? '<a href="https://www.darc.de/'.$darc_dok.'" target="_blank">'.$darc_dok.'</a>' : (preg_match('/^Z\d{2}$/', $darc_dok) ? '<a href="https://'.$darc_dok.'.vfdb.org" target="_blank">'.$darc_dok.'</a>' : $darc_dok))."</td><td>".lang('dcl_no_match')."</td></tr>");
}
} else {
$dcl_qsl_status = '';
switch($record['app_dcl_status']) {
case 'c':
$dcl_qsl_status = lang('dcl_qsl_status_c');
break;
case 'm':
case 'n':
case 'o':
$dcl_qsl_status = lang('dcl_qsl_status_mno');
break;
case 'i':
$dcl_qsl_status = lang('dcl_qsl_status_i');
break;
case 'w':
$dcl_qsl_status = lang('dcl_qsl_status_w');
break;
case 'x':
$dcl_qsl_status = lang('dcl_qsl_status_x');
break;
default:
$dcl_qsl_status = lang('dcl_qsl_status_unknown');
}
if ($check->row()->COL_DARC_DOK != $darc_dok) {
$dcl_cnfm = array('c', 'm', 'n', 'o', 'i');
// Ref https://confluence.darc.de/pages/viewpage.action?pageId=21037270
@ -3535,18 +3558,18 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray =
$this->set_dok($check->row()->COL_PRIMARY_KEY, $darc_dok);
return array(0, '');
} else {
return array(1, $result['message'] = $time_on." ".$call." ".$band." ".$mode.": Log -> ".($check->row()->COL_DARC_DOK == '' ? 'n/a' : $check->row()->COL_DARC_DOK)." DCL -> ".$darc_dok.". DCL QSL Status: ".$record['app_dcl_status'].".");
return array(1, $result['message'] = "<tr><td>".date($custom_date_format, strtotime($record['qso_date']))."</td><td>".date('H:i', strtotime($record['time_on']))."</td><td><a id=\"edit_qso\" href=\"javascript:displayQso(".$check->row()->COL_PRIMARY_KEY.")\">".str_replace('0', 'Ø', $call)."</a></td><td>".$band."</td><td>".$mode."</td><td>".($check->row()->COL_DARC_DOK == '' ? 'n/a' : (preg_match('/^[A-Y]\d{2}$/', $check->row()->COL_DARC_DOK) ? '<a href="https://www.darc.de/'.$check->row()->COL_DARC_DOK.'" target="_blank">'.$check->row()->COL_DARC_DOK.'</a>' : (preg_match('/^Z\d{2}$/', $check->row()->COL_DARC_DOK) ? '<a href="https://'.$check->row()->COL_DARC_DOK.'.vfdb.org" target="_blank">'.$check->row()->COL_DARC_DOK.'</a>' : $check->row()->COL_DARC_DOK)))."</td><td>".(preg_match('/^[A-Y]\d{2}$/', $darc_dok) ? '<a href="https://www.darc.de/'.$darc_dok.'" target="_blank">'.$darc_dok.'</a>' : (preg_match('/^Z\d{2}$/', $darc_dok) ? '<a href="https://'.$darc_dok.'.vfdb.org" target="_blank">'.$darc_dok.'</a>' : $darc_dok))."</td><td>".$dcl_qsl_status."</td></tr>");
}
} else {
return array(1, $result['message'] = $time_on." ".$call." ".$band." ".$mode.": Log -> ".($check->row()->COL_DARC_DOK == '' ? 'n/a' : $check->row()->COL_DARC_DOK)." DCL -> ".$darc_dok.". DCL QSL Status: ".$record['app_dcl_status'].".");
return array(1, $result['message'] = "<tr><td>".date($custom_date_format, strtotime($record['qso_date']))."</td><td>".date('H:i', strtotime($record['time_on']))."</td><td><a id=\"edit_qso\" href=\"javascript:displayQso(".$check->row()->COL_PRIMARY_KEY.")\">".str_replace('0', 'Ø', $call)."</a></td><td>".$band."</td><td>".$mode."</td><td>".($check->row()->COL_DARC_DOK == '' ? 'n/a' : (preg_match('/^[A-Y]\d{2}$/', $check->row()->COL_DARC_DOK) ? '<a href="https://www.darc.de/'.$check->row()->COL_DARC_DOK.'" target="_blank">'.$check->row()->COL_DARC_DOK.'</a>' : (preg_match('/^Z\d{2}$/', $check->row()->COL_DARC_DOK) ? '<a href="https://'.$check->row()->COL_DARC_DOK.'.vfdb.org" target="_blank">'.$check->row()->COL_DARC_DOK.'</a>' : $check->row()->COL_DARC_DOK)))."</td><td>".(preg_match('/^[A-Y]\d{2}$/', $darc_dok) ? '<a href="https://www.darc.de/'.$darc_dok.'" target="_blank">'.$darc_dok.'</a>' : (preg_match('/^Z\d{2}$/', $darc_dok) ? '<a href="https://'.$darc_dok.'.vfdb.org" target="_blank">'.$darc_dok.'</a>' : $darc_dok))."</td><td>".$dcl_qsl_status."</td></tr>");
}
} else {
if ($check->row()->COL_DARC_DOK == '' || $overwriteDok == '1') {
$this->set_dok($check->row()->COL_PRIMARY_KEY, $darc_dok);
return array(0, '');
} else {
return array(1, $result['message'] = $time_on." ".$call." ".$band." ".$mode.": Log -> ".($check->row()->COL_DARC_DOK == '' ? 'n/a' : $check->row()->COL_DARC_DOK)." DCL -> ".$darc_dok.". DCL QSL Status: ".$record['app_dcl_status'].".");
return array(1, $result['message'] = "<tr><td>".date($custom_date_format, strtotime($record['qso_date']))."</td><td>".date('H:i', strtotime($record['time_on']))."</td><td><a id=\"edit_qso\" href=\"javascript:displayQso(".$check->row()->COL_PRIMARY_KEY.")\">".str_replace('0', 'Ø', $call)."</a></td><td>".$band."</td><td>".$mode."</td><td>".($check->row()->COL_DARC_DOK == '' ? 'n/a' : (preg_match('/^[A-Y]\d{2}$/', $check->row()->COL_DARC_DOK) ? '<a href="https://www.darc.de/'.$check->row()->COL_DARC_DOK.'" target="_blank">'.$check->row()->COL_DARC_DOK.'</a>' : (preg_match('/^Z\d{2}$/', $check->row()->COL_DARC_DOK) ? '<a href="https://'.$check->row()->COL_DARC_DOK.'.vfdb.org" target="_blank">'.$check->row()->COL_DARC_DOK.'</a>' : $check->row()->COL_DARC_DOK)))."</td><td>".(preg_match('/^[A-Y]\d{2}$/', $darc_dok) ? '<a href="https://www.darc.de/'.$darc_dok.'" target="_blank">'.$darc_dok.'</a>' : (preg_match('/^Z\d{2}$/', $darc_dok) ? '<a href="https://'.$darc_dok.'.vfdb.org" target="_blank">'.$darc_dok.'</a>' : $darc_dok))."</td><td>".$dcl_qsl_status."</td></tr>");
}
}
}

20
application/views/adif/dcl_success.php
查看文件

@ -15,16 +15,28 @@
<?php if($dcl_error_count[0] > 0) { ?>
<h3 class="card-title">Yay, its updated!</h3>
<p class="card-text"><?php echo lang('dcl_info_updated')?></p>
<p class="card-text"><?php echo lang('dcl_qsos_updated')?> <?php echo $dcl_error_count[0] ?>.</p>
<p class="card-text"><?php echo lang('dcl_qsos_ignored')?> <?php echo $dcl_error_count[1] ?>.</p>
<?php } else { ?>
<h3 class="card-title"><?php echo lang('dcl_no_qsos_updated')?></h3>
<p>
<?php } ?>
<div class="alert alert-info" role="alert">
<?php echo lang('dcl_qsos_updated')?>: <?php echo $dcl_error_count[0] ?> / <?php echo lang('dcl_qsos_ignored')?>: <?php echo $dcl_error_count[1] ?> / <?php echo lang('dcl_qsos_unmatched')?>: <?php echo $dcl_error_count[2] ?>
</div>
<?php if($dcl_errors) { ?>
<h3><?php echo lang('dcl_dok_errors')?></h3>
<p><?php echo lang('dcl_dok_errors_details')?></p>
<p class="card-text"><?php echo $dcl_errors; ?></p>
<table width="100%">
<tr class="titles">
<td>Date</td>
<td>Time</td>
<td>Call</td>
<td>Band</td>
<td>Mode</td>
<td>DOK in Log</td>
<td>DOK in DCL</td>
<td>DCL QSL Status</td>
</tr>
<?php echo $dcl_errors; ?>
</table>
<?php } ?>
</div>
</div>