diff --git a/application/config/migration.php b/application/config/migration.php index ba2ca6cf..f1c27909 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE; | */ -$config['migration_version'] = 144; +$config['migration_version'] = 145; /* |-------------------------------------------------------------------------- diff --git a/application/controllers/Activated_gridmap.php b/application/controllers/Activated_gridmap.php index a91edd90..a15ec91e 100644 --- a/application/controllers/Activated_gridmap.php +++ b/application/controllers/Activated_gridmap.php @@ -19,8 +19,8 @@ class Activated_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['user_default_band'] = $this->session->userdata('user_default_band'); + $data['user_default_confirmation'] = $this->session->userdata('user_default_confirmation'); $data['layer'] = $this->optionslib->get_option('option_map_tile_server'); diff --git a/application/controllers/Gridmap.php b/application/controllers/Gridmap.php index cc28c06e..02b22838 100644 --- a/application/controllers/Gridmap.php +++ b/application/controllers/Gridmap.php @@ -19,8 +19,8 @@ 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['user_default_band'] = $this->session->userdata('user_default_band'); + $data['user_default_confirmation'] = $this->session->userdata('user_default_confirmation'); $data['layer'] = $this->optionslib->get_option('option_map_tile_server'); diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index bb0084c0..d5484a23 100644 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -201,20 +201,20 @@ class Logbook extends CI_Controller { $CI =& get_instance(); $CI->load->model('logbooks_model'); $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)) { $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'"; } - if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'L') !== false) { + if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) { if ($extrawhere!='') { $extrawhere.=" OR"; } $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!='') { $extrawhere.=" OR"; } @@ -304,7 +304,7 @@ function worked_grid_before($gridsquare, $type, $band, $mode) "workedBefore" => 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->load->model('logbooks_model'); $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=''; - 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'"; } - if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'L') !== false) { + if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) { if ($extrawhere!='') { $extrawhere.=" OR"; } $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!='') { $extrawhere.=" OR"; } @@ -386,7 +386,7 @@ function worked_grid_before($gridsquare, $type, $band, $mode) "confirmed" => false, ]; - $user_gridmap_confirmation = $this->session->userdata('user_gridmap_confirmation'); + $user_default_confirmation = $this->session->userdata('user_default_confirmation'); $CI =& get_instance(); $CI->load->model('logbooks_model'); $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=''; - 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'"; } - if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'L') !== false) { + if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) { if ($extrawhere!='') { $extrawhere.=" OR"; } $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!='') { $extrawhere.=" OR"; } @@ -481,7 +481,7 @@ function worked_grid_before($gridsquare, $type, $band, $mode) "confirmed" => false, ]; - $user_gridmap_confirmation = $this->session->userdata('user_gridmap_confirmation'); + $user_default_confirmation = $this->session->userdata('user_default_confirmation'); $CI =& get_instance(); $CI->load->model('logbooks_model'); $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=''; - 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'"; } - if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'L') !== false) { + if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) { if ($extrawhere!='') { $extrawhere.=" OR"; } $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!='') { $extrawhere.=" OR"; } diff --git a/application/controllers/Qso.php b/application/controllers/Qso.php index c99d86ac..5fa968f1 100755 --- a/application/controllers/Qso.php +++ b/application/controllers/Qso.php @@ -38,7 +38,7 @@ class QSO extends CI_Controller { $data['iota'] = $this->logbook_model->fetchIota(); $data['modes'] = $this->modes->active(); $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); $this->load->library('form_validation'); diff --git a/application/controllers/User.php b/application/controllers/User.php index 90afaf02..57b8e0ec 100644 --- a/application/controllers/User.php +++ b/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_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' : ''); + $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' : ''); $data['language'] = $this->input->post('language'); $this->load->view('user/add', $data); } else { @@ -123,8 +123,8 @@ class User extends CI_Controller { $this->input->post('user_previous_qsl_type'), $this->input->post('user_amsat_status_upload'), $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' : ''), + $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('language'), )) { // 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_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' : ''); + $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' : ''); $data['language'] = $this->input->post('language'); $this->load->view('user/add', $data); $this->load->view('interface_assets/footer'); @@ -413,16 +413,16 @@ 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); + if($this->input->post('user_default_band')) { + $data['user_default_band'] = $this->input->post('user_default_band', false); } 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')) { - $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' : ''); + if($this->input->post('user_default_confirmation')) { + $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 { - $data['user_gridmap_confirmation'] = $q->user_gridmap_confirmation; + $data['user_default_confirmation'] = $q->user_default_confirmation; } 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_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' : ''); + $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' : ''); $data['language'] = $this->input->post('language'); $data['user_winkey'] = $this->input->post('user_winkey'); $this->load->view('user/edit'); diff --git a/application/migrations/145_rename_gridmap_variables.php b/application/migrations/145_rename_gridmap_variables.php new file mode 100644 index 00000000..8b183b8a --- /dev/null +++ b/application/migrations/145_rename_gridmap_variables.php @@ -0,0 +1,34 @@ +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;"); + } + } +} diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index c0b3f684..314a5da4 100755 --- a/application/models/Logbook_model.php +++ b/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) { - $user_gridmap_confirmation = $this->session->userdata('user_gridmap_confirmation'); + $user_default_confirmation = $this->session->userdata('user_default_confirmation'); if($StationLocationsArray == null) { $CI =& get_instance(); @@ -1699,16 +1699,16 @@ class Logbook_model extends CI_Model { } $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'"; } - if (isset($user_gridmap_confirmation) && strpos($user_gridmap_confirmation, 'L') !== false) { + if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) { if ($extrawhere!='') { $extrawhere.=" OR"; } $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!='') { $extrawhere.=" OR"; } diff --git a/application/models/User_model.php b/application/models/User_model.php index 57dadbdf..4b34c664 100644 --- a/application/models/User_model.php +++ b/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, $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_gridmap_default_band, $user_gridmap_confirmation, $language) { + $user_default_band, $user_default_confirmation, $language) { // Check that the user isn't already used if(!$this->exists($username)) { $data = array( @@ -154,8 +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), + 'user_default_band' => xss_clean($user_default_band), + 'user_default_confirmation' => xss_clean($user_default_confirmation), '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_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' : ''), + 'user_default_band' => xss_clean($fields['user_default_band']), + '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']), '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_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, + 'user_default_band' => $u->row()->user_default_band, + 'user_default_confirmation' => $u->row()->user_default_confirmation, 'active_station_logbook' => $u->row()->active_station_logbook, 'language' => isset($u->row()->language) ? $u->row()->language: 'english', 'isWinkeyEnabled' => $u->row()->winkey, diff --git a/application/views/activated_gridmap/index.php b/application/views/activated_gridmap/index.php index 8a21a551..0a39b452 100644 --- a/application/views/activated_gridmap/index.php +++ b/application/views/activated_gridmap/index.php @@ -52,7 +52,7 @@ '.$band.''."\n"; @@ -60,7 +60,7 @@ - disabled> ' . $sat . ''."\n"; @@ -84,7 +84,7 @@
'; ?> @@ -92,7 +92,7 @@
'; ?> @@ -100,7 +100,7 @@
'; ?> diff --git a/application/views/gridmap/index.php b/application/views/gridmap/index.php index baa60b77..a79bfea1 100644 --- a/application/views/gridmap/index.php +++ b/application/views/gridmap/index.php @@ -52,7 +52,7 @@ '.$band.''."\n"; @@ -60,7 +60,7 @@ - disabled> ' . $sat . ''."\n"; @@ -84,7 +84,7 @@
'; ?> @@ -92,7 +92,7 @@
'; ?> @@ -100,7 +100,7 @@
'; ?> diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 66dda593..e8ef6e16 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -107,7 +107,7 @@ echo ''; foreach($bandgroup as $band) { echo ''."\n"; diff --git a/application/views/user/add.php b/application/views/user/add.php index 3003333f..9d6c1e52 100644 --- a/application/views/user/add.php +++ b/application/views/user/add.php @@ -550,13 +550,13 @@
- + - ; '.$band.''."\n"; @@ -566,28 +566,28 @@
- '; ?> - +
- '; ?> - +
- '; ?> - +
diff --git a/application/views/user/edit.php b/application/views/user/edit.php index b4972fab..423e81a0 100644 --- a/application/views/user/edit.php +++ b/application/views/user/edit.php @@ -549,13 +549,13 @@
- + - ; '.$band.''."\n"; @@ -565,28 +565,28 @@
- '; ?> - +
- '; ?> - +
- '; ?> - +