Merge pull request #1963 from phl0/fixAmsatStatus

Handle all other SATs without special handling
pull/1964/head
Peter Goodhall 2023-01-28 13:11:16 +00:00 zatwierdzone przez GitHub
commit a39f1d3707
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 8 dodań i 8 usunięć

Wyświetl plik

@ -627,8 +627,9 @@ class Logbook_model extends CI_Model {
} else if ($data['COL_MODE'] == 'PKT') { } else if ($data['COL_MODE'] == 'PKT') {
$sat_name = 'ISS-DATA'; $sat_name = 'ISS-DATA';
} }
} else {
$sat_name = $data['COL_SAT_NAME'];
} }
if ($sat_name != '') {
$datearray = date_parse_from_format("Y-m-d H:i:s", $data['COL_TIME_ON']); $datearray = date_parse_from_format("Y-m-d H:i:s", $data['COL_TIME_ON']);
$url='https://amsat.org/status/submit.php?SatSubmit=yes&Confirm=yes&SatName='.$sat_name.'&SatYear='.$datearray['year'].'&SatMonth='.str_pad($datearray['month'], 2, '0', STR_PAD_LEFT).'&SatDay='.str_pad($datearray['day'], 2, '0', STR_PAD_LEFT).'&SatHour='.str_pad($datearray['hour'], 2, '0', STR_PAD_LEFT).'&SatPeriod='.(intdiv(($datearray['minute']-1), 15)).'&SatCall='.$data['COL_STATION_CALLSIGN'].'&SatReport=Heard&SatGridSquare='.$data['COL_MY_GRIDSQUARE']; $url='https://amsat.org/status/submit.php?SatSubmit=yes&Confirm=yes&SatName='.$sat_name.'&SatYear='.$datearray['year'].'&SatMonth='.str_pad($datearray['month'], 2, '0', STR_PAD_LEFT).'&SatDay='.str_pad($datearray['day'], 2, '0', STR_PAD_LEFT).'&SatHour='.str_pad($datearray['hour'], 2, '0', STR_PAD_LEFT).'&SatPeriod='.(intdiv(($datearray['minute']-1), 15)).'&SatCall='.$data['COL_STATION_CALLSIGN'].'&SatReport=Heard&SatGridSquare='.$data['COL_MY_GRIDSQUARE'];
$ch = curl_init(); $ch = curl_init();
@ -636,7 +637,6 @@ class Logbook_model extends CI_Model {
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_exec($ch); curl_exec($ch);
} }
}
/* Edit QSO */ /* Edit QSO */
function edit() { function edit() {