diff --git a/application/models/Dxcluster_model.php b/application/models/Dxcluster_model.php index 5c61708b8..1b6a65a73 100644 --- a/application/models/Dxcluster_model.php +++ b/application/models/Dxcluster_model.php @@ -29,6 +29,7 @@ class Dxcluster_model extends CI_Model { $ch = curl_init(); curl_setopt($ch, CURLOPT_URL, $dxcache_url); curl_setopt($ch, CURLOPT_USERAGENT, 'Wavelog '.$this->optionslib->get_option('version').' DXLookup'); + curl_setopt($ch, CURLOPT_TIMEOUT, 10); curl_setopt($ch, CURLOPT_HEADER, false); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); $jsonraw = curl_exec($ch); diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 57655a885..751a9a432 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -2085,7 +2085,6 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray = $this->db->limit('2'); $query = $this->db->get($this->config->item('table_name')); - return $query->num_rows(); } diff --git a/assets/js/sections/bandmap_list.js b/assets/js/sections/bandmap_list.js index a517a3d5a..4c60e12fa 100644 --- a/assets/js/sections/bandmap_list.js +++ b/assets/js/sections/bandmap_list.js @@ -48,12 +48,14 @@ $(function() { table.page.len(50); let oldtable=table.data(); table.clear(); + let spots2render=0; if (dxspots.length>0) { dxspots.sort(SortByQrg); dxspots.forEach((single) => { if ((cwn == 'wkd') && (!(single.worked_dxcc))) { return; } if ((cwn == 'cnf') && (!(single.cnfmd_dxcc))) { return; } if ((cwn == 'ucnf') && ((single.cnfmd_dxcc))) { return; } + spots2render++; var data=[]; if (single.cnfmd_dxcc) { dxcc_wked_info="text-success"; @@ -120,6 +122,10 @@ $(function() { table.clear(); table.draw(); } + if (spots2render == 0) { + table.clear(); + table.draw(); + } }); } else { table.clear();