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

Merge branch 'dev' into dev_lookup_priority

Browse Source
This commit is contained in:
Szymon Porwolik
2025-11-01 12:03:53 +01:00
committed by GitHub
parent e097a14f14 3ffdf6f547
commit f68c70cb1e
57 changed files with 15510 additions and 10925 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
application/controllers/Logbook.php
View File

@@ -178,8 +178,8 @@ class Logbook extends CI_Controller {
$return['callsign_ituz'] = $this->nval($this->logbook_model->call_ituzone($callsign), $callbook['ituz'] ?? '', $lookup_priority);
$return['callsign_cqz'] = $this->nval($this->logbook_model->call_cqzone($callsign), $callbook['cqz'] ?? '', $lookup_priority);
$return['workedBefore'] = $this->worked_grid_before($return['callsign_qra'], $band, $mode);
$return['confirmed'] = $this->confirmed_grid_before($return['callsign_qra'], $band, $mode);
$return['timesWorked'] = $this->logbook_model->times_worked($lookupcall);
$return['confirmed'] = $this->confirmed_grid_before($return['callsign_qra'], $band, $mode);
$return['timesWorked'] = $this->logbook_model->times_worked($lookupcall);
if ($this->session->userdata('user_show_profile_image')) {
if (isset($callbook) && isset($callbook['image'])) {
@@ -191,6 +191,31 @@ class Logbook extends CI_Controller {
} else {
$return['image'] = "n/a";
}
// Additional profile information from QRZ
$return['profile_url'] = $callbook['url'] ?? '';
$return['profile_class'] = $callbook['class'] ?? '';
$return['profile_born'] = $callbook['born'] ?? '';
$return['profile_eqsl'] = $callbook['eqsl'] ?? '';
$return['profile_lotw'] = $callbook['lotw'] ?? '';
$return['profile_mqsl'] = $callbook['mqsl'] ?? '';
$return['profile_fname'] = $callbook['fname'] ?? '';
$return['profile_name_last'] = $callbook['name_last'] ?? '';
$return['profile_nickname'] = $callbook['nickname'] ?? '';
$return['profile_aliases'] = $callbook['aliases'] ?? '';
$return['profile_p_call'] = $callbook['p_call'] ?? '';
$return['profile_addr1'] = $callbook['addr1'] ?? '';
$return['profile_addr2'] = $callbook['addr2'] ?? '';
$return['profile_state'] = $callbook['state'] ?? '';
$return['profile_zip'] = $callbook['zip'] ?? '';
$return['profile_country'] = $callbook['country'] ?? '';
$return['profile_dxcc'] = $callbook['dxcc'] ?? '';
$return['profile_lat'] = $callbook['lat'] ?? '';
$return['profile_lon'] = $callbook['lon'] ?? '';
$return['profile_efdate'] = $callbook['efdate'] ?? '';
$return['profile_expdate'] = $callbook['expdate'] ?? '';
$return['profile_GMTOffset'] = $callbook['GMTOffset'] ?? '';
$return['profile_qslmgr'] = $callbook['qslmgr'] ?? '';
}
if ($return['callsign_qra'] != "" || $return['callsign_qra'] != null) {