Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix QRZ LastQSL-Logic

Browse Source
This commit is contained in:
int2001
2025-01-15 12:22:58 +00:00
parent 61b74b5a8d
commit 22bef0d504
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/Qrz.php
View File

@@ -312,7 +312,7 @@ class Qrz extends CI_Controller {
if ((($user_id_to_load != null) && ($user_id_to_load != $station->user_id))) { // Skip User if we're called with a specific user_id
continue;
}
if ($lastqrz == null) {
if (($lastqrz == null) || ($user_id_to_load == null)) {
$lastqrz = $this->logbook_model->qrz_last_qsl_date($station->user_id);
}
$qrz_api_key = $station->qrzapikey;

9
application/models/Logbook_model.php
View File

@@ -3754,12 +3754,15 @@ class Logbook_model extends CI_Model {
}
function qrz_last_qsl_date($user_id) {
$sql = "SELECT date_format(MAX(COALESCE(COL_QRZCOM_QSO_DOWNLOAD_DATE, str_to_date('1900-01-01','%Y-%m-%d'))),'%Y-%m-%d') MAXDATE
$sql = "SELECT date_format(MAX(COALESCE(COL_QRZCOM_QSO_DOWNLOAD_DATE, str_to_date('1900-01-01','%Y-%m-%d'))),'%Y-%m-%d') MAXDATE, COUNT(1) as QSOs
FROM " . $this->config->item('table_name') . " INNER JOIN station_profile ON (" . $this->config->item('table_name') . ".station_id = station_profile.station_id)
WHERE station_profile.user_id=? and station_profile.qrzapikey is not null and COL_QRZCOM_QSO_DOWNLOAD_DATE is not null";
$query = $this->db->query($sql, $user_id);
$query = $this->db->query($sql, array($user_id));
$row = $query->row();
if (isset($row) && ($row->MAXDATE ?? '' != '')) {
if (isset($row) && (($row->QSOS ?? 0) == 0)) { // Abort / Set LASTQSO to future if no QSO is in Log to prevent processing QRZ-Data
return '2999-12-31';
}
if (isset($row) && (($row->MAXDATE ?? '') != '')) {
return $row->MAXDATE;
} else {
return '1900-01-01';