Merge branch 'dev' into cbr_import

This commit is contained in:
Fabian Berg
2025-01-19 09:48:37 +01:00
committed by GitHub
97 changed files with 23752 additions and 22051 deletions

View File

@@ -177,7 +177,7 @@ class EqslImporter
$dupe = $this->CI->eqslmethods_model->eqsl_dupe_check($time_on, $record['call'], $record['band'], $record['mode'], $config['eqsl_rcvd_mark'], $station_callsign, $station_id);
if ($dupe == false) {
$updated += 1;
$eqsl_status = $this->CI->eqslmethods_model->eqsl_update($time_on, $record['call'], $record['band'], $record['mode'], $config['eqsl_rcvd_mark'], $station_callsign, $station_id, $eqsl_qslrdate);
$eqsl_status = $this->CI->eqslmethods_model->eqsl_update($time_on, $record['call'], $record['band'], $record['mode'], $config['eqsl_rcvd_mark'], $station_callsign, $station_id, $eqsl_qslrdate, ($record['qslmsg'] ?? null));
} else {
$dupes += 1;
$eqsl_status = "Already received an eQSL for this QSO.";

View File

@@ -171,6 +171,8 @@ class Frequency {
$Band = "160m";
} else if ($Frequency > 3000000 && $Frequency < 4000000) {
$Band = "80m";
} else if ($Frequency > 5350000 && $Frequency < 5367000) {
$Band = "60m";
} else if ($Frequency > 6000000 && $Frequency < 8000000) {
$Band = "40m";
} else if ($Frequency > 9000000 && $Frequency < 11000000) {