From 1f8daf0681c187a42bfd5575fd989fdf70dfd02f Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Thu, 16 May 2019 08:31:30 +0100 Subject: [PATCH] Checks freq field is supplied in the ADIF record before trying to create a band from it --- application/models/Logbook_model.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 06b46861..8a282f4a 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -813,6 +813,7 @@ class Logbook_model extends CI_Model { }else{ $freqlng = 0; } + if(isset($record['freq']) && $freqlng < 7 ) { $cleansedstring = preg_replace('#\W#', '', $record['freq']); $freq = $cleansedstring."000"; @@ -853,18 +854,22 @@ class Logbook_model extends CI_Model { if(isset($record['band'])) { $band = $record['band']; } else { + if (isset($record['freq'])){ $myfreq = str_replace(array('.', ','), '' , $record['freq'].'0'); $band = $CI->frequency->GetBand($myfreq); + } } if(isset($record['band_rx'])) { $band_rx = $record['band_rx']; } else { - $myfreq = str_replace(array('.', ','), '' , $record['freq'].'0'); + if (isset($record['freq'])){ + $myfreq = str_replace(array('.', ','), '' , $record['freq'].'0'); - $band_rx = $CI->frequency->GetBand($myfreq); + $band_rx = $CI->frequency->GetBand($myfreq); + } }