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

Returns the correct hamsat user fields

pull/3009/head^2
Peter Goodhall 2024-03-11 18:31:23 +00:00
rodzic c2b1777590
commit 1818530c9d
1 zmienionych plików z 7 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

11
application/controllers/User.php
Wyświetl plik

@ -495,12 +495,15 @@ class User extends CI_Controller {
$data['user_winkey'] = $q->winkey; $data['user_winkey'] = $q->winkey;
} }
$this->load->model('user_options_model');
$hamsat_user_object = $this->user_options_model->get_options('hamsat')->result();
if($this->input->post('user_hamsat_key', true)) { if($this->input->post('user_hamsat_key', true)) {
$data['user_hamsat_key'] = $this->input->post('user_hamsat_key', true); $data['user_hamsat_key'] = $this->input->post('user_hamsat_key', true);
} else { } else {
// get $q->hamsat_key if its set if not null // get $q->hamsat_key if its set if not null
if(isset($q->hamsat_key)) { if(isset($hamsat_user_object[0]->option_value)) {
$data['user_hamsat_key'] = $q->hamsat_key; $data['user_hamsat_key'] = $hamsat_user_object[0]->option_value;
} else { } else {
$data['user_hamsat_key'] = ""; $data['user_hamsat_key'] = "";
} }
@ -509,8 +512,8 @@ class User extends CI_Controller {
if($this->input->post('user_hamsat_workable_only')) { if($this->input->post('user_hamsat_workable_only')) {
$data['user_hamsat_workable_only'] = $this->input->post('user_hamsat_workable_only', false); $data['user_hamsat_workable_only'] = $this->input->post('user_hamsat_workable_only', false);
} else { } else {
if(isset($q->hamsat_workable_only)) { if(isset($hamsat_user_object[1]->option_value)) {
$data['user_hamsat_workable_only'] = $q->hamsat_workable_only; $data['user_hamsat_workable_only'] = $hamsat_user_object[1]->option_value;
} else { } else {
$data['user_hamsat_workable_only'] = ""; $data['user_hamsat_workable_only'] = "";
} }