mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

[Logbook Advanced] Fixed callbook lookup

pull/2398/head
Andreas 2023-08-10 09:07:24 +02:00
rodzic 37ddae8e93
commit 4024616e53
2 zmienionych plików z 6 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
application/controllers/Logbookadvanced.php
Wyświetl plik

@ -140,7 +140,7 @@ class Logbookadvanced extends CI_Controller {
$callbook = $this->logbook_model->loadCallBook($qso['COL_CALL'], $this->config->item('use_fullname'));
if ($callbook['callsign'] !== "") {
if ($callbook['callsign'] ?? "" !== "") {
$this->logbookadvanced_model->updateQsoWithCallbookInfo($qsoID, $qso, $callbook);
$qso['COL_NAME'] = trim($callbook['name']);
if (isset($callbook['qslmgr'])) {

11
src/QSLManager/QSO.php
Wyświetl plik

@ -117,7 +117,6 @@ class QSO
'COL_STATE',
'COL_COUNTRY',
'COL_IOTA',
'name'
];
@ -196,16 +195,16 @@ class QSO
$this->cqzone = ($data['COL_CQZ'] === null) ? '' : '<a href="javascript:spawnLookupModal('.$data['COL_CQZ'].',\'cq\');">'.$data['COL_CQZ'].'</a>';
$this->state = ($data['COL_STATE'] === null) ? '' :$data['COL_STATE'];
$this->dxcc = ($data['name'] === null) ? '- NONE -' : '<a href="javascript:spawnLookupModal('.$data['COL_DXCC'].',\'dxcc\');">'.ucwords(strtolower($data['name']), "- (/").'</a>';
$this->dxcc = ($data['name'] ?? null === null) ? '- NONE -' : '<a href="javascript:spawnLookupModal('.$data['COL_DXCC'].',\'dxcc\');">'.ucwords(strtolower($data['name']), "- (/").'</a>';
$this->iota = ($data['COL_IOTA'] === null) ? '' : $this->getIotaLink($data['COL_IOTA']);
if (array_key_exists('end', $data)) {
$this->end = ($data['end'] === null) ? null : DateTime::createFromFormat("Y-m-d", $data['end'], new DateTimeZone('UTC'));
} else {
$this->end = null;
}
$this->callsign = ($data['callsign'] === null) ? '' :$data['callsign'];
$this->lastupload = ($data['lastupload'] === null) ? '' : date($custom_date_format . " H:i", strtotime($data['lastupload']));
$this->lotw_hint = $this->getLotwHint($data['lastupload']);
$this->callsign = ($data['callsign'] ?? null === null) ? '' :$data['callsign'];
$this->lastupload = ($data['lastupload'] ?? null === null) ? '' : date($custom_date_format . " H:i", strtotime($data['lastupload'] ?? null));
$this->lotw_hint = $this->getLotwHint($data['lastupload'] ?? null);
}
/**
@ -323,7 +322,7 @@ class QSO
}
}
$qslstring .= '">&#9660;</span>';
if ($data['qslcount'] != null) {
if ($data['qslcount'] ?? null != null) {
$qslstring .= ' <a href="javascript:displayQsl('.$data['COL_PRIMARY_KEY'].');"><i class="fa fa-id-card"></i></a>';
}
return $qslstring;