diff --git a/application/controllers/Adif.php b/application/controllers/Adif.php index 99c624f3..5992bfdb 100644 --- a/application/controllers/Adif.php +++ b/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]."
"; - $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]++; } } }; diff --git a/application/language/bulgarian/adif_lang.php b/application/language/bulgarian/adif_lang.php index d8ddb51a..45e5196a 100644 --- a/application/language/bulgarian/adif_lang.php +++ b/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"; diff --git a/application/language/chinese_simplified/adif_lang.php b/application/language/chinese_simplified/adif_lang.php index d8ddb51a..45e5196a 100644 --- a/application/language/chinese_simplified/adif_lang.php +++ b/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"; diff --git a/application/language/czech/adif_lang.php b/application/language/czech/adif_lang.php index d8ddb51a..45e5196a 100644 --- a/application/language/czech/adif_lang.php +++ b/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"; diff --git a/application/language/dutch/adif_lang.php b/application/language/dutch/adif_lang.php index d8ddb51a..45e5196a 100644 --- a/application/language/dutch/adif_lang.php +++ b/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"; diff --git a/application/language/english/adif_lang.php b/application/language/english/adif_lang.php index 2cf537b8..e47d5b28 100644 --- a/application/language/english/adif_lang.php +++ b/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"; diff --git a/application/language/finnish/adif_lang.php b/application/language/finnish/adif_lang.php index d8ddb51a..6893cada 100644 --- a/application/language/finnish/adif_lang.php +++ b/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."; diff --git a/application/language/french/adif_lang.php b/application/language/french/adif_lang.php index d8ddb51a..45e5196a 100644 --- a/application/language/french/adif_lang.php +++ b/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"; diff --git a/application/language/german/adif_lang.php b/application/language/german/adif_lang.php index c40cdfa9..c1517454 100644 --- a/application/language/german/adif_lang.php +++ b/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"; diff --git a/application/language/greek/adif_lang.php b/application/language/greek/adif_lang.php index d8ddb51a..45e5196a 100644 --- a/application/language/greek/adif_lang.php +++ b/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"; diff --git a/application/language/italian/adif_lang.php b/application/language/italian/adif_lang.php index d8ddb51a..45e5196a 100644 --- a/application/language/italian/adif_lang.php +++ b/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"; diff --git a/application/language/polish/adif_lang.php b/application/language/polish/adif_lang.php index d8ddb51a..45e5196a 100644 --- a/application/language/polish/adif_lang.php +++ b/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"; diff --git a/application/language/russian/adif_lang.php b/application/language/russian/adif_lang.php index d8ddb51a..45e5196a 100644 --- a/application/language/russian/adif_lang.php +++ b/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"; diff --git a/application/language/spanish/adif_lang.php b/application/language/spanish/adif_lang.php index d8ddb51a..45e5196a 100644 --- a/application/language/spanish/adif_lang.php +++ b/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"; diff --git a/application/language/swedish/adif_lang.php b/application/language/swedish/adif_lang.php index d8ddb51a..45e5196a 100644 --- a/application/language/swedish/adif_lang.php +++ b/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"; diff --git a/application/language/turkish/adif_lang.php b/application/language/turkish/adif_lang.php index d8ddb51a..45e5196a 100644 --- a/application/language/turkish/adif_lang.php +++ b/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"; diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index ae3226eb..cff40679 100755 --- a/application/models/Logbook_model.php +++ b/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'] = "".date($custom_date_format, strtotime($record['qso_date']))."".date('H:i', strtotime($record['time_on']))."".str_replace('0', 'Ø', $call)."".$band."".$mode."".(preg_match('/^[A-Y]\d{2}$/', $darc_dok) ? ''.$darc_dok.'' : (preg_match('/^Z\d{2}$/', $darc_dok) ? ''.$darc_dok.'' : $darc_dok))."".lang('dcl_no_match').""); } } 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'] = "".date($custom_date_format, strtotime($record['qso_date']))."".date('H:i', strtotime($record['time_on']))."row()->COL_PRIMARY_KEY.")\">".str_replace('0', 'Ø', $call)."".$band."".$mode."".($check->row()->COL_DARC_DOK == '' ? 'n/a' : (preg_match('/^[A-Y]\d{2}$/', $check->row()->COL_DARC_DOK) ? ''.$check->row()->COL_DARC_DOK.'' : (preg_match('/^Z\d{2}$/', $check->row()->COL_DARC_DOK) ? ''.$check->row()->COL_DARC_DOK.'' : $check->row()->COL_DARC_DOK)))."".(preg_match('/^[A-Y]\d{2}$/', $darc_dok) ? ''.$darc_dok.'' : (preg_match('/^Z\d{2}$/', $darc_dok) ? ''.$darc_dok.'' : $darc_dok))."".$dcl_qsl_status.""); } } 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'] = "".date($custom_date_format, strtotime($record['qso_date']))."".date('H:i', strtotime($record['time_on']))."row()->COL_PRIMARY_KEY.")\">".str_replace('0', 'Ø', $call)."".$band."".$mode."".($check->row()->COL_DARC_DOK == '' ? 'n/a' : (preg_match('/^[A-Y]\d{2}$/', $check->row()->COL_DARC_DOK) ? ''.$check->row()->COL_DARC_DOK.'' : (preg_match('/^Z\d{2}$/', $check->row()->COL_DARC_DOK) ? ''.$check->row()->COL_DARC_DOK.'' : $check->row()->COL_DARC_DOK)))."".(preg_match('/^[A-Y]\d{2}$/', $darc_dok) ? ''.$darc_dok.'' : (preg_match('/^Z\d{2}$/', $darc_dok) ? ''.$darc_dok.'' : $darc_dok))."".$dcl_qsl_status.""); } } 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'] = "".date($custom_date_format, strtotime($record['qso_date']))."".date('H:i', strtotime($record['time_on']))."row()->COL_PRIMARY_KEY.")\">".str_replace('0', 'Ø', $call)."".$band."".$mode."".($check->row()->COL_DARC_DOK == '' ? 'n/a' : (preg_match('/^[A-Y]\d{2}$/', $check->row()->COL_DARC_DOK) ? ''.$check->row()->COL_DARC_DOK.'' : (preg_match('/^Z\d{2}$/', $check->row()->COL_DARC_DOK) ? ''.$check->row()->COL_DARC_DOK.'' : $check->row()->COL_DARC_DOK)))."".(preg_match('/^[A-Y]\d{2}$/', $darc_dok) ? ''.$darc_dok.'' : (preg_match('/^Z\d{2}$/', $darc_dok) ? ''.$darc_dok.'' : $darc_dok))."".$dcl_qsl_status.""); } } } diff --git a/application/views/adif/dcl_success.php b/application/views/adif/dcl_success.php index 090acd72..0af525c4 100644 --- a/application/views/adif/dcl_success.php +++ b/application/views/adif/dcl_success.php @@ -15,16 +15,28 @@ 0) { ?>

Yay, its updated!

-

.

-

.

-

+

-

+ + + + + + + + + + + + +
DateTimeCallBandModeDOK in LogDOK in DCLDCL QSL Status