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

Update Logbook.php

pull/3199/head
Peter Goodhall 2024-10-03 15:18:20 +01:00
rodzic 4d9d71b516
commit 4ca1b80ac1
1 zmienionych plików z 20 dodań i 16 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

36
application/controllers/Logbook.php
Wyświetl plik

@ -951,17 +951,21 @@ class Logbook extends CI_Controller {
$qrz_session_key = $this->qrz->session($this->session->userdata('callbook_username'), $decrypted_password); $qrz_session_key = $this->qrz->session($this->session->userdata('callbook_username'), $decrypted_password);
$this->session->set_userdata('qrz_session_key', $qrz_session_key); $this->session->set_userdata('qrz_session_key', $qrz_session_key);
} }
$callsign['callsign'] = $this->qrz->search($id, $this->session->userdata('qrz_session_key'), $this->config->item('use_fullname')); $data['callsign'] = $this->qrz->search($fixedid, $this->session->userdata('qrz_session_key'), $this->config->item('use_fullname'));
if (empty($callsign['callsign']['callsign'])) { if (empty($data['callsign']['callsign'])) {
$qrz_session_key = $this->qrz->session($this->session->userdata('callbook_username'), $decrypted_password); $qrz_session_key = $this->qrz->session($this->session->userdata('callbook_username'), $decrypted_password);
$this->session->set_userdata('qrz_session_key', $qrz_session_key); $this->session->set_userdata('qrz_session_key', $qrz_session_key);
$callsign['callsign'] = $this->qrz->search($id, $this->session->userdata('qrz_session_key'), $this->config->item('use_fullname')); $data['callsign'] = $this->qrz->search($fixedid, $this->session->userdata('qrz_session_key'), $this->config->item('use_fullname'));
} }
if (isset($callsign['callsign']['dxcc'])) { if (isset($data['callsign']['dxcc'])) {
$this->load->model('logbook_model'); $this->load->model('logbook_model');
$entity = $this->logbook_model->get_entity($callsign['callsign']['dxcc']); $entity = $this->logbook_model->get_entity($data['callsign']['dxcc']);
$callsign['callsign']['dxcc_name'] = $entity['name']; $data['callsign']['dxcc_name'] = $entity['name'];
}
if (isset($data['callsign']['gridsquare'])) {
$this->load->model('logbook_model');
$data['grid_worked'] = $this->logbook_model->check_if_grid_worked_in_logbook(strtoupper(substr($data['callsign']['gridsquare'],0,4)), 0, $this->session->userdata('user_default_band'));
} }
} elseif ($this->session->userdata('callbook_type') == "HamQTH") { } elseif ($this->session->userdata('callbook_type') == "HamQTH") {
// Load the HamQTH library // Load the HamQTH library
@ -979,28 +983,28 @@ class Logbook extends CI_Controller {
$this->session->set_userdata('hamqth_session_key', $hamqth_session_key); $this->session->set_userdata('hamqth_session_key', $hamqth_session_key);
} }
$callsign['callsign'] = $this->hamqth->search($id, $this->session->userdata('hamqth_session_key')); $data['callsign'] = $this->hamqth->search($fixedid, $this->session->userdata('hamqth_session_key'));
// If HamQTH session has expired, start a new session and retry the search. // If HamQTH session has expired, start a new session and retry the search.
if($callsign['callsign']['error'] == "Session does not exist or expired") { if($data['callsign']['error'] == "Session does not exist or expired") {
$hamqth_session_key = $this->hamqth->session($this->session->userdata('callbook_username'), $decrypted_password); $hamqth_session_key = $this->hamqth->session($this->session->userdata('callbook_username'), $decrypted_password);
$this->session->set_userdata('hamqth_session_key', $hamqth_session_key); $this->session->set_userdata('hamqth_session_key', $hamqth_session_key);
$callsign['callsign'] = $this->hamqth->search($callsign, $this->session->userdata('hamqth_session_key')); $data['callsign'] = $this->hamqth->search($fixedid, $this->session->userdata('hamqth_session_key'));
} }
if (isset($data['callsign']['gridsquare'])) { if (isset($data['callsign']['gridsquare'])) {
$this->load->model('logbook_model'); $this->load->model('logbook_model');
$callsign['grid_worked'] = $this->logbook_model->check_if_grid_worked_in_logbook(strtoupper(substr($data['callsign']['gridsquare'],0,4)), 0, $this->session->userdata('user_default_band')); $data['grid_worked'] = $this->logbook_model->check_if_grid_worked_in_logbook(strtoupper(substr($data['callsign']['gridsquare'],0,4)), 0, $this->session->userdata('user_default_band'));
} }
if (isset($callsign['callsign']['dxcc'])) { if (isset($data['callsign']['dxcc'])) {
$this->load->model('logbook_model'); $this->load->model('logbook_model');
$entity = $this->logbook_model->get_entity($callsign['callsign']['dxcc']); $entity = $this->logbook_model->get_entity($data['callsign']['dxcc']);
$callsign['callsign']['dxcc_name'] = $entity['name']; $data['callsign']['dxcc_name'] = $entity['name'];
} }
if (isset($callsign['callsign']['error'])) { if (isset($data['callsign']['error'])) {
$callsign['error'] = $callsign['callsign']['error']; $data['error'] = $data['callsign']['error'];
} }
} else { } else {
$callsign['error'] = 'Lookup not configured. Please review configuration.'; $data['error'] = 'Lookup not configured. Please review configuration.';
} }
$data['id'] = strtoupper($id); $data['id'] = strtoupper($id);