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

[eQSL] Fixes issue of Sat name/mode not being sent.

浏览代码 
Fixes #675
这个提交包含在：
Peter Goodhall 2020-10-29 16:45:09 +00:00
父节点 e306b8a8a0
当前提交 ecaba0768e
共有 2 个文件被更改，包括 6 次插入 和 6 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

10
application/controllers/Eqsl.php
查看文件

@ -409,18 +409,18 @@ class eqsl extends CI_Controller {
}
// adding sat name if it isn't blank
if ($qsl['COL_SAT_NAME'] = ''){
if ($qsl['COL_SAT_NAME'] != ''){
$adif .= "%3C";
$adif .= "SAT%5FNAME";
$adif .= "%3A";
$adif .= strlen($qsl['COL_SAT_NAME']);
$adif .= "%3E";
$adif .= $qsl['COL_SAT_NAME'];
$adif .= str_replace('-', '%2D', $qsl['COL_SAT_NAME']);
$adif .= "%20";
}
// adding sat mode if it isn't blank
if ($qsl['COL_SAT_MODE'] = ''){
if ($qsl['COL_SAT_MODE'] != ''){
$adif .= "%3C";
$adif .= "SAT%5FMODE";
$adif .= "%3A";
@ -430,7 +430,7 @@ class eqsl extends CI_Controller {
$adif .= "%20";
}
if ($qsl['eqslqthnickname'] = ''){
if ($qsl['eqslqthnickname'] != ''){
$adif .= "%3C";
$adif .= "APP%5FEQSL%5FQTH%5FNICKNAME";
$adif .= "%3A";
@ -441,7 +441,7 @@ class eqsl extends CI_Controller {
}
// adding sat mode if it isn't blank
if ($qsl['station_gridsquare'] = ''){
if ($qsl['station_gridsquare'] != ''){
$adif .= "%3C";
$adif .= "MY%5FGRIDSQUARE";
$adif .= "%3A";

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

@ -1475,7 +1475,7 @@ class Logbook_model extends CI_Model {
// Show all QSOs we need to send to eQSL
function eqsl_not_yet_sent() {
$this->db->select('station_profile.*, '.$this->config->item('table_name').'.COL_PRIMARY_KEY, '.$this->config->item('table_name').'.COL_TIME_ON, '.$this->config->item('table_name').'.COL_CALL, '.$this->config->item('table_name').'.COL_MODE, '.$this->config->item('table_name').'.COL_SUBMODE, '.$this->config->item('table_name').'.COL_BAND, '.$this->config->item('table_name').'.COL_COMMENT, '.$this->config->item('table_name').'.COL_RST_SENT, '.$this->config->item('table_name').'.COL_PROP_MODE');
$this->db->select('station_profile.*, '.$this->config->item('table_name').'.COL_PRIMARY_KEY, '.$this->config->item('table_name').'.COL_TIME_ON, '.$this->config->item('table_name').'.COL_CALL, '.$this->config->item('table_name').'.COL_MODE, '.$this->config->item('table_name').'.COL_SUBMODE, '.$this->config->item('table_name').'.COL_BAND, '.$this->config->item('table_name').'.COL_COMMENT, '.$this->config->item('table_name').'.COL_RST_SENT, '.$this->config->item('table_name').'.COL_PROP_MODE, '.$this->config->item('table_name').'.COL_SAT_NAME, '.$this->config->item('table_name').'.COL_SAT_MODE');
$this->db->from('station_profile');
$this->db->join($this->config->item('table_name'),'station_profile.station_id = '.$this->config->item('table_name').'.station_id AND station_profile.eqslqthnickname != ""','left');
$this->db->where($this->config->item('table_name').'.COL_EQSL_QSL_SENT !=', 'Y');