goodspeed/Cloudlog
1
0
派生 0
代码 工单 合并请求 项目 版本发布 软件包 百科 动态 Actions

Rename default band and confirmation values in DB

浏览代码
这个提交包含在：
phl0 2023-10-16 22:39:33 +02:00
父节点 e2fa2ec274
当前提交 886829ba42
找不到此签名对应的密钥
GPG 密钥 ID: 48EA1E640798CA9A
共有 14 个文件被更改，包括 116 次插入 和 82 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

2
application/config/migration.php
查看文件

@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE;
| |
*/ */
$config['migration_version'] = 144; $config['migration_version'] = 145;
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

4
application/controllers/Activated_gridmap.php
查看文件

@ -19,8 +19,8 @@ class Activated_gridmap extends CI_Controller {
$data['bands'] = $this->bands->get_worked_bands(); $data['bands'] = $this->bands->get_worked_bands();
$data['sats_available'] = $this->bands->get_worked_sats(); $data['sats_available'] = $this->bands->get_worked_sats();
$data['user_gridmap_default_band'] = $this->session->userdata('user_gridmap_default_band'); $data['user_default_band'] = $this->session->userdata('user_default_band');
$data['user_gridmap_confirmation'] = $this->session->userdata('user_gridmap_confirmation'); $data['user_default_confirmation'] = $this->session->userdata('user_default_confirmation');
$data['layer'] = $this->optionslib->get_option('option_map_tile_server'); $data['layer'] = $this->optionslib->get_option('option_map_tile_server');

4
application/controllers/Gridmap.php
查看文件

@ -19,8 +19,8 @@ class Gridmap extends CI_Controller {
$data['bands'] = $this->bands->get_worked_bands(); $data['bands'] = $this->bands->get_worked_bands();
$data['sats_available'] = $this->bands->get_worked_sats(); $data['sats_available'] = $this->bands->get_worked_sats();
$data['user_gridmap_default_band'] = $this->session->userdata('user_gridmap_default_band'); $data['user_default_band'] = $this->session->userdata('user_default_band');
$data['user_gridmap_confirmation'] = $this->session->userdata('user_gridmap_confirmation'); $data['user_default_confirmation'] = $this->session->userdata('user_default_confirmation');
$data['layer'] = $this->optionslib->get_option('option_map_tile_server'); $data['layer'] = $this->optionslib->get_option('option_map_tile_server');

32
application/controllers/Logbook.php
查看文件

@ -201,20 +201,20 @@ class Logbook extends CI_Controller {
$CI =& get_instance(); $CI =& get_instance();
$CI->load->model('logbooks_model'); $CI->load->model('logbooks_model');
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
$user_gridmap_confirmation = $this->session->userdata('user_gridmap_confirmation'); $user_default_confirmation = $this->session->userdata('user_default_confirmation');
if(!empty($logbooks_locations_array)) { if(!empty($logbooks_locations_array)) {
$extrawhere=''; $extrawhere='';
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'Q') !== false) { if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) {
$extrawhere="COL_QSL_RCVD='Y'"; $extrawhere="COL_QSL_RCVD='Y'";
} }
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'L') !== false) { if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) {
if ($extrawhere!='') { if ($extrawhere!='') {
$extrawhere.=" OR"; $extrawhere.=" OR";
} }
$extrawhere.=" COL_LOTW_QSL_RCVD='Y'"; $extrawhere.=" COL_LOTW_QSL_RCVD='Y'";
} }
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'E') !== false) { if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'E') !== false) {
if ($extrawhere!='') { if ($extrawhere!='') {
$extrawhere.=" OR"; $extrawhere.=" OR";
} }
@ -304,7 +304,7 @@ function worked_grid_before($gridsquare, $type, $band, $mode)
"workedBefore" => false, "workedBefore" => false,
"confirmed" => false, "confirmed" => false,
]; ];
$user_gridmap_confirmation = $this->session->userdata('user_gridmap_confirmation'); $user_default_confirmation = $this->session->userdata('user_default_confirmation');
$CI =& get_instance(); $CI =& get_instance();
$CI->load->model('logbooks_model'); $CI->load->model('logbooks_model');
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
@ -330,16 +330,16 @@ function worked_grid_before($gridsquare, $type, $band, $mode)
$extrawhere=''; $extrawhere='';
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'Q') !== false) { if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) {
$extrawhere="COL_QSL_RCVD='Y'"; $extrawhere="COL_QSL_RCVD='Y'";
} }
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'L') !== false) { if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) {
if ($extrawhere!='') { if ($extrawhere!='') {
$extrawhere.=" OR"; $extrawhere.=" OR";
} }
$extrawhere.=" COL_LOTW_QSL_RCVD='Y'"; $extrawhere.=" COL_LOTW_QSL_RCVD='Y'";
} }
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'E') !== false) { if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'E') !== false) {
if ($extrawhere!='') { if ($extrawhere!='') {
$extrawhere.=" OR"; $extrawhere.=" OR";
} }
@ -386,7 +386,7 @@ function worked_grid_before($gridsquare, $type, $band, $mode)
"confirmed" => false, "confirmed" => false,
]; ];
$user_gridmap_confirmation = $this->session->userdata('user_gridmap_confirmation'); $user_default_confirmation = $this->session->userdata('user_default_confirmation');
$CI =& get_instance(); $CI =& get_instance();
$CI->load->model('logbooks_model'); $CI->load->model('logbooks_model');
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
@ -412,16 +412,16 @@ function worked_grid_before($gridsquare, $type, $band, $mode)
} }
$extrawhere=''; $extrawhere='';
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'Q') !== false) { if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) {
$extrawhere="COL_QSL_RCVD='Y'"; $extrawhere="COL_QSL_RCVD='Y'";
} }
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'L') !== false) { if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) {
if ($extrawhere!='') { if ($extrawhere!='') {
$extrawhere.=" OR"; $extrawhere.=" OR";
} }
$extrawhere.=" COL_LOTW_QSL_RCVD='Y'"; $extrawhere.=" COL_LOTW_QSL_RCVD='Y'";
} }
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'E') !== false) { if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'E') !== false) {
if ($extrawhere!='') { if ($extrawhere!='') {
$extrawhere.=" OR"; $extrawhere.=" OR";
} }
@ -481,7 +481,7 @@ function worked_grid_before($gridsquare, $type, $band, $mode)
"confirmed" => false, "confirmed" => false,
]; ];
$user_gridmap_confirmation = $this->session->userdata('user_gridmap_confirmation'); $user_default_confirmation = $this->session->userdata('user_default_confirmation');
$CI =& get_instance(); $CI =& get_instance();
$CI->load->model('logbooks_model'); $CI->load->model('logbooks_model');
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
@ -507,16 +507,16 @@ function worked_grid_before($gridsquare, $type, $band, $mode)
} }
$extrawhere=''; $extrawhere='';
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'Q') !== false) { if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) {
$extrawhere="COL_QSL_RCVD='Y'"; $extrawhere="COL_QSL_RCVD='Y'";
} }
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'L') !== false) { if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) {
if ($extrawhere!='') { if ($extrawhere!='') {
$extrawhere.=" OR"; $extrawhere.=" OR";
} }
$extrawhere.=" COL_LOTW_QSL_RCVD='Y'"; $extrawhere.=" COL_LOTW_QSL_RCVD='Y'";
} }
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'E') !== false) { if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'E') !== false) {
if ($extrawhere!='') { if ($extrawhere!='') {
$extrawhere.=" OR"; $extrawhere.=" OR";
} }

2
application/controllers/Qso.php
查看文件

@ -38,7 +38,7 @@ class QSO extends CI_Controller {
$data['iota'] = $this->logbook_model->fetchIota(); $data['iota'] = $this->logbook_model->fetchIota();
$data['modes'] = $this->modes->active(); $data['modes'] = $this->modes->active();
$data['bands'] = $this->bands->get_user_bands_for_qso_entry(); $data['bands'] = $this->bands->get_user_bands_for_qso_entry();
$data['user_gridmap_default_band'] = $this->session->userdata('user_gridmap_default_band'); $data['user_default_band'] = $this->session->userdata('user_default_band');
$data['sat_active'] = array_search("SAT", $this->bands->get_user_bands(), true); $data['sat_active'] = array_search("SAT", $this->bands->get_user_bands(), true);
$this->load->library('form_validation'); $this->load->library('form_validation');

28
application/controllers/User.php
查看文件

@ -88,8 +88,8 @@ class User extends CI_Controller {
$data['user_previous_qsl_type'] = $this->input->post('user_previous_qsl_type'); $data['user_previous_qsl_type'] = $this->input->post('user_previous_qsl_type');
$data['user_amsat_status_upload'] = $this->input->post('user_amsat_status_upload'); $data['user_amsat_status_upload'] = $this->input->post('user_amsat_status_upload');
$data['user_mastodon_url'] = $this->input->post('user_mastodon_url'); $data['user_mastodon_url'] = $this->input->post('user_mastodon_url');
$data['user_gridmap_default_band'] = $this->input->post('user_gridmap_default_band'); $data['user_default_band'] = $this->input->post('user_default_band');
$data['user_gridmap_confirmation'] = ($this->input->post('user_gridmap_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_gridmap_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_gridmap_confirmation_eqsl') !== null ? 'E' : ''); $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' : '');
$data['language'] = $this->input->post('language'); $data['language'] = $this->input->post('language');
$this->load->view('user/add', $data); $this->load->view('user/add', $data);
} else { } else {
@ -123,8 +123,8 @@ class User extends CI_Controller {
$this->input->post('user_previous_qsl_type'), $this->input->post('user_previous_qsl_type'),
$this->input->post('user_amsat_status_upload'), $this->input->post('user_amsat_status_upload'),
$this->input->post('user_mastodon_url'), $this->input->post('user_mastodon_url'),
$this->input->post('user_gridmap_default_band'), $this->input->post('user_default_band'),
($this->input->post('user_gridmap_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_gridmap_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_gridmap_confirmation_eqsl') !== null ? 'E' : ''), ($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('language'), $this->input->post('language'),
)) { )) {
// Check for errors // Check for errors
@ -170,8 +170,8 @@ class User extends CI_Controller {
$data['user_previous_qsl_type'] = $this->input->post('user_previous_qsl_type'); $data['user_previous_qsl_type'] = $this->input->post('user_previous_qsl_type');
$data['user_amsat_status_upload'] = $this->input->post('user_amsat_status_upload'); $data['user_amsat_status_upload'] = $this->input->post('user_amsat_status_upload');
$data['user_mastodon_url'] = $this->input->post('user_mastodon_url'); $data['user_mastodon_url'] = $this->input->post('user_mastodon_url');
$data['user_gridmap_default_band'] = $this->input->post('user_gridmap_default_band'); $data['user_default_band'] = $this->input->post('user_default_band');
$data['user_gridmap_confirmation'] = ($this->input->post('user_gridmap_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_gridmap_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_gridmap_confirmation_eqsl') !== null ? 'E' : ''); $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' : '');
$data['language'] = $this->input->post('language'); $data['language'] = $this->input->post('language');
$this->load->view('user/add', $data); $this->load->view('user/add', $data);
$this->load->view('interface_assets/footer'); $this->load->view('interface_assets/footer');
@ -413,16 +413,16 @@ class User extends CI_Controller {
$data['user_mastodon_url'] = $q->user_mastodon_url; $data['user_mastodon_url'] = $q->user_mastodon_url;
} }
if($this->input->post('user_gridmap_default_band')) { if($this->input->post('user_default_band')) {
$data['user_gridmap_default_band'] = $this->input->post('user_gridmap_default_band', false); $data['user_default_band'] = $this->input->post('user_default_band', false);
} else { } else {
$data['user_gridmap_default_band'] = $q->user_gridmap_default_band; $data['user_default_band'] = $q->user_default_band;
} }
if($this->input->post('user_gridmap_confirmation')) { if($this->input->post('user_default_confirmation')) {
$data['user_gridmap_confirmation'] = ($this->input->post('user_gridmap_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_gridmap_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_gridmap_confirmation_eqsl') !== null ? 'E' : ''); $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' : '');
} else { } else {
$data['user_gridmap_confirmation'] = $q->user_gridmap_confirmation; $data['user_default_confirmation'] = $q->user_default_confirmation;
} }
if($this->input->post('user_column1')) { if($this->input->post('user_column1')) {
@ -527,8 +527,8 @@ class User extends CI_Controller {
$data['user_previous_qsl_type'] = $this->input->post('user_previous_qsl_type'); $data['user_previous_qsl_type'] = $this->input->post('user_previous_qsl_type');
$data['user_amsat_status_upload'] = $this->input->post('user_amsat_status_upload'); $data['user_amsat_status_upload'] = $this->input->post('user_amsat_status_upload');
$data['user_mastodon_url'] = $this->input->post('user_mastodon_url'); $data['user_mastodon_url'] = $this->input->post('user_mastodon_url');
$data['user_gridmap_default_band'] = $this->input->post('user_gridmap_default_band'); $data['user_default_band'] = $this->input->post('user_default_band');
$data['user_gridmap_confirmation'] = ($this->input->post('user_gridmap_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_gridmap_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_gridmap_confirmation_eqsl') !== null ? 'E' : ''); $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' : '');
$data['language'] = $this->input->post('language'); $data['language'] = $this->input->post('language');
$data['user_winkey'] = $this->input->post('user_winkey'); $data['user_winkey'] = $this->input->post('user_winkey');
$this->load->view('user/edit'); $this->load->view('user/edit');

34
application/migrations/145_rename_gridmap_variables.php 普通文件
查看文件

@ -0,0 +1,34 @@
<?php
defined('BASEPATH') OR exit('No direct script access allowed');
/**
* Class Migration_rename_gridmap_variables
*
* Renames the default band and confirmation variables
* in order to use them more generally
*
*/
class Migration_rename_gridmap_variables extends CI_Migration {
public function up()
{
if ($this->db->field_exists('user_gridmap_default_band', 'users')) {
$this->db->query("ALTER TABLE `users` CHANGE `user_gridmap_default_band` `user_default_band` VARCHAR(10) DEFAULT NULL;");
}
if ($this->db->field_exists('user_default_confirmation', 'users')) {
$this->db->query("ALTER TABLE `users` CHANGE `user_default_confirmation` `user_default_confirmation` VARCHAR(3) DEFAULT NULL;");
}
}
public function down()
{
if ($this->db->field_exists('user_default_band', 'users')) {
$this->db->query("ALTER TABLE `users` CHANGE `user_default_band` `user_gridmap_default_band` VARCHAR(10) DEFAULT NULL;");
}
if ($this->db->field_exists('user_default_confirmation', 'users')) {
$this->db->query("ALTER TABLE `users` CHANGE `user_default_confirmation` `user_default_confirmation` VARCHAR(3) DEFAULT NULL;");
}
}
}

8
application/models/Logbook_model.php
查看文件

@ -1688,7 +1688,7 @@ class Logbook_model extends CI_Model {
} }
function check_if_callsign_cnfmd_in_logbook($callsign, $StationLocationsArray = null, $band = null) { function check_if_callsign_cnfmd_in_logbook($callsign, $StationLocationsArray = null, $band = null) {
$user_gridmap_confirmation = $this->session->userdata('user_gridmap_confirmation'); $user_default_confirmation = $this->session->userdata('user_default_confirmation');
if($StationLocationsArray == null) { if($StationLocationsArray == null) {
$CI =& get_instance(); $CI =& get_instance();
@ -1699,16 +1699,16 @@ class Logbook_model extends CI_Model {
} }
$extrawhere=''; $extrawhere='';
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'Q') !== false) { if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) {
$extrawhere="COL_QSL_RCVD='Y'"; $extrawhere="COL_QSL_RCVD='Y'";
} }
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'L') !== false) { if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) {
if ($extrawhere!='') { if ($extrawhere!='') {
$extrawhere.=" OR"; $extrawhere.=" OR";
} }
$extrawhere.=" COL_LOTW_QSL_RCVD='Y'"; $extrawhere.=" COL_LOTW_QSL_RCVD='Y'";
} }
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'E') !== false) { if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'E') !== false) {
if ($extrawhere!='') { if ($extrawhere!='') {
$extrawhere.=" OR"; $extrawhere.=" OR";
} }

14
application/models/User_model.php
查看文件

@ -124,7 +124,7 @@ class User_Model extends CI_Model {
$measurement, $user_date_format, $user_stylesheet, $user_qth_lookup, $user_sota_lookup, $user_wwff_lookup, $measurement, $user_date_format, $user_stylesheet, $user_qth_lookup, $user_sota_lookup, $user_wwff_lookup,
$user_pota_lookup, $user_show_notes, $user_column1, $user_column2, $user_column3, $user_column4, $user_column5, $user_pota_lookup, $user_show_notes, $user_column1, $user_column2, $user_column3, $user_column4, $user_column5,
$user_show_profile_image, $user_previous_qsl_type, $user_amsat_status_upload, $user_mastodon_url, $user_show_profile_image, $user_previous_qsl_type, $user_amsat_status_upload, $user_mastodon_url,
$user_gridmap_default_band, $user_gridmap_confirmation, $language) { $user_default_band, $user_default_confirmation, $language) {
// Check that the user isn't already used // Check that the user isn't already used
if(!$this->exists($username)) { if(!$this->exists($username)) {
$data = array( $data = array(
@ -154,8 +154,8 @@ class User_Model extends CI_Model {
'user_previous_qsl_type' => xss_clean($user_previous_qsl_type), 'user_previous_qsl_type' => xss_clean($user_previous_qsl_type),
'user_amsat_status_upload' => xss_clean($user_amsat_status_upload), 'user_amsat_status_upload' => xss_clean($user_amsat_status_upload),
'user_mastodon_url' => xss_clean($user_mastodon_url), 'user_mastodon_url' => xss_clean($user_mastodon_url),
'user_gridmap_default_band' => xss_clean($user_gridmap_default_band), 'user_default_band' => xss_clean($user_default_band),
'user_gridmap_confirmation' => xss_clean($user_gridmap_confirmation), 'user_default_confirmation' => xss_clean($user_default_confirmation),
'language' => xss_clean($language), 'language' => xss_clean($language),
); );
@ -215,8 +215,8 @@ class User_Model extends CI_Model {
'user_previous_qsl_type' => xss_clean($fields['user_previous_qsl_type']), 'user_previous_qsl_type' => xss_clean($fields['user_previous_qsl_type']),
'user_amsat_status_upload' => xss_clean($fields['user_amsat_status_upload']), 'user_amsat_status_upload' => xss_clean($fields['user_amsat_status_upload']),
'user_mastodon_url' => xss_clean($fields['user_mastodon_url']), 'user_mastodon_url' => xss_clean($fields['user_mastodon_url']),
'user_gridmap_default_band' => xss_clean($fields['user_gridmap_default_band']), 'user_default_band' => xss_clean($fields['user_default_band']),
'user_gridmap_confirmation' => (isset($fields['user_gridmap_confirmation_qsl']) ? 'Q' : '').(isset($fields['user_gridmap_confirmation_lotw']) ? 'L' : '').(isset($fields['user_gridmap_confirmation_eqsl']) ? 'E' : ''), 'user_default_confirmation' => (isset($fields['user_default_confirmation_qsl']) ? 'Q' : '').(isset($fields['user_default_confirmation_lotw']) ? 'L' : '').(isset($fields['user_default_confirmation_eqsl']) ? 'E' : ''),
'language' => xss_clean($fields['language']), 'language' => xss_clean($fields['language']),
'winkey' => xss_clean($fields['user_winkey']), 'winkey' => xss_clean($fields['user_winkey']),
); );
@ -341,8 +341,8 @@ class User_Model extends CI_Model {
'user_previous_qsl_type' => isset($u->row()->user_previous_qsl_type) ? $u->row()->user_previous_qsl_type: 0, 'user_previous_qsl_type' => isset($u->row()->user_previous_qsl_type) ? $u->row()->user_previous_qsl_type: 0,
'user_amsat_status_upload' => isset($u->row()->user_amsat_status_upload) ? $u->row()->user_amsat_status_upload: 0, 'user_amsat_status_upload' => isset($u->row()->user_amsat_status_upload) ? $u->row()->user_amsat_status_upload: 0,
'user_mastodon_url' => $u->row()->user_mastodon_url, 'user_mastodon_url' => $u->row()->user_mastodon_url,
'user_gridmap_default_band' => $u->row()->user_gridmap_default_band, 'user_default_band' => $u->row()->user_default_band,
'user_gridmap_confirmation' => $u->row()->user_gridmap_confirmation, 'user_default_confirmation' => $u->row()->user_default_confirmation,
'active_station_logbook' => $u->row()->active_station_logbook, 'active_station_logbook' => $u->row()->active_station_logbook,
'language' => isset($u->row()->language) ? $u->row()->language: 'english', 'language' => isset($u->row()->language) ? $u->row()->language: 'english',
'isWinkeyEnabled' => $u->row()->winkey, 'isWinkeyEnabled' => $u->row()->winkey,

10
application/views/activated_gridmap/index.php
查看文件

@ -52,7 +52,7 @@
<option value="All">All</option> <option value="All">All</option>
<?php foreach($bands as $band) { <?php foreach($bands as $band) {
echo '<option value="'.$band.'"'; echo '<option value="'.$band.'"';
if ($user_gridmap_default_band == $band) { if ($user_default_band == $band) {
echo ' selected="selected"'; echo ' selected="selected"';
} }
echo '>'.$band.'</option>'."\n"; echo '>'.$band.'</option>'."\n";
@ -60,7 +60,7 @@
</select> </select>
<?php if (count($sats_available) != 0) { ?> <?php if (count($sats_available) != 0) { ?>
<label class="my-1 mr-2" for="distplot_sats"><?php echo lang('gridsquares_sat'); ?></label> <label class="my-1 mr-2" for="distplot_sats"><?php echo lang('gridsquares_sat'); ?></label>
<select class="custom-select my-1 mr-sm-2" id="sats" <?php if ($user_gridmap_default_band != "SAT") { ?>disabled<?php } ?>> <select class="custom-select my-1 mr-sm-2" id="sats" <?php if ($user_default_band != "SAT") { ?>disabled<?php } ?>>
<option value="All">All</option> <option value="All">All</option>
<?php foreach($sats_available as $sat) { <?php foreach($sats_available as $sat) {
echo '<option value="' . $sat . '"' . '>' . $sat . '</option>'."\n"; echo '<option value="' . $sat . '"' . '>' . $sat . '</option>'."\n";
@ -84,7 +84,7 @@
<div> <div>
<div class="form-check-inline"> <div class="form-check-inline">
<?php echo '<input class="form-check-input" type="checkbox" name="qsl" id="qsl"'; <?php echo '<input class="form-check-input" type="checkbox" name="qsl" id="qsl"';
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'Q') !== false) { if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) {
echo ' checked' ; echo ' checked' ;
} }
echo '>'; ?> echo '>'; ?>
@ -92,7 +92,7 @@
</div> </div>
<div class="form-check-inline"> <div class="form-check-inline">
<?php echo '<input class="form-check-input" type="checkbox" name="lotw" id="lotw"'; <?php echo '<input class="form-check-input" type="checkbox" name="lotw" id="lotw"';
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'L') !== false) { if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) {
echo ' checked' ; echo ' checked' ;
} }
echo '>'; ?> echo '>'; ?>
@ -100,7 +100,7 @@
</div> </div>
<div class="form-check-inline"> <div class="form-check-inline">
<?php echo '<input class="form-check-input" type="checkbox" name="eqsl" id="eqsl"'; <?php echo '<input class="form-check-input" type="checkbox" name="eqsl" id="eqsl"';
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'E') !== false) { if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'E') !== false) {
echo ' checked' ; echo ' checked' ;
} }
echo '>'; ?> echo '>'; ?>

10
application/views/gridmap/index.php
查看文件

@ -52,7 +52,7 @@
<option value="All">All</option> <option value="All">All</option>
<?php foreach($bands as $band) { <?php foreach($bands as $band) {
echo '<option value="'.$band.'"'; echo '<option value="'.$band.'"';
if ($user_gridmap_default_band == $band) { if ($user_default_band == $band) {
echo ' selected="selected"'; echo ' selected="selected"';
} }
echo '>'.$band.'</option>'."\n"; echo '>'.$band.'</option>'."\n";
@ -60,7 +60,7 @@
</select> </select>
<?php if (count($sats_available) != 0) { ?> <?php if (count($sats_available) != 0) { ?>
<label class="my-1 mr-2" for="distplot_sats"><?php echo lang('gridsquares_sat'); ?></label> <label class="my-1 mr-2" for="distplot_sats"><?php echo lang('gridsquares_sat'); ?></label>
<select class="custom-select my-1 mr-sm-2" id="sats" <?php if ($user_gridmap_default_band != "SAT") { ?>disabled<?php } ?>> <select class="custom-select my-1 mr-sm-2" id="sats" <?php if ($user_default_band != "SAT") { ?>disabled<?php } ?>>
<option value="All">All</option> <option value="All">All</option>
<?php foreach($sats_available as $sat) { <?php foreach($sats_available as $sat) {
echo '<option value="' . $sat . '"' . '>' . $sat . '</option>'."\n"; echo '<option value="' . $sat . '"' . '>' . $sat . '</option>'."\n";
@ -84,7 +84,7 @@
<div> <div>
<div class="form-check-inline"> <div class="form-check-inline">
<?php echo '<input class="form-check-input" type="checkbox" name="qsl" id="qsl"'; <?php echo '<input class="form-check-input" type="checkbox" name="qsl" id="qsl"';
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'Q') !== false) { if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) {
echo ' checked' ; echo ' checked' ;
} }
echo '>'; ?> echo '>'; ?>
@ -92,7 +92,7 @@
</div> </div>
<div class="form-check-inline"> <div class="form-check-inline">
<?php echo '<input class="form-check-input" type="checkbox" name="lotw" id="lotw"'; <?php echo '<input class="form-check-input" type="checkbox" name="lotw" id="lotw"';
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'L') !== false) { if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) {
echo ' checked' ; echo ' checked' ;
} }
echo '>'; ?> echo '>'; ?>
@ -100,7 +100,7 @@
</div> </div>
<div class="form-check-inline"> <div class="form-check-inline">
<?php echo '<input class="form-check-input" type="checkbox" name="eqsl" id="eqsl"'; <?php echo '<input class="form-check-input" type="checkbox" name="eqsl" id="eqsl"';
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'E') !== false) { if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'E') !== false) {
echo ' checked' ; echo ' checked' ;
} }
echo '>'; ?> echo '>'; ?>

2
application/views/qso/index.php
查看文件

@ -107,7 +107,7 @@
echo '<optgroup label="' . strtoupper($key) . '">'; echo '<optgroup label="' . strtoupper($key) . '">';
foreach($bandgroup as $band) { foreach($bandgroup as $band) {
echo '<option value="' . $band . '"'; echo '<option value="' . $band . '"';
if ($this->session->userdata('band') == $band || $user_gridmap_default_band == $band) { if ($this->session->userdata('band') == $band || $user_default_band == $band) {
echo ' selected'; echo ' selected';
} }
echo '>' . $band . '</option>'."\n"; echo '>' . $band . '</option>'."\n";

24
application/views/user/add.php
查看文件

@ -550,13 +550,13 @@
</div> </div>
<div class="card-body"> <div class="card-body">
<div class="form-group"> <div class="form-group">
<label for="user_gridmap_default_band"><?php echo lang('account_gridmap_default_band'); ?></label> <label for="user_default_band"><?php echo lang('account_gridmap_default_band'); ?></label>
<select id="user_gridmap_default_band" class="form-control form-control-sm" name="user_gridmap_default_band"> <select id="user_default_band" class="form-control form-control-sm" name="user_default_band">
<option value="All">All</option>; <option value="All">All</option>;
<?php foreach($bands as $band) { <?php foreach($bands as $band) {
echo '<option value="'.$band.'"'; echo '<option value="'.$band.'"';
if (isset($user_gridmap_default_band) && $user_gridmap_default_band == $band) { if (isset($user_default_band) && $user_default_band == $band) {
echo ' selected'; echo ' selected';
} }
echo '>'.$band.'</option>'."\n"; echo '>'.$band.'</option>'."\n";
@ -566,28 +566,28 @@
<div class="form-group"> <div class="form-group">
<label class="my-1 mr-2"><?php echo lang('account_qsl_settings'); ?></label> <label class="my-1 mr-2"><?php echo lang('account_qsl_settings'); ?></label>
<div class="form-check-inline"> <div class="form-check-inline">
<?php echo '<input class="form-check-input" type="checkbox" name="user_gridmap_confirmation_qsl" id="user_gridmap_confirmation_qsl"'; <?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_qsl" id="user_default_confirmation_qsl"';
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'Q') !== false) { if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) {
echo ' checked'; echo ' checked';
} }
echo '>'; ?> echo '>'; ?>
<label class="form-check-label" for="user_gridmap_confirmation_qsl">QSL</label> <label class="form-check-label" for="user_default_confirmation_qsl">QSL</label>
</div> </div>
<div class="form-check-inline"> <div class="form-check-inline">
<?php echo '<input class="form-check-input" type="checkbox" name="user_gridmap_confirmation_lotw" id="user_gridmap_confirmation_lotw"'; <?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_lotw" id="user_default_confirmation_lotw"';
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'L') !== false) { if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) {
echo ' checked'; echo ' checked';
} }
echo '>'; ?> echo '>'; ?>
<label class="form-check-label" for="user_gridmap_confirmation_lotw">LoTW</label> <label class="form-check-label" for="user_default_confirmation_lotw">LoTW</label>
</div> </div>
<div class="form-check-inline"> <div class="form-check-inline">
<?php echo '<input class="form-check-input" type="checkbox" name="user_gridmap_confirmation_eqsl" id="user_gridmap_confirmation_eqsl"'; <?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_eqsl" id="user_default_confirmation_eqsl"';
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'E') !== false) { if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'E') !== false) {
echo ' checked'; echo ' checked';
} }
echo '>'; ?> echo '>'; ?>
<label class="form-check-label" for="user_gridmap_confirmation_eqsl">eQSL</label> <label class="form-check-label" for="user_default_confirmation_eqsl">eQSL</label>
</div> </div>
</div> </div>
</div> </div>

24
application/views/user/edit.php
查看文件

@ -549,13 +549,13 @@
</div> </div>
<div class="card-body"> <div class="card-body">
<div class="form-group"> <div class="form-group">
<label for="user_gridmap_default_band"><?php echo lang('account_gridmap_default_band'); ?></label> <label for="user_default_band"><?php echo lang('account_gridmap_default_band'); ?></label>
<select id="user_gridmap_default_band" class="form-control form-control-sm" name="user_gridmap_default_band"> <select id="user_default_band" class="form-control form-control-sm" name="user_default_band">
<option value="All">All</option>; <option value="All">All</option>;
<?php foreach($bands as $band) { <?php foreach($bands as $band) {
echo '<option value="'.$band.'"'; echo '<option value="'.$band.'"';
if ($user_gridmap_default_band == $band) { if ($user_default_band == $band) {
echo ' selected="selected"'; echo ' selected="selected"';
} }
echo '>'.$band.'</option>'."\n"; echo '>'.$band.'</option>'."\n";
@ -565,28 +565,28 @@
<div class="form-group"> <div class="form-group">
<label class="my-1 mr-2"><?php echo lang('account_qsl_settings'); ?></label> <label class="my-1 mr-2"><?php echo lang('account_qsl_settings'); ?></label>
<div class="form-check-inline"> <div class="form-check-inline">
<?php echo '<input class="form-check-input" type="checkbox" name="user_gridmap_confirmation_qsl" id="user_gridmap_confirmation_qsl"'; <?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_qsl" id="user_default_confirmation_qsl"';
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'Q') !== false) { if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) {
echo ' checked'; echo ' checked';
} }
echo '>'; ?> echo '>'; ?>
<label class="form-check-label" for="user_gridmap_confirmation_qsl">QSL</label> <label class="form-check-label" for="user_default_confirmation_qsl">QSL</label>
</div> </div>
<div class="form-check-inline"> <div class="form-check-inline">
<?php echo '<input class="form-check-input" type="checkbox" name="user_gridmap_confirmation_lotw" id="user_gridmap_confirmation_lotw"'; <?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_lotw" id="user_default_confirmation_lotw"';
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'L') !== false) { if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) {
echo ' checked'; echo ' checked';
} }
echo '>'; ?> echo '>'; ?>
<label class="form-check-label" for="user_gridmap_confirmation_lotw">LoTW</label> <label class="form-check-label" for="user_default_confirmation_lotw">LoTW</label>
</div> </div>
<div class="form-check-inline"> <div class="form-check-inline">
<?php echo '<input class="form-check-input" type="checkbox" name="user_gridmap_confirmation_eqsl" id="user_gridmap_confirmation_eqsl"'; <?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_eqsl" id="user_default_confirmation_eqsl"';
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'E') !== false) { if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'E') !== false) {
echo ' checked'; echo ' checked';
} }
echo '>'; ?> echo '>'; ?>
<label class="form-check-label" for="user_gridmap_confirmation_eqsl">eQSL</label> <label class="form-check-label" for="user_default_confirmation_eqsl">eQSL</label>
</div> </div>
</div> </div>
</div> </div>