Added QTH Nickname to eQSLs Import because its api is rubbish and doesn't allow ALL

这个提交包含在:
Peter Goodhall 2019-10-18 15:51:29 +01:00
父节点 e328a0212f
当前提交 c2311e7481

查看文件

@ -108,16 +108,16 @@ class eqsl extends CI_Controller {
if ($this->input->post('eqslimport') == 'fetch') if ($this->input->post('eqslimport') == 'fetch')
{ {
echo "import from clublog ADIF"; echo "import from clublog ADIF<br>";
$file = $config['upload_path'] . 'eqslreport_download.adi'; $file = $config['upload_path'] . 'eqslreport_download.adi';
echo "Download File: ".$file; echo "<br>Download File: ".$file."<br>";
// Get credentials for eQSL // Get credentials for eQSL
$query = $this->user_model->get_by_id($this->session->userdata('user_id')); $query = $this->user_model->get_by_id($this->session->userdata('user_id'));
$q = $query->row(); $q = $query->row();
$data['user_eqsl_name'] = $q->user_eqsl_name; $data['user_eqsl_name'] = $q->user_eqsl_name;
$data['user_eqsl_password'] = $q->user_eqsl_password; $data['user_eqsl_password'] = $q->user_eqsl_password;
echo "Username".$data['user_eqsl_name']; echo "<br>Username".$data['user_eqsl_name']."<br>";
// Get URL for downloading the eqsl.cc inbox // Get URL for downloading the eqsl.cc inbox
$query = $query = $this->db->query('SELECT eqsl_download_url FROM config'); $query = $query = $this->db->query('SELECT eqsl_download_url FROM config');
@ -130,6 +130,8 @@ class eqsl extends CI_Controller {
$this->session->set_flashdata('warning', 'You have not defined your eQSL.cc credentials!'); redirect('eqsl/import'); $this->session->set_flashdata('warning', 'You have not defined your eQSL.cc credentials!'); redirect('eqsl/import');
} }
$this->load->model('stations');
$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 LoTW confirmation was
$eqsl_last_qsl_date = $this->logbook_model->eqsl_last_qsl_rcvd_date(); $eqsl_last_qsl_date = $this->logbook_model->eqsl_last_qsl_rcvd_date();
@ -139,6 +141,7 @@ class eqsl extends CI_Controller {
$eqsl_url .= "&Password=" . $data['user_eqsl_password']; $eqsl_url .= "&Password=" . $data['user_eqsl_password'];
$eqsl_url .= "&RcvdSince=" . $eqsl_last_qsl_date; $eqsl_url .= "&RcvdSince=" . $eqsl_last_qsl_date;
$eqsl_url .= "&QTHNickname=" . $active_station_info['eqslqthnickname'];
// Pull back only confirmations // Pull back only confirmations
$eqsl_url .= "&ConfirmedOnly=1"; $eqsl_url .= "&ConfirmedOnly=1";