From 0f94bcd66bdc945cca81e993821277438d772b02 Mon Sep 17 00:00:00 2001 From: phl0 Date: Tue, 30 Apr 2024 14:10:04 +0200 Subject: [PATCH 01/14] Only overwrite incoming LoTW grid if at least of the same precision --- application/controllers/Lotw.php | 5 ++++- application/models/Logbook_model.php | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/application/controllers/Lotw.php b/application/controllers/Lotw.php index 0f25b67e4..b70ce585b 100644 --- a/application/controllers/Lotw.php +++ b/application/controllers/Lotw.php @@ -525,7 +525,10 @@ class Lotw extends CI_Controller { } // Present only if the QSLing station specified a single valid grid square value in its station location uploaded to LoTW. if (isset($record['gridsquare'])) { - $qsl_gridsquare = $record['gridsquare']; + // Only overwrite if incoming grid is at least of the same length/precision than existing in the QSO record + if (strlen($record['gridsquare']) >= strlen($status[2])) { + $qsl_gridsquare = $record['gridsquare']; + } } else { $qsl_gridsquare = ""; } diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 55f544e58..57655a885 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -3184,7 +3184,7 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray = function import_check($datetime, $callsign, $band, $mode, $station_callsign, $station_id = null) { $mode=$this->get_main_mode_from_mode($mode); - $this->db->select('COL_PRIMARY_KEY, COL_TIME_ON, COL_CALL, COL_BAND'); + $this->db->select('COL_PRIMARY_KEY, COL_TIME_ON, COL_CALL, COL_BAND, COL_GRIDSQUARE'); $this->db->where('COL_TIME_ON >= DATE_ADD(DATE_FORMAT("'.$datetime.'", \'%Y-%m-%d %H:%i\' ), INTERVAL -15 MINUTE )'); $this->db->where('COL_TIME_ON <= DATE_ADD(DATE_FORMAT("'.$datetime.'", \'%Y-%m-%d %H:%i\' ), INTERVAL 15 MINUTE )'); $this->db->where('COL_CALL', $callsign); @@ -3201,9 +3201,9 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray = if ($query->num_rows() > 0) { $ret = $query->row(); - return ["Found", $ret->COL_PRIMARY_KEY]; + return ["Found", $ret->COL_PRIMARY_KEY, $ret->COL_GRIDSQUARE]; } else { - return ["No Match", 0]; + return ["No Match", 0, '']; } } From 2d4e790fb01b863d2c9c4102327bef15b64c49b6 Mon Sep 17 00:00:00 2001 From: phl0 Date: Tue, 30 Apr 2024 15:31:21 +0200 Subject: [PATCH 02/14] Catch case if LoTW grid is less specific --- application/controllers/Lotw.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/application/controllers/Lotw.php b/application/controllers/Lotw.php index b70ce585b..c6c82c1d1 100644 --- a/application/controllers/Lotw.php +++ b/application/controllers/Lotw.php @@ -528,6 +528,8 @@ class Lotw extends CI_Controller { // Only overwrite if incoming grid is at least of the same length/precision than existing in the QSO record if (strlen($record['gridsquare']) >= strlen($status[2])) { $qsl_gridsquare = $record['gridsquare']; + } else { + $qsl_gridsquare = ""; } } else { $qsl_gridsquare = ""; From bac7683a1a97eb99c17ce2cdba32b58ca0a5a12f Mon Sep 17 00:00:00 2001 From: int2001 Date: Tue, 30 Apr 2024 14:02:51 +0000 Subject: [PATCH 03/14] Autodisable QRZ-Upload if AUTH-Error // Logic-part --- application/controllers/Qrz.php | 49 ++++++++++++++++------------ application/models/Logbook_model.php | 2 +- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/application/controllers/Qrz.php b/application/controllers/Qrz.php index a4507bdd9..cebf21192 100644 --- a/application/controllers/Qrz.php +++ b/application/controllers/Qrz.php @@ -36,12 +36,14 @@ class Qrz extends CI_Controller { if ($station_ids) { foreach ($station_ids as $station) { $qrz_api_key = $station->qrzapikey; - if($this->mass_upload_qsos($station->station_id, $qrz_api_key, true)) { - echo "QSOs have been uploaded to QRZ.com."; - log_message('info', 'QSOs have been uploaded to QRZ.com.'); - } else{ - echo "No QSOs found for upload."; - log_message('info', 'No QSOs found for upload.'); + if ($station->qrzrealtime>=0) { + if($this->mass_upload_qsos($station->station_id, $qrz_api_key, true)) { + echo "QSOs have been uploaded to QRZ.com. for station_id ".$station->station_id; + } else{ + echo "No QSOs found for upload and station_id ".$station->station_id; + } + } else { + echo "Station ".$station->station_id." disabled for upload to QRZ.com."; } } } else { @@ -84,11 +86,10 @@ class Qrz extends CI_Controller { $i++; $result['status'] = 'OK'; } elseif ( ($result['status']=='error') && (substr($result['message'],0,11) == 'STATUS=AUTH')) { - log_message('error', 'QRZ upload failed for qso: Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON); - log_message('error', 'QRZ upload failed with the following message: ' .$result['message']); - log_message('error', 'QRZ upload stopped for Station_ID: ' .$station_id); + log_message('error', 'QRZ upload failed for qso for Station_ID '.$station_id.' // Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON . ' // Message: '.$result['message']); $errormessages[] = $result['message'] . ' Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON; $result['status'] = 'Error'; + /* 'Update station_profile set qrz_realtime=-1 where station_id=?',$station_id) break; /* If key is invalid, immediate stop syncing for more QSOs of this station */ } else { log_message('error', 'QRZ upload failed for qso: Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON); @@ -148,21 +149,27 @@ class Qrz extends CI_Controller { $this->load->model('logbook_model'); $result = $this->logbook_model->exists_qrz_api_key($postData['station_id']); $qrz_api_key = $result->qrzapikey; + $qrz_enabled = $result->qrzrealtime; header('Content-type: application/json'); - $result = $this->mass_upload_qsos($postData['station_id'], $qrz_api_key); - if ($result['status'] == 'OK') { - $stationinfo = $this->stations->stations_with_qrz_api_key(); - $info = $stationinfo->result(); + if ($qrz_enabled>=0) { + $result = $this->mass_upload_qsos($postData['station_id'], $qrz_api_key); + if ($result['status'] == 'OK') { + $stationinfo = $this->stations->stations_with_qrz_api_key(); + $info = $stationinfo->result(); - $data['status'] = 'OK'; - $data['info'] = $info; - $data['infomessage'] = $result['count'] . " QSOs are now uploaded to QRZ.com"; - $data['errormessages'] = $result['errormessages']; - echo json_encode($data); + $data['status'] = 'OK'; + $data['info'] = $info; + $data['infomessage'] = $result['count'] . " QSOs are now uploaded to QRZ.com"; + $data['errormessages'] = $result['errormessages']; + echo json_encode($data); + } else { + $data['status'] = 'Error'; + $data['info'] = 'Error: No QSOs found to upload.'; + $data['errormessages'] = $result['errormessages']; + echo json_encode($data); + } } else { - $data['status'] = 'Error'; - $data['info'] = 'Error: No QSOs found to upload.'; - $data['errormessages'] = $result['errormessages']; + $data['status']='QRZ Disabled for station'.$this->security->xss_clean($postData['station_id']); echo json_encode($data); } } diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 55f544e58..6f55eeb89 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -1875,7 +1875,7 @@ class Logbook_model extends CI_Model { * Function returns all the station_id's with QRZ API Key's */ function get_station_id_with_qrz_api() { - $sql = 'select station_id, qrzapikey from station_profile + $sql = 'select station_id, qrzapikey, qrzrealtime from station_profile where coalesce(qrzapikey, "") <> ""'; $query = $this->db->query($sql); From 9cc61b5d7ec9d775e3e83f8ab25145768b07bf48 Mon Sep 17 00:00:00 2001 From: int2001 Date: Tue, 30 Apr 2024 14:29:03 +0000 Subject: [PATCH 04/14] Disable on Auth-Failure --- application/controllers/Qrz.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/controllers/Qrz.php b/application/controllers/Qrz.php index cebf21192..d6725a332 100644 --- a/application/controllers/Qrz.php +++ b/application/controllers/Qrz.php @@ -89,7 +89,8 @@ class Qrz extends CI_Controller { log_message('error', 'QRZ upload failed for qso for Station_ID '.$station_id.' // Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON . ' // Message: '.$result['message']); $errormessages[] = $result['message'] . ' Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON; $result['status'] = 'Error'; - /* 'Update station_profile set qrz_realtime=-1 where station_id=?',$station_id) + $sql = 'update station_profile set qrzrealtime = -1 where station_id = ?'; + $this->db->query($sql,$station_id); break; /* If key is invalid, immediate stop syncing for more QSOs of this station */ } else { log_message('error', 'QRZ upload failed for qso: Call: ' . $qso->COL_CALL . ' Band: ' . $qso->COL_BAND . ' Mode: ' . $qso->COL_MODE . ' Time: ' . $qso->COL_TIME_ON); From 1b9c1237fb69676bab14e09c11e9131c612754bd Mon Sep 17 00:00:00 2001 From: int2001 Date: Tue, 30 Apr 2024 14:50:09 +0000 Subject: [PATCH 05/14] Added Option to UI --- application/views/station_profile/create.php | 5 +++-- application/views/station_profile/edit.php | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php index 2b9addb6f..799fefc28 100644 --- a/application/views/station_profile/create.php +++ b/application/views/station_profile/create.php @@ -233,8 +233,9 @@
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index deb19ec84..f832ccc1e 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -305,8 +305,9 @@
From da352f4c21e98a30534f9b7182a27dc081f8cdce Mon Sep 17 00:00:00 2001 From: int2001 Date: Tue, 30 Apr 2024 15:11:08 +0000 Subject: [PATCH 06/14] Language-Foo --- application/language/bulgarian/general_words_lang.php | 1 + application/language/bulgarian/station_lang.php | 2 +- application/language/chinese_simplified/general_words_lang.php | 1 + application/language/chinese_simplified/station_lang.php | 2 +- application/language/czech/general_words_lang.php | 1 + application/language/czech/station_lang.php | 2 +- application/language/dutch/general_words_lang.php | 1 + application/language/dutch/station_lang.php | 2 +- application/language/english/general_words_lang.php | 1 + application/language/english/station_lang.php | 2 +- application/language/finnish/general_words_lang.php | 1 + application/language/finnish/station_lang.php | 2 +- application/language/french/general_words_lang.php | 1 + application/language/french/station_lang.php | 2 +- application/language/german/general_words_lang.php | 1 + application/language/german/station_lang.php | 2 +- application/language/greek/general_words_lang.php | 1 + application/language/greek/station_lang.php | 2 +- application/language/italian/general_words_lang.php | 1 + application/language/italian/station_lang.php | 2 +- application/language/polish/general_words_lang.php | 1 + application/language/polish/station_lang.php | 2 +- application/language/russian/general_words_lang.php | 2 ++ application/language/russian/station_lang.php | 2 +- application/language/spanish/general_words_lang.php | 2 ++ application/language/spanish/station_lang.php | 2 +- application/language/swedish/general_words_lang.php | 2 ++ application/language/swedish/station_lang.php | 2 +- application/language/turkish/general_words_lang.php | 1 + application/language/turkish/station_lang.php | 2 +- 30 files changed, 33 insertions(+), 15 deletions(-) diff --git a/application/language/bulgarian/general_words_lang.php b/application/language/bulgarian/general_words_lang.php index 2c99aeeda..e466ebd46 100644 --- a/application/language/bulgarian/general_words_lang.php +++ b/application/language/bulgarian/general_words_lang.php @@ -237,4 +237,5 @@ $lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; $lang['gen_add_to_contest'] = "Add QSOs to Contest"; +$lang['general_word_realtime'] = "Realtime"; $lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; +$lang['general_word_realtime'] = "Realtime"; $lang['datatables_language'] = "en-GB"; diff --git a/application/language/swedish/station_lang.php b/application/language/swedish/station_lang.php index b27687efe..b52282ff6 100644 --- a/application/language/swedish/station_lang.php +++ b/application/language/swedish/station_lang.php @@ -100,7 +100,7 @@ $lang['station_location_eqsl_defaultqslmsg'] = "Default QSLMSG"; $lang['station_location_eqsl_defaultqslmsg_hint'] = "Define a default message that will be populated and sent for each QSO for this station location."; $lang['station_location_qrz_subscription'] = 'Subscription Required'; $lang['station_location_qrz_hint'] = "Find your API key on the QRZ.com Logbook settings page"; -$lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Realtime Upload'; +$lang['station_location_qrz_realtime_upload'] = 'QRZ.com Logbook Upload'; $lang['station_location_hrdlog_username'] = "HRDLog.net Username"; $lang['station_location_hrdlog_username_hint'] = "The username you are registered with at HRDlog.net (usually your callsign)."; $lang['station_location_hrdlog_code'] = "HRDLog.net API Key"; diff --git a/application/language/turkish/general_words_lang.php b/application/language/turkish/general_words_lang.php index a30b52580..8748e277c 100644 --- a/application/language/turkish/general_words_lang.php +++ b/application/language/turkish/general_words_lang.php @@ -237,4 +237,5 @@ $lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go Date: Tue, 30 Apr 2024 17:34:11 +0200 Subject: [PATCH 07/14] Only update from LoTW if first 4-chars are different or grid string is longer --- application/controllers/Lotw.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/application/controllers/Lotw.php b/application/controllers/Lotw.php index c6c82c1d1..eb2eba33f 100644 --- a/application/controllers/Lotw.php +++ b/application/controllers/Lotw.php @@ -524,15 +524,11 @@ class Lotw extends CI_Controller { $state = ""; } // Present only if the QSLing station specified a single valid grid square value in its station location uploaded to LoTW. + $qsl_gridsquare = ""; if (isset($record['gridsquare'])) { - // Only overwrite if incoming grid is at least of the same length/precision than existing in the QSO record - if (strlen($record['gridsquare']) >= strlen($status[2])) { + if (strlen($record['gridsquare']) > strlen($status[2]) || substr(strtoupper($status[2]), 0, 4) != substr(strtoupper($record['gridsquare']), 0, 4)) { $qsl_gridsquare = $record['gridsquare']; - } else { - $qsl_gridsquare = ""; } - } else { - $qsl_gridsquare = ""; } if (isset($record['vucc_grids'])) { From 50789da43bbb761c53e7a35aba68fcde359c379a Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Tue, 30 Apr 2024 23:35:05 +0200 Subject: [PATCH 08/14] api key test button in station location --- application/controllers/Qrz.php | 39 ++++++++++++++++++++ application/views/station_profile/create.php | 6 ++- application/views/station_profile/edit.php | 6 ++- assets/js/sections/station_locations.js | 35 ++++++++++++++++++ 4 files changed, 84 insertions(+), 2 deletions(-) diff --git a/application/controllers/Qrz.php b/application/controllers/Qrz.php index d6725a332..cb7bb3718 100644 --- a/application/controllers/Qrz.php +++ b/application/controllers/Qrz.php @@ -21,6 +21,45 @@ class Qrz extends CI_Controller { $this->config->load('config'); } + /* + * API Key Status Test + */ + + public function qrz_apitest() { + $apikey = xss_clean($this->input->post('APIKEY')); + $url = 'http://logbook.qrz.com/api'; // TODO: Move this to database + + $post_data['KEY'] = $apikey; + $post_data['ACTION'] = 'STATUS'; + + $ch = curl_init( $url ); + curl_setopt( $ch, CURLOPT_POST, true); + curl_setopt( $ch, CURLOPT_POSTFIELDS, $post_data); + curl_setopt( $ch, CURLOPT_FOLLOWLOCATION, 1); + curl_setopt( $ch, CURLOPT_HEADER, 0); + curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true); + + $content = curl_exec($ch); + curl_close($ch); + + if ($content){ + if (stristr($content,'RESULT=OK')) { + $result['status'] = 'OK'; + $result['message'] = $content; + } + else { + $result['status'] = 'Failed'; + $result['message'] = $content; + } + } + if(curl_errno($ch)){ + $result['status'] = 'error'; + $result['message'] = 'Curl error: '. curl_errno($ch); + } + header('Content-Type: application/json'); + echo json_encode($result); + } + /* * Upload QSO to QRZ.com * When called from the url wavelog/qrz/upload, the function loops through all station_id's with a qrz api key defined. diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php index 799fefc28..58e531b10 100644 --- a/application/views/station_profile/create.php +++ b/application/views/station_profile/create.php @@ -227,7 +227,11 @@
- +
+ + +
+
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index f832ccc1e..7667a59cf 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -298,7 +298,11 @@
- qrzapikey; } ?>"> +
+ qrzapikey; } ?>"> + +
+
diff --git a/assets/js/sections/station_locations.js b/assets/js/sections/station_locations.js index 8fbd37d6b..43268951d 100644 --- a/assets/js/sections/station_locations.js +++ b/assets/js/sections/station_locations.js @@ -12,6 +12,41 @@ $(document).ready(function () { $("#dxcc_id").change(function () { updateStateDropdown('#dxcc_id', '#stateInputLabel', '#location_us_county', '#stationCntyInputEdit'); }); + + $('#qrz_apitest_btn').click(function(){ + + var apikey = $('#qrzApiKey').val(); + var msg_div = $('#qrz_apitest_msg'); + + msg_div.hide(); + msg_div.removeClass('alert-success alert-danger') + + $.ajax({ + url: base_url+'index.php/qrz/qrz_apitest', + type: 'POST', + data: { + 'APIKEY': apikey + }, + success: function(res) { + if(res.status == 'OK') { + msg_div.addClass('alert-success'); + msg_div.text('Your API Key works. You are good to go!'); + msg_div.show(); + } else { + msg_div.addClass('alert-danger'); + msg_div.text('Your API Key failed. Are you sure you have a valid QRZ subsription?'); + msg_div.show(); + $('#qrzrealtime').val(-1); + } + }, + error: function(res) { + msg_div.addClass('alert-danger'); + msg_div.text('ERROR: Something went wrong on serverside. We\'re sorry..'); + msg_div.show(); + }, + }); + }); + } }); From d0cf154dcb476e8e6188831dad3fd1d0ba012d92 Mon Sep 17 00:00:00 2001 From: int2001 Date: Wed, 1 May 2024 04:40:26 +0000 Subject: [PATCH 09/14] Added timeout to the Testfunction --- application/controllers/Qrz.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/controllers/Qrz.php b/application/controllers/Qrz.php index cb7bb3718..6eac70253 100644 --- a/application/controllers/Qrz.php +++ b/application/controllers/Qrz.php @@ -37,6 +37,7 @@ class Qrz extends CI_Controller { curl_setopt( $ch, CURLOPT_POSTFIELDS, $post_data); curl_setopt( $ch, CURLOPT_FOLLOWLOCATION, 1); curl_setopt( $ch, CURLOPT_HEADER, 0); + curl_setopt( $ch, CURLOPT_CONNECTTIMEOUT, 20); curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true); $content = curl_exec($ch); From c164f75d1be1153dca2a74a815599e8d58e82807 Mon Sep 17 00:00:00 2001 From: int2001 Date: Wed, 1 May 2024 05:57:46 +0000 Subject: [PATCH 10/14] Filtering Confirmed Worked Not-Worked at DXCluster (PHP) --- application/views/bandmap/list.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/application/views/bandmap/list.php b/application/views/bandmap/list.php index 3b63c8d49..30906c83d 100644 --- a/application/views/bandmap/list.php +++ b/application/views/bandmap/list.php @@ -66,6 +66,13 @@ } ?>>radio; ?> + +