diff --git a/application/controllers/Eqsl.php b/application/controllers/Eqsl.php index 768e93c4..0852b6df 100644 --- a/application/controllers/Eqsl.php +++ b/application/controllers/Eqsl.php @@ -106,9 +106,10 @@ class eqsl extends CI_Controller { // Get credentials for eQSL $query = $this->user_model->get_by_id($this->session->userdata('user_id')); - $q = $query->row(); - $data['user_eqsl_name'] = $q->user_eqsl_name; + $q = $query->row(); + $data['user_eqsl_name'] = $q->user_eqsl_name; $data['user_eqsl_password'] = $q->user_eqsl_password; + $data['user_eqsl_qth_nickname'] = $q->user_eqsl_qth_nickname; // Get URL for downloading the eqsl.cc inbox $query = $query = $this->db->query('SELECT eqsl_download_url FROM config'); @@ -128,6 +129,11 @@ class eqsl extends CI_Controller { $eqsl_url .= "?"; $eqsl_url .= "UserName=" . $data['user_eqsl_name']; $eqsl_url .= "&Password=" . $data['user_eqsl_password']; + + if ($data['user_eqsl_qth_nickname'] != '') + { + $eqsl_url .= "&QTHNickname=" . $data['user_eqsl_qth_nickname']; + } $eqsl_url .= "&RcvdSince=" . $eqsl_last_qsl_date; diff --git a/application/controllers/User.php b/application/controllers/User.php index fc720cd9..44a9f7a0 100644 --- a/application/controllers/User.php +++ b/application/controllers/User.php @@ -214,6 +214,12 @@ class User extends CI_Controller { $data['user_eqsl_password'] = $q->user_eqsl_password; } + if($this->input->post('user_eqsl_qth_nickname')) { + $data['user_eqsl_qth_nickname'] = $this->input->post('user_eqsl_qth_nickname'); + } else { + $data['user_eqsl_qth_nickname'] = $q->user_eqsl_qth_nickname; + } + $this->load->view('user/edit', $data); $this->load->view('layout/footer'); } diff --git a/application/models/User_model.php b/application/models/User_model.php index a0444ba3..ee4fd035 100644 --- a/application/models/User_model.php +++ b/application/models/User_model.php @@ -124,7 +124,8 @@ class User_Model extends CI_Model { 'user_lastname' => $fields['user_lastname'], 'user_timezone' => $fields['user_timezone'], 'user_lotw_name' => $fields['user_lotw_name'], - 'user_eqsl_name' => $fields['user_eqsl_name'] + 'user_eqsl_name' => $fields['user_eqsl_name'], + 'user_eqsl_qth_nickname' => $fields['user_eqsl_qth_nickname'] ); // Check to see if the user is allowed to change user levels @@ -213,14 +214,15 @@ class User_Model extends CI_Model { $u = $this->get_by_id($id); $userdata = array( - 'user_id' => $u->row()->user_id, - 'user_name' => $u->row()->user_name, - 'user_type' => $u->row()->user_type, - 'user_callsign' => $u->row()->user_callsign, - 'user_locator' => $u->row()->user_locator, - 'user_lotw_name' => $u->row()->user_lotw_name, - 'user_eqsl_name' => $u->row()->user_eqsl_name, - 'user_hash' => $this->_hash($u->row()->user_id."-".$u->row()->user_type) + 'user_id' => $u->row()->user_id, + 'user_name' => $u->row()->user_name, + 'user_type' => $u->row()->user_type, + 'user_callsign' => $u->row()->user_callsign, + 'user_locator' => $u->row()->user_locator, + 'user_lotw_name' => $u->row()->user_lotw_name, + 'user_eqsl_name' => $u->row()->user_eqsl_name, + 'user_eqsl_qth_nickname' => $u->row()->user_eqsl_qth_nickname, + 'user_hash' => $this->_hash($u->row()->user_id."-".$u->row()->user_type) ); $this->session->set_userdata($userdata); diff --git a/application/views/eqsl/import.php b/application/views/eqsl/import.php index 31c0ecfa..3a13b9c8 100644 --- a/application/views/eqsl/import.php +++ b/application/views/eqsl/import.php @@ -15,7 +15,7 @@
Cloudlog will use the eQSL username an password stored in your user profile to download confirmations from eQSL for you. We will only download confirmations received since your last eQSL confirmed QSO.
+Cloudlog will use the eQSL username and password stored in your user profile to download confirmations from eQSL for you. We will only download confirmations received since your last eQSL confirmed QSO.
Cloudlog will use the LoTW username an password stored in your user profile to download a report from LoTW for you. The report Cloudlog downloads will have all confirmations since your last LoTW confirmation, up until now.
+Cloudlog will use the LoTW username and password stored in your user profile to download a report from LoTW for you. The report Cloudlog downloads will have all confirmations since your last LoTW confirmation, up until now.