Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Option to prioritize Database or 3rd party callsign information fetch

Browse Source
This commit is contained in:
Szymon Porwolik
2025-10-30 15:37:20 +01:00
parent c58d095847
commit 8d13be8f90
4 changed files with 55 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
application/controllers/User.php
View File

@@ -226,6 +226,7 @@ class User extends CI_Controller {
$data['user_default_band'] = $this->input->post('user_default_band');
$data['user_default_confirmation'] = ($this->input->post('user_default_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_default_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_default_confirmation_eqsl') !== null ? 'E' : '').($this->input->post('user_default_confirmation_qrz') !== null ? 'Z' : '').($this->input->post('user_default_confirmation_clublog') !== null ? 'C' : '').($this->input->post('user_default_confirmation_dcl') !== null ? 'D' : '');
$data['user_qso_end_times'] = $this->input->post('user_qso_end_times');
$data['user_qso_db_search_priority'] = $this->input->post('user_qso_db_search_priority') ?? 'Y';
$data['user_quicklog'] = $this->input->post('user_quicklog');
$data['user_quicklog_enter'] = $this->input->post('user_quicklog_enter');
$data['user_hamsat_key'] = $this->input->post('user_hamsat_key');
@@ -278,6 +279,7 @@ class User extends CI_Controller {
$this->input->post('user_default_band'),
($this->input->post('user_default_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_default_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_default_confirmation_eqsl') !== null ? 'E' : '').($this->input->post('user_default_confirmation_qrz') !== null ? 'Z' : '').($this->input->post('user_default_confirmation_clublog') !== null ? 'C' : '').($this->input->post('user_default_confirmation_dcl') !== null ? 'D' : ''),
$this->input->post('user_qso_end_times'),
$this->input->post('user_qso_db_search_priority') ?? 'Y',
$this->input->post('user_quicklog'),
$this->input->post('user_quicklog_enter'),
$this->input->post('user_language'),
@@ -358,6 +360,7 @@ class User extends CI_Controller {
$data['user_default_band'] = $this->input->post('user_default_band');
$data['user_default_confirmation'] = ($this->input->post('user_default_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_default_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_default_confirmation_eqsl') !== null ? 'E' : '').($this->input->post('user_default_confirmation_qrz') !== null ? 'Z' : '').($this->input->post('user_default_confirmation_clublog') !== null ? 'C' : '').($this->input->post('user_default_confirmation_dcl') !== null ? 'D' : '');
$data['user_qso_end_times'] = $this->input->post('user_qso_end_times');
$data['user_qso_db_search_priority'] = $this->input->post('user_qso_db_search_priority') ?? 'Y';
$data['user_quicklog'] = $this->input->post('user_quicklog');
$data['user_quicklog_enter'] = $this->input->post('user_quicklog_enter');
$data['user_language'] = $this->input->post('user_language');
@@ -832,6 +835,15 @@ class User extends CI_Controller {
}
}
if($this->input->post('user_qso_db_search_priority')) {
$data['user_qso_db_search_priority'] = $this->input->post('user_qso_db_search_priority', false);
} else {
$qkey_opt=$this->user_options_model->get_options('qso_db_search_priority',array('option_name'=>'enable','option_key'=>'boolean'), $this->uri->segment(3))->result();
if (count($qkey_opt)>0) {
$data['user_qso_db_search_priority'] = $qkey_opt[0]->option_value;
}
}
if($this->input->post('oqrs_direct_auto_matching')) {
$data['oqrs_direct_auto_matching'] = $this->input->post('oqrs_direct_auto_matching', false);
} else {
@@ -999,6 +1011,7 @@ class User extends CI_Controller {
$data['oqrs_grouped_search_show_station_name'] = $this->input->post('oqrs_grouped_search_show_station_name', true);
$data['oqrs_auto_matching'] = $this->input->post('oqrs_auto_matching', true);
$data['oqrs_direct_auto_matching'] = $this->input->post('oqrs_direct_auto_matching', true);
$data['user_qso_db_search_priority'] = $this->input->post('user_qso_db_search_priority', true);
$this->load->view('user/edit');
$this->load->view('interface_assets/footer');