From ab14b85065906cf7f582b2e5a55fccc722c0e538 Mon Sep 17 00:00:00 2001 From: Alessio Caiazza Date: Fri, 19 Aug 2022 08:31:21 +0200 Subject: [PATCH 1/2] Fix eQSL upload for linked account When uploading QSOs for a linked account the username must match the station callsign. i.e. when operating portable it should be callsign/p --- application/controllers/Eqsl.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/application/controllers/Eqsl.php b/application/controllers/Eqsl.php index 1ece31f3..b83cb6bb 100644 --- a/application/controllers/Eqsl.php +++ b/application/controllers/Eqsl.php @@ -149,7 +149,7 @@ class eqsl extends CI_Controller { $active_station_id = $this->stations->find_active(); $station_profile = $this->stations->profile($active_station_id); $active_station_info = $station_profile->row(); - // Query the logbook to determine when the last LoTW confirmation was + // Query the logbook to determine when the last eQSL confirmation was $eqsl_last_qsl_date = $this->logbook_model->eqsl_last_qsl_rcvd_date(); // Build parameters for eQSL inbox file @@ -307,6 +307,11 @@ class eqsl extends CI_Controller { // Build out the ADIF info string according to specs http://eqsl.cc/qslcard/ADIFContentSpecs.cfm foreach ($qslsnotsent->result_array() as $qsl) { + // eQSL username changes for linked account. + // i.e. when operating /P it must be callsign/p + // the password, however, is always the same as the main account + $data['user_eqsl_name'] = $qsl['station_callsign']; + $COL_QSO_DATE = date('Ymd',strtotime($qsl['COL_TIME_ON'])); $COL_TIME_ON = date('Hi',strtotime($qsl['COL_TIME_ON'])); From 8be01e52d89ff562911e5f82a06aac223a0aaa00 Mon Sep 17 00:00:00 2001 From: Alessio Caiazza Date: Wed, 24 Aug 2022 17:44:05 +0200 Subject: [PATCH 2/2] Fix join type for stations with eQSL QTH nickname but no QSO --- application/models/Logbook_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index f06cda11..8242a4fc 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -2152,7 +2152,7 @@ class Logbook_model extends CI_Model { 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->config->item('table_name').'.COL_SAT_NAME, '.$this->config->item('table_name').'.COL_SAT_MODE, '.$this->config->item('table_name').'.COL_QSLMSG'); $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->join($this->config->item('table_name'),'station_profile.station_id = '.$this->config->item('table_name').'.station_id AND station_profile.eqslqthnickname != ""','right'); $this->db->where($this->config->item('table_name').'.COL_CALL !=', ''); $this->db->where($this->config->item('table_name').'.COL_EQSL_QSL_SENT !=', 'Y'); $this->db->where($this->config->item('table_name').'.COL_EQSL_QSL_SENT !=', 'I');