diff --git a/application/controllers/Lotw.php b/application/controllers/Lotw.php
index 3355bf1eb..b1e02da61 100644
--- a/application/controllers/Lotw.php
+++ b/application/controllers/Lotw.php
@@ -696,12 +696,16 @@ class Lotw extends CI_Controller {
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 30);
$content = curl_exec($ch);
- if(curl_errno($ch)){
+ if(curl_errno($ch)) {
$result = "LoTW download failed for user ".$data['user_lotw_name'].": ".curl_strerror(curl_errno($ch))." (".curl_errno($ch).").";
if (curl_errno($ch) == 28) { // break on timeout
$result .= "
Timeout reached. Stopping subsequent downloads.";
break;
}
+ continue;
+ } else if(str_contains($content,"Username/password incorrect")) {
+ $result = "LoTW download failed for user ".$data['user_lotw_name'].": Username/password incorrect";
+ continue;
}
file_put_contents($file, $content);
if (file_get_contents($file, false, null, 0, 39) != "ARRL Logbook of the World Status Report") {
@@ -785,13 +789,14 @@ class Lotw extends CI_Controller {
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 30);
$content = curl_exec($ch);
- if(!curl_errno($ch)){
+ if(curl_errno($ch)) {
+ print "LoTW download failed for user ".$data['user_lotw_name'].": ".curl_strerror(curl_errno($ch))." (".curl_errno($ch).").";
+ } else if (str_contains($content,"Username/password incorrect")) {
+ print "LoTW download failed for user ".$data['user_lotw_name'].": Username/password incorrect";
+ } else {
file_put_contents($file, $content);
-
ini_set('memory_limit', '-1');
$this->loadFromFile($file, $station_ids);
- } else {
- print "LoTW download failed for user ".$data['user_lotw_name'].": ".curl_strerror(curl_errno($ch))." (".curl_errno($ch).").";
}
} else {
if (!is_writable(dirname($file))) {
diff --git a/application/locale/bg_BG/LC_MESSAGES/messages.po b/application/locale/bg_BG/LC_MESSAGES/messages.po
index 75f014d3e..bf6f869a6 100644
--- a/application/locale/bg_BG/LC_MESSAGES/messages.po
+++ b/application/locale/bg_BG/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: translations@wavelog.org\n"
-"POT-Creation-Date: 2024-12-04 07:52+0000\n"
+"POT-Creation-Date: 2024-12-04 09:36+0000\n"
"PO-Revision-Date: 2024-11-01 08:53+0000\n"
"Last-Translator: Plamen Panteleev \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: Estonian \n"
"Language-Team: Finnish \n"
"Language-Team: Croatian \n"
"Language-Team: Italian \n"
"Language-Team: Lithuanian \n"
"Language-Team: Latvian \n"
"Language-Team: Dutch \n"
"Language-Team: Polish \n"
"Language-Team: Russian \n"
"Language-Team: Albanian \n"
"Language-Team: Serbian \n"
"Language-Team: Swedish \n"
"Language-Team: Turkish \n"
"Language-Team: LANGUAGE \n"
@@ -56,7 +56,7 @@ msgstr ""
#: application/controllers/Lookup.php:17 application/controllers/Lotw.php:44
#: application/controllers/Lotw.php:79 application/controllers/Lotw.php:105
#: application/controllers/Lotw.php:377 application/controllers/Lotw.php:400
-#: application/controllers/Lotw.php:725 application/controllers/Lotw.php:829
+#: application/controllers/Lotw.php:729 application/controllers/Lotw.php:834
#: application/controllers/Mode.php:15 application/controllers/Notes.php:10
#: application/controllers/Options.php:15 application/controllers/Oqrs.php:15
#: application/controllers/Qrbcalc.php:13 application/controllers/Qrz.php:282
@@ -1548,27 +1548,27 @@ msgstr ""
msgid "LoTW ADIF Information"
msgstr ""
-#: application/controllers/Lotw.php:731
+#: application/controllers/Lotw.php:735
msgid "LoTW ADIF Import"
msgstr ""
-#: application/controllers/Lotw.php:757 application/controllers/Lotw.php:864
+#: application/controllers/Lotw.php:761 application/controllers/Lotw.php:869
msgid "You have not defined your ARRL LoTW credentials!"
msgstr ""
-#: application/controllers/Lotw.php:831
+#: application/controllers/Lotw.php:836
msgid "LoTW .TQ8 Upload"
msgstr ""
-#: application/controllers/Lotw.php:909
+#: application/controllers/Lotw.php:914
msgid "Your ARRL username and/or password is incorrect."
msgstr ""
-#: application/controllers/Lotw.php:928 application/controllers/Lotw.php:933
+#: application/controllers/Lotw.php:933 application/controllers/Lotw.php:938
msgid "LoTW .TQ8 Sent"
msgstr ""
-#: application/controllers/Lotw.php:940
+#: application/controllers/Lotw.php:945
msgid "LoTW .TQ8 Not Sent"
msgstr ""