goodspeed/Cloudlog
1
0
派生 0
代码 工单 合并请求 项目 版本发布 软件包 百科 动态 Actions

Merge remote-tracking branch 'upstream/dev' into ans-eqsl-default-qslmsg-v3

浏览代码
这个提交包含在：
abarrau 2023-11-29 15:33:39 +01:00
当前提交 52eba964d1
共有 2 个文件被更改，包括 32 次插入 和 16 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

36
application/models/Logbook_model.php
查看文件

@ -4101,11 +4101,7 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray =
// get all records with no COL_GRIDSQUARE
$this->db->select("COL_PRIMARY_KEY, COL_CALL, COL_TIME_ON, COL_TIME_OFF");
// check which to update - records with no Gridsquare or all records
$this->db->where("COL_GRIDSQUARE is NULL or COL_GRIDSQUARE = ''");
$where = "(COL_GRIDSQUARE is NULL or COL_GRIDSQUARE = '') AND (COL_VUCC_GRIDS is NULL or COL_VUCC_GRIDS = '')";
$this->db->where($where);
$this->db->where("(COL_GRIDSQUARE is NULL or COL_GRIDSQUARE = '') AND (COL_VUCC_GRIDS is NULL or COL_VUCC_GRIDS = '')");
$r = $this->db->get($this->config->item('table_name'));
@ -4113,11 +4109,13 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray =
$this->db->trans_start();
if ($r->num_rows() > 0){
foreach($r->result_array() as $row){
$callsign = $row['COL_CALL'];
$callsign = $row['COL_CALL'];
if ($this->config->item('callbook') == "qrz" && $this->config->item('qrz_username') != null && $this->config->item('qrz_password') != null)
{
// Lookup using QRZ
$this->load->library('qrz');
if(!$this->load->is_loaded('qrz')) {
$this->load->library('qrz');
}
if(!$this->session->userdata('qrz_session_key')) {
$qrz_session_key = $this->qrz->session($this->config->item('qrz_username'), $this->config->item('qrz_password'));
@ -4130,7 +4128,9 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray =
if ($this->config->item('callbook') == "hamqth" && $this->config->item('hamqth_username') != null && $this->config->item('hamqth_password') != null)
{
// Load the HamQTH library
$this->load->library('hamqth');
if(!$this->load->is_loaded('hamqth')) {
$this->load->library('hamqth');
}
if(!$this->session->userdata('hamqth_session_key')) {
$hamqth_session_key = $this->hamqth->session($this->config->item('hamqth_username'), $this->config->item('hamqth_password'));
@ -4148,14 +4148,18 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray =
}
if (isset($callbook))
{
$return['callsign_qra'] = $callbook['gridsquare'];
}
if ($return['callsign_qra'] != ''){
$sql = sprintf("update %s set COL_GRIDSQUARE = '%s' where COL_PRIMARY_KEY=%d",
$this->config->item('table_name'), $return['callsign_qra'], $row['COL_PRIMARY_KEY']);
$this->db->query($sql);
printf("Updating %s to %s\n<br/>", $row['COL_PRIMARY_KEY'], $return['callsign_qra']);
$count++;
if (isset($callbook['error'])) {
printf("Error: ".$callbook['error']."<br />");
} else {
$return['callsign_qra'] = $callbook['gridsquare'];
if ($return['callsign_qra'] != ''){
$sql = sprintf("update %s set COL_GRIDSQUARE = '%s' where COL_PRIMARY_KEY=%d",
$this->config->item('table_name'), $return['callsign_qra'], $row['COL_PRIMARY_KEY']);
$this->db->query($sql);
printf("Updating %s to %s\n<br/>", $row['COL_PRIMARY_KEY'], $return['callsign_qra']);
$count++;
}
}
}
}
}

12
assets/json/satellite_data.json
查看文件

@ -559,6 +559,18 @@
]
}
},
"HADES-D":{
"Modes":{
"V/U":[
{
"Uplink_Mode":"FM",
"Uplink_Freq":"145875000",
"Downlink_Mode":"FM",
"Downlink_Freq":"436666000"
}
]
}
},
"INSPIRE-SAT 7":{
"Modes":{
"V/U":[