From 278301576146e578789e70871ed155567b00a892 Mon Sep 17 00:00:00 2001 From: int2001 Date: Sat, 14 Sep 2024 09:27:37 +0000 Subject: [PATCH 1/4] Fix some minor eQSL-Issues where values aren't set --- application/controllers/Eqsl.php | 2 +- application/libraries/EqslImporter.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/controllers/Eqsl.php b/application/controllers/Eqsl.php index 98eae0ac3..e8d7a836d 100644 --- a/application/controllers/Eqsl.php +++ b/application/controllers/Eqsl.php @@ -319,7 +319,7 @@ class eqsl extends CI_Controller { if (!isset($images) || count($images) == 0) { $h3 = $dom->getElementsByTagName('h3'); - if (isset($h3)) { + if (isset($h3) && ($h3->item(0) !== null)) { echo $h3->item(0)->nodeValue; } else { echo "Rate Limited"; diff --git a/application/libraries/EqslImporter.php b/application/libraries/EqslImporter.php index 7a057fce1..f0d213975 100644 --- a/application/libraries/EqslImporter.php +++ b/application/libraries/EqslImporter.php @@ -156,7 +156,7 @@ class EqslImporter // If there's a match for the QSO from the report in our log, it's confirmed via eQSL. // If we have a positive match from eQSL, record it in the DB according to the user's preferences - if ($record['qsl_sent'] == "Y") { + if ( (array_key_exists('qsl_sent',$record)) && ($record['qsl_sent'] == "Y")) { $record['qsl_sent'] = $config['eqsl_rcvd_mark']; } From 364d4446ea697a93899e433e9fa3c22d44f43ccb Mon Sep 17 00:00:00 2001 From: int2001 Date: Sat, 14 Sep 2024 09:41:24 +0000 Subject: [PATCH 2/4] Set BandRX to empty (not null) if not derivated (as last defence) --- application/models/Logbook_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index c0e19d0a9..758a04951 100644 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -4002,7 +4002,7 @@ function lotw_last_qsl_date($user_id) { 'COL_AWARD_GRANTED' => (!empty($record['award_granted'])) ? $record['award_granted'] : '', 'COL_AWARD_SUBMITTED' => (!empty($record['award_submitted'])) ? $record['award_submitted'] : '', 'COL_BAND' => $band, - 'COL_BAND_RX' => $band_rx, + 'COL_BAND_RX' => $band_rx ?? '', 'COL_BIOGRAPHY' => (!empty($record['biography'])) ? $record['biography'] : '', 'COL_CALL' => (!empty($record['call'])) ? strtoupper($record['call']) : '', 'COL_CHECK' => (!empty($record['check'])) ? $record['check'] : '', From 15757e8c3e2e98b89e7f539210f25df2e4fbcac8 Mon Sep 17 00:00:00 2001 From: HB9HIL <80885850+HB9HIL@users.noreply.github.com> Date: Sat, 14 Sep 2024 17:20:06 +0000 Subject: [PATCH 3/4] stringify --- application/views/interface_assets/footer.php | 2 +- assets/js/sections/cron.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index d5e36db39..02915e6d9 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -48,7 +48,7 @@ var lang_no_states_for_dxcc_available = ""; var lang_qrbcalc_title = ''; var lang_qrbcalc_errmsg = ''; - + var lang_general_refresh_list = ''; diff --git a/assets/js/sections/cron.js b/assets/js/sections/cron.js index 3ce5d6ad4..04b42d7ef 100644 --- a/assets/js/sections/cron.js +++ b/assets/js/sections/cron.js @@ -46,7 +46,7 @@ function init_datatable() { dom: 'Bfrtip', buttons: [ { - text: 'Refresh', + text: lang_general_refresh_list, action: function (e, dt, node, config) { reloadCrons(); } From af7fe1b6e84ac9d0045ffd64f83968f2da4b7ff0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 14 Sep 2024 17:20:30 +0000 Subject: [PATCH 4/4] po/mo updates --- application/locale/bg_BG/LC_MESSAGES/messages.po | 11 ++++++----- application/locale/bs/LC_MESSAGES/messages.po | 11 ++++++----- application/locale/cnr/LC_MESSAGES/messages.po | 11 ++++++----- application/locale/cs_CZ/LC_MESSAGES/messages.po | 11 ++++++----- application/locale/de_DE/LC_MESSAGES/messages.po | 11 ++++++----- application/locale/el_GR/LC_MESSAGES/messages.po | 11 ++++++----- application/locale/es_ES/LC_MESSAGES/messages.po | 11 ++++++----- application/locale/fi_FI/LC_MESSAGES/messages.po | 11 ++++++----- application/locale/fr_FR/LC_MESSAGES/messages.po | 11 ++++++----- application/locale/hr/LC_MESSAGES/messages.po | 11 ++++++----- application/locale/it_IT/LC_MESSAGES/messages.po | 11 ++++++----- application/locale/nl_NL/LC_MESSAGES/messages.po | 11 ++++++----- application/locale/pl_PL/LC_MESSAGES/messages.po | 11 ++++++----- application/locale/pt_PT/LC_MESSAGES/messages.po | 11 ++++++----- application/locale/ru_RU/LC_MESSAGES/messages.po | 11 ++++++----- application/locale/sq/LC_MESSAGES/messages.po | 11 ++++++----- application/locale/sr/LC_MESSAGES/messages.po | 11 ++++++----- application/locale/sv_SE/LC_MESSAGES/messages.po | 11 ++++++----- application/locale/tr_TR/LC_MESSAGES/messages.po | 11 ++++++----- application/locale/zh_CN/LC_MESSAGES/messages.po | 11 ++++++----- assets/lang_src/messages.pot | 11 ++++++----- 21 files changed, 126 insertions(+), 105 deletions(-) diff --git a/application/locale/bg_BG/LC_MESSAGES/messages.po b/application/locale/bg_BG/LC_MESSAGES/messages.po index 4ff675c61..26e95c224 100644 --- a/application/locale/bg_BG/LC_MESSAGES/messages.po +++ b/application/locale/bg_BG/LC_MESSAGES/messages.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-09-13 18:18+0000\n" +"POT-Creation-Date: 2024-09-14 17:20+0000\n" "PO-Revision-Date: 2024-08-17 10:46+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Bulgarian \n" "Language-Team: Bosnian \n" "Language-Team: Montenegrin \n" "Language-Team: Czech \n" "Language-Team: German \n" "Language-Team: Greek \n" "Language-Team: Spanish \n" "Language-Team: Finnish \n" "Language-Team: French \n" "Language-Team: Croatian \n" "Language-Team: Italian \n" "Language-Team: Dutch \n" "Language-Team: Polish \n" "Language-Team: Portuguese (Portugal) \n" "Language-Team: Russian \n" "Language-Team: Albanian \n" "Language-Team: Serbian \n" "Language-Team: Swedish \n" "Language-Team: Turkish \n" "Language-Team: Chinese (Simplified Han script) \n" "Language-Team: LANGUAGE \n" @@ -6674,6 +6674,11 @@ msgstr "" msgid "Error in locators. Please check." msgstr "" +#: application/views/interface_assets/footer.php:51 +#: application/views/user/index.php:39 +msgid "Refresh List" +msgstr "" + #: application/views/interface_assets/footer.php:132 #: application/views/interface_assets/header.php:440 #: application/views/options/sidebar.php:11 @@ -11137,10 +11142,6 @@ msgstr "" msgid "Create user" msgstr "" -#: application/views/user/index.php:39 -msgid "Refresh List" -msgstr "" - #: application/views/user/index.php:49 msgid "Type" msgstr ""