mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Improved handling of Callbook Data

pull/3218/head
Peter Goodhall 2024-10-30 15:13:58 +00:00
rodzic 7fdf83cc36
commit 191f5591ba
2 zmienionych plików z 41 dodań i 22 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

48
application/controllers/User.php
Wyświetl plik

@ -755,23 +755,25 @@ class User extends CI_Controller
$this->input->set_cookie($cookie); $this->input->set_cookie($cookie);
} }
if ($this->session->userdata('user_id') == $this->input->post('id', true)) { if ($this->session->userdata('user_id') == $this->input->post('id', true)) {
// Handle user_callbook_type
if (isset($_POST['user_callbook_type'])) {
$this->user_options_model->set_option('callbook', 'callbook_type', array('value' => $_POST['user_callbook_type']));
} else {
$this->user_options_model->set_option('callbook', 'callbook_type', array('value' => ''));
}
// Handle user_callbook_username
if (isset($_POST['user_callbook_username'])) {
$this->user_options_model->set_option('callbook', 'callbook_username', array('value' => $_POST['user_callbook_username']));
} else {
$this->user_options_model->set_option('callbook', 'callbook_username', array('value' => ''));
}
// Handle user_callbook_password // Handle user_callbook_password
if (isset($_POST['user_callbook_password']) && !empty($_POST['user_callbook_password'])) { if (isset($_POST['user_callbook_password']) && !empty($_POST['user_callbook_password'])) {
// Handle user_callbook_type
if (isset($_POST['user_callbook_type'])) {
$this->user_options_model->set_option('callbook', 'callbook_type', array('value' => $_POST['user_callbook_type']));
} else {
$this->user_options_model->set_option('callbook', 'callbook_type', array('value' => ''));
}
// Handle user_callbook_username
if (isset($_POST['user_callbook_username'])) {
$this->user_options_model->set_option('callbook', 'callbook_username', array('value' => $_POST['user_callbook_username']));
} else {
$this->user_options_model->set_option('callbook', 'callbook_username', array('value' => ''));
}
// Load the encryption library // Load the encryption library
$this->load->library('encryption'); $this->load->library('encryption');
@ -780,6 +782,24 @@ class User extends CI_Controller
// Save the encrypted password // Save the encrypted password
$this->user_options_model->set_option('callbook', 'callbook_password', array('value' => $encrypted_password)); $this->user_options_model->set_option('callbook', 'callbook_password', array('value' => $encrypted_password));
// if callbook type is QRZ
if ($_POST['user_callbook_type'] == 'QRZ') {
// Lookup using QRZ
$this->load->library('qrz');
$qrz_session_key = $this->qrz->session($_POST['user_callbook_username'], $_POST['user_callbook_password']);
$this->session->set_userdata('qrz_session_key', $qrz_session_key);
} elseif ($_POST['user_callbook_type'] == "HamQTH") {
$this->load->library('hamqth');
$hamqth_session_key = $this->hamqth->session($_POST['user_callbook_username'], $_POST['user_callbook_password']);
$this->session->set_userdata('hamqth_session_key', $hamqth_session_key);
}
// Update Session data
$this->session->set_userdata('callbook_type', $_POST['user_callbook_type']);
$this->session->set_userdata('callbook_username', $_POST['user_callbook_username']);
$this->session->set_userdata('callbook_password', $encrypted_password);
} }
if (isset($_POST['user_dashboard_enable_dxpedition_card'])) { if (isset($_POST['user_dashboard_enable_dxpedition_card'])) {

15
application/models/Logbook_model.php
Wyświetl plik

@ -4340,14 +4340,13 @@ class Logbook_model extends CI_Model
public function get_entity($dxcc) public function get_entity($dxcc)
{ {
$sql = "select name, cqz, lat, 'long' from dxcc_entities where adif = " . $dxcc; $sql = "SELECT name, cqz, lat, `long` FROM dxcc_entities WHERE adif = ?";
$query = $this->db->query($sql); $query = $this->db->query($sql, array($dxcc));
if ($query->result() > 0) { if ($query->num_rows() > 0) {
$row = $query->row_array(); return $query->row_array();
return $row; }
} return '';
return '';
} }
/* /*