mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge branch 'dev' of github.com:int2001/Cloudlog into dev

pull/2301/head
int2001 2023-07-15 15:32:12 +00:00
rodzic e01aaa31f8 1e300fbc30
commit ba5a97b5dd
1 zmienionych plików z 7 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
application/models/Logbook_model.php
Wyświetl plik

@ -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');