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

Make band and QSL type user select- and storable

浏览代码
这个提交包含在：
phl0 2023-07-07 16:04:19 +02:00
父节点 033aa96204
当前提交 08c7e65271
找不到此签名对应的密钥
GPG 密钥 ID: 48EA1E640798CA9A
共有 10 个文件被更改，包括 232 次插入 和 30 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

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

@ -21,7 +21,7 @@ $config['migration_enabled'] = TRUE;
| be upgraded / downgraded to.
|
*/
$config['migration_version'] = 127;
$config['migration_version'] = 128;
/*
|--------------------------------------------------------------------------

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

@ -19,6 +19,9 @@ class Gridmap extends CI_Controller {
$data['bands'] = $this->bands->get_worked_bands();
$data['sats_available'] = $this->bands->get_worked_sats();
$data['user_gridmap_default_band'] = $this->session->userdata('user_gridmap_default_band');
$data['user_gridmap_confirmation'] = $this->session->userdata('user_gridmap_confirmation');
$data['layer'] = $this->optionslib->get_option('option_map_tile_server');
$data['attribution'] = $this->optionslib->get_option('option_map_tile_server_copyright');
@ -179,4 +182,4 @@ class Gridmap extends CI_Controller {
header('Content-Type: application/json');
echo json_encode($data);
}
}
}

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

@ -33,6 +33,7 @@ class User extends CI_Controller {
$this->load->model('user_model');
if(!$this->user_model->authorize(99)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); }
$this->load->model('bands');
$this->load->library('form_validation');
$this->form_validation->set_rules('user_name', 'Username', 'required');
@ -46,6 +47,8 @@ class User extends CI_Controller {
$this->form_validation->set_rules('user_locator', 'Locator', 'callback_check_locator');
$this->form_validation->set_rules('user_timezone', 'Timezone', 'required');
$data['bands'] = $this->bands->get_user_bands();
// Get themes list
$data['themes'] = $this->user_model->getThemes();
@ -69,8 +72,8 @@ class User extends CI_Controller {
$data['user_callsign'] = $this->input->post('user_callsign');
$data['user_locator'] = $this->input->post('user_locator');
$data['user_timezone'] = $this->input->post('user_timezone');
$data['user_measurement_base'] = $this->input->post('user_measurement_base');
$data['user_stylesheet'] = $this->input->post('user_stylesheet');
$data['user_measurement_base'] = $this->input->post('user_measurement_base');
$data['user_stylesheet'] = $this->input->post('user_stylesheet');
$data['user_qth_lookup'] = $this->input->post('user_qth_lookup');
$data['user_sota_lookup'] = $this->input->post('user_sota_lookup');
$data['user_wwff_lookup'] = $this->input->post('user_wwff_lookup');
@ -85,6 +88,8 @@ class User extends CI_Controller {
$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_mastodon_url'] = $this->input->post('user_mastodon_url');
$data['user_gridmap_default_band'] = $this->input->post('user_gridmap_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' : '');
$this->load->view('user/add', $data);
} else {
$this->load->view('user/add', $data);
@ -118,7 +123,9 @@ class User extends CI_Controller {
$this->input->post('user_show_profile_image'),
$this->input->post('user_previous_qsl_type'),
$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_gridmap_confirmation_qsl') !== null ? 'Q' : '').($this->input->post('user_gridmap_confirmation_lotw') !== null ? 'L' : '').($this->input->post('user_gridmap_confirmation_eqsl') !== null ? 'E' : ''))) {
// Check for errors
case EUSERNAMEEXISTS:
$data['username_error'] = 'Username <b>'.$this->input->post('user_name').'</b> already in use!';
@ -146,8 +153,8 @@ class User extends CI_Controller {
$data['user_lastname'] = $this->input->post('user_lastname');
$data['user_callsign'] = $this->input->post('user_callsign');
$data['user_locator'] = $this->input->post('user_locator');
$data['user_measurement_base'] = $this->input->post('user_measurement_base');
$data['user_stylesheet'] = $this->input->post('user_stylesheet');
$data['user_measurement_base'] = $this->input->post('user_measurement_base');
$data['user_stylesheet'] = $this->input->post('user_stylesheet');
$data['user_qth_lookup'] = $this->input->post('user_qth_lookup');
$data['user_sota_lookup'] = $this->input->post('user_sota_lookup');
$data['user_wwff_lookup'] = $this->input->post('user_wwff_lookup');
@ -162,6 +169,8 @@ class User extends CI_Controller {
$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_mastodon_url'] = $this->input->post('user_mastodon_url');
$data['user_gridmap_default_band'] = $this->input->post('user_gridmap_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' : '');
$this->load->view('user/add', $data);
$this->load->view('interface_assets/footer');
}
@ -172,6 +181,7 @@ class User extends CI_Controller {
if((!$this->user_model->authorize(99)) && ($this->session->userdata('user_id') != $this->uri->segment(3))) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); }
$query = $this->user_model->get_by_id($this->uri->segment(3));
$this->load->model('bands');
$this->load->library('form_validation');
$this->form_validation->set_rules('user_name', 'Username', 'required|xss_clean');
@ -186,6 +196,8 @@ class User extends CI_Controller {
$this->form_validation->set_rules('user_locator', 'Locator', 'callback_check_locator');
$this->form_validation->set_rules('user_timezone', 'Timezone', 'required');
$data['bands'] = $this->bands->get_user_bands();
// Get themes list
$data['themes'] = $this->user_model->getThemes();
@ -303,23 +315,23 @@ class User extends CI_Controller {
$data['user_eqsl_password'] = $q->user_eqsl_password;
}
if($this->input->post('user_measurement_base')) {
$data['user_measurement_base'] = $this->input->post('user_measurement_base', true);
} else {
$data['user_measurement_base'] = $q->user_measurement_base;
}
if($this->input->post('user_measurement_base')) {
$data['user_measurement_base'] = $this->input->post('user_measurement_base', true);
} else {
$data['user_measurement_base'] = $q->user_measurement_base;
}
if($this->input->post('user_date_format')) {
$data['user_date_format'] = $this->input->post('user_date_format', true);
} else {
$data['user_date_format'] = $q->user_date_format;
}
$data['user_date_format'] = $this->input->post('user_date_format', true);
} else {
$data['user_date_format'] = $q->user_date_format;
}
if($this->input->post('user_stylesheet')) {
$data['user_stylesheet'] = $this->input->post('user_stylesheet', true);
} else {
$data['user_stylesheet'] = $q->user_stylesheet;
}
if($this->input->post('user_stylesheet')) {
$data['user_stylesheet'] = $this->input->post('user_stylesheet', true);
} else {
$data['user_stylesheet'] = $q->user_stylesheet;
}
if($this->input->post('user_qth_lookup')) {
$data['user_qth_lookup'] = $this->input->post('user_qth_lookup', true);
@ -375,6 +387,18 @@ class User extends CI_Controller {
$data['user_mastodon_url'] = $q->user_mastodon_url;
}
if($this->input->post('user_gridmap_default_band')) {
$data['user_gridmap_default_band'] = $this->input->post('user_gridmap_default_band', false);
} else {
$data['user_gridmap_default_band'] = $q->user_gridmap_default_band;
}
if($this->input->post('user_gridmap_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' : '');
} else {
$data['user_gridmap_confirmation'] = $q->user_gridmap_confirmation;
}
if($this->input->post('user_column1')) {
$data['user_column1'] = $this->input->post('user_column1', true);
} else {
@ -445,7 +469,7 @@ class User extends CI_Controller {
$data['user_callsign'] = $this->input->post('user_callsign', true);
$data['user_locator'] = $this->input->post('user_locator', true);
$data['user_timezone'] = $this->input->post('user_timezone', true);
$data['user_stylesheet'] = $this->input->post('user_stylesheet');
$data['user_stylesheet'] = $this->input->post('user_stylesheet');
$data['user_qth_lookup'] = $this->input->post('user_qth_lookup');
$data['user_sota_lookup'] = $this->input->post('user_sota_lookup');
$data['user_wwff_lookup'] = $this->input->post('user_wwff_lookup');
@ -461,6 +485,8 @@ class User extends CI_Controller {
$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_mastodon_url'] = $this->input->post('user_mastodon_url');
$data['user_gridmap_default_band'] = $this->input->post('user_gridmap_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' : '');
$this->load->view('user/edit');
$this->load->view('interface_assets/footer');
}

3
application/language/english/account_lang.php
查看文件

@ -92,3 +92,6 @@ $lang['account_login'] = 'Login';
$lang['account_mastodon'] = 'Mastodonserver';
$lang['account_user_mastodon'] = 'URL of Mastodonserver';
$lang['account_gridmap_settings'] = 'Settings for Gridsquare Map';
$lang['account_gridmap_default_band'] = 'Default Band';

3
application/language/german/account_lang.php
查看文件

@ -92,3 +92,6 @@ $lang['account_login'] = 'Anmeldung';
$lang['account_mastodon'] = 'Mastodonserver';
$lang['account_user_mastodon'] = 'URL des Mastodonservers';
$lang['account_gridmap_settings'] = 'Einstellung der Planquadratkarte';
$lang['account_gridmap_default_band'] = 'Standardband';

38
application/migrations/128_user_default_map_settings.php 普通文件
查看文件

@ -0,0 +1,38 @@
<?php
defined('BASEPATH') OR exit('No direct script access allowed');
/**
* Class Migration_user_default_map_settings
*
* Creates user account settings for choosing default map
* and QSL type for Gridmap view
*/
class Migration_user_default_map_settings extends CI_Migration {
public function up()
{
if (!$this->db->field_exists('user_gridmap_default_band', 'users')) {
$fields = array(
'user_gridmap_default_band varchar(10) default NULL',
);
$this->dbforge->add_column('users', $fields);
}
if (!$this->db->field_exists('user_gridmap_confirmation', 'users')) {
$fields = array(
'user_gridmap_confirmation varchar(3) default NULL',
);
$this->dbforge->add_column('users', $fields);
}
}
public function down()
{
$this->dbforge->drop_column('users', 'user_gridmap_default_band');
$this->dbforge->drop_column('users', 'user_gridmap_confirmation');
}
}

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

@ -123,7 +123,8 @@ class User_Model extends CI_Model {
function add($username, $password, $email, $type, $firstname, $lastname, $callsign, $locator, $timezone,
$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_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) {
// Check that the user isn't already used
if(!$this->exists($username)) {
$data = array(
@ -153,6 +154,8 @@ class User_Model extends CI_Model {
'user_previous_qsl_type' => xss_clean($user_previous_qsl_type),
'user_amsat_status_upload' => xss_clean($user_amsat_status_upload),
'user_mastodon_url' => xss_clean($user_mastodon_url),
'user_gridmap_default_band' => xss_clean($user_gridmap_default_band),
'user_gridmap_confirmation' => xss_clean($user_gridmap_confirmation),
);
// Check the password is valid
@ -210,6 +213,8 @@ class User_Model extends CI_Model {
'user_previous_qsl_type' => xss_clean($fields['user_previous_qsl_type']),
'user_amsat_status_upload' => xss_clean($fields['user_amsat_status_upload']),
'user_mastodon_url' => xss_clean($fields['user_mastodon_url']),
'user_gridmap_default_band' => xss_clean($fields['user_gridmap_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' : ''),
);
// Check to see if the user is allowed to change user levels
@ -331,6 +336,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_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_gridmap_default_band' => $u->row()->user_gridmap_default_band,
'user_gridmap_confirmation' => $u->row()->user_gridmap_confirmation,
'active_station_logbook' => $u->row()->active_station_logbook,
);

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

@ -50,8 +50,12 @@
<label class="my-1 mr-2" for="band"><?php echo lang('gridsquares_band'); ?></label>
<select class="custom-select my-1 mr-sm-2" id="band">
<option value="All">All</option>
<?php foreach($bands as $band) {
echo '<option value="' . $band . '"' . '>' . $band . '</option>'."\n";
<?php foreach($bands as $band) {
echo '<option value="'.$band.'"';
if ($user_gridmap_default_band == $band) {
echo ' selected="selected"';
}
echo '>'.$band.'</option>'."\n";
} ?>
</select>
<?php if (count($sats_available) != 0) { ?>
@ -79,15 +83,27 @@
<label class="my-1 mr-2"><?php echo lang('gridsquares_confirmation'); ?></label>
<div>
<div class="form-check-inline">
<input class="form-check-input" type="checkbox" name="qsl" id="qsl" checked>
<?php echo '<input class="form-check-input" type="checkbox" name="qsl" id="qsl"';
if (strpos($user_gridmap_confirmation, 'Q') !== false) {
echo ' checked' ;
}
echo '>'; ?>
<label class="form-check-label" for="qsl">QSL</label>
</div>
<div class="form-check-inline">
<input class="form-check-input" type="checkbox" name="lotw" id="lotw" checked>
<?php echo '<input class="form-check-input" type="checkbox" name="lotw" id="lotw"';
if (strpos($user_gridmap_confirmation, 'L') !== false) {
echo ' checked' ;
}
echo '>'; ?>
<label class="form-check-label" for="lotw">LoTW</label>
</div>
<div class="form-check-inline">
<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 (strpos($user_gridmap_confirmation, 'E') !== false) {
echo ' checked' ;
}
echo '>'; ?>
<label class="form-check-label" for="eqsl">eQSL</label>
</div>
</div>
@ -129,4 +145,4 @@
echo 'var gridsquares_gridsquares_not_confirmed = "' . $gridsquares_gridsquares_not_confirmed . '";';
echo 'var gridsquares_gridsquares_total_worked = "' . $gridsquares_gridsquares_total_worked . '";';
?>
</script>
</script>

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

@ -523,12 +523,65 @@
<div class="form-group">
<label><?php echo lang('account_user_mastodon'); ?></label>
<input class="form-control" type="text" name="user_mastodon_url" value="<?php if(isset($user_mastodon_url)) { echo $user_mastodon_url; } ?>" />
<div class="small form-text text-muted">Main-URL of your Mastodonserver. f.ex. https://radiosocial.de</div></td>
<div class="small form-text text-muted">Main URL of your Mastodonserver. e.g. https://radiosocial.de</div></td>
</div>
</div>
</div>
</div>
</div>
<br />
<div class="row">
<div class="col-md">
<div class="card">
<div class="card-header">
<?php echo lang('account_gridmap_settings'); ?>
</div>
<div class="card-body">
<div class="form-group">
<label for="user_gridmap_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">
<option value=""></option>;
<?php foreach($bands as $band) {
echo '<option value="'.$band.'"';
if (isset($user_gridmap_default_band) && $user_gridmap_default_band == $band) {
echo ' selected';
}
echo '>'.$band.'</option>'."\n";
} ?>
</select>
</div>
<div class="form-group">
<label class="my-1 mr-2"><?php echo lang('gridsquares_confirmation'); ?></label>
<div class="form-check-inline">
<?php echo '<input class="form-check-input" type="checkbox" name="user_gridmap_confirmation_qsl" id="user_gridmap_confirmation_qsl"';
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'Q') !== false) {
echo ' checked';
}
echo '>'; ?>
<label class="form-check-label" for="user_gridmap_confirmation_qsl">QSL</label>
</div>
<div class="form-check-inline">
<?php echo '<input class="form-check-input" type="checkbox" name="user_gridmap_confirmation_lotw" id="user_gridmap_confirmation_lotw"';
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'L') !== false) {
echo ' checked';
}
echo '>'; ?>
<label class="form-check-label" for="user_gridmap_confirmation_lotw">LoTW</label>
</div>
<div class="form-check-inline">
<?php echo '<input class="form-check-input" type="checkbox" name="user_gridmap_confirmation_eqsl" id="user_gridmap_confirmation_eqsl"';
if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'E') !== false) {
echo ' checked';
}
echo '>'; ?>
<label class="form-check-label" for="user_gridmap_confirmation_eqsl">eQSL</label>
</div>
</div>
</div>
</div>
</div>
</div>
<input type="hidden" name="id" value="<?php echo $this->uri->segment(3); ?>" />
<br />

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

@ -527,6 +527,59 @@
</div>
</div>
</div>
<br />
<div class="row">
<div class="col-md">
<div class="card">
<div class="card-header">
<?php echo lang('account_gridmap_settings'); ?>
</div>
<div class="card-body">
<div class="form-group">
<label for="user_gridmap_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">
<option value=""></option>;
<?php foreach($bands as $band) {
echo '<option value="'.$band.'"';
if ($user_gridmap_default_band == $band) {
echo ' selected="selected"';
}
echo '>'.$band.'</option>'."\n";
} ?>
</select>
</div>
<div class="form-group">
<label class="my-1 mr-2"><?php echo lang('gridsquares_confirmation'); ?></label>
<div class="form-check-inline">
<?php echo '<input class="form-check-input" type="checkbox" name="user_gridmap_confirmation_qsl" id="user_gridmap_confirmation_qsl"';
if (strpos($user_gridmap_confirmation, 'Q') !== false) {
echo ' checked';
}
echo '>'; ?>
<label class="form-check-label" for="user_gridmap_confirmation_qsl">QSL</label>
</div>
<div class="form-check-inline">
<?php echo '<input class="form-check-input" type="checkbox" name="user_gridmap_confirmation_lotw" id="user_gridmap_confirmation_lotw"';
if (strpos($user_gridmap_confirmation, 'L') !== false) {
echo ' checked';
}
echo '>'; ?>
<label class="form-check-label" for="user_gridmap_confirmation_lotw">LoTW</label>
</div>
<div class="form-check-inline">
<?php echo '<input class="form-check-input" type="checkbox" name="user_gridmap_confirmation_eqsl" id="user_gridmap_confirmation_eqsl"';
if (strpos($user_gridmap_confirmation, 'E') !== false) {
echo ' checked';
}
echo '>'; ?>
<label class="form-check-label" for="user_gridmap_confirmation_eqsl">eQSL</label>
</div>
</div>
</div>
</div>
</div>
</div>
<input type="hidden" name="id" value="<?php echo $this->uri->segment(3); ?>" />
<br>