diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index c5f43dd5..cec2811f 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -2749,9 +2749,13 @@ class Logbook_model extends CI_Model { $station_profile=$CI->Stations->profile_clean($station_id); $station_profile_call=$station_profile->station_callsign; -/* if (($station_id != 0) && ($record['station_callsign'] != $station_profile_call)) { // Check if station_call from import matches profile ONLY when submitting via GUI. - return "Wrong station_callsign ".$record['station_callsign']." while importing QSO with ".$record['call']." for ".$station_profile_call; - } */ + if (($station_id !=0 ) && (!(isset($record['station_callsign'])))) { + $record['station_callsign']=$station_profile_call; + } + + if (($station_id != 0) && ($record['station_callsign'] != $station_profile_call)) { // Check if station_call from import matches profile ONLY when submitting via GUI. + return "Wrong station_callsign ".$record['station_callsign']." while importing QSO with ".$record['call']." for ".$station_profile_call." : SKIPPED"; + } $CI =& get_instance(); $CI->load->library('frequency');