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 pull request #2860 from phl0/skipCallbookWithoutCreds

Browse Source 
Skip callbook lookups if credentials are empty/not set
This commit is contained in:
Florian (DF2ET)
2026-01-28 07:50:26 +01:00
committed by GitHub
parent bbdc6814e9 076f73ebfd
commit 0ff798750a
6 changed files with 163 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
application/controllers/Logbook.php
View File

@@ -224,7 +224,7 @@ class Logbook extends CI_Controller {
$return['latlng'] = $this->qralatlng($return['callsign_qra']);
$return['bearing'] = $this->bearing($return['callsign_qra'], $measurement_base, $station_id);
}
$return['callbook_source'] = $callbook['source'];
$return['callbook_source'] = $callbook['source'] ?? '';
echo json_encode($return, JSON_PRETTY_PRINT);
@@ -948,9 +948,16 @@ class Logbook extends CI_Controller {
$this->load->model('logbook_model');
$callsigninfo['grid_worked'] = $this->logbook_model->check_if_grid_worked_in_logbook(strtoupper(substr($callsigninfo['callsign']['gridsquare'],0,4)), null, $band)->num_rows();
}
if (isset($callsigninfo['callsign']['error'])) {
$callsigninfo['error'] = $callsigninfo['callsign']['error'];
$source_callbooks = $this->config->item('callbook');
if (is_array($source_callbooks)) {
$callsigninfo['error'] = '<b>'.__('All callbook lookups failed or provided no results.').'</b>';
foreach($source_callbooks as $source) {
$callsigninfo['error'] .= "<br />".$callsigninfo['callsign']['error_'.$source.'_name'].': '.$callsigninfo['callsign']['error_'.$source];
}
} else {
if (isset($callsigninfo['callsign']['error'])) {
$callsigninfo['error'] = $callsigninfo['callsign']['error'];
}
}
$callsigninfo['lookupcall'] = strtoupper($lookupcall);