diff --git a/application/controllers/Adif.php b/application/controllers/Adif.php index dcdcaafbc..a9c0efc4c 100644 --- a/application/controllers/Adif.php +++ b/application/controllers/Adif.php @@ -139,6 +139,9 @@ class adif extends CI_Controller { } public function index() { + $this->load->model('contesting_model'); + $data['contests']=$this->contesting_model->getActivecontests(); + $this->load->model('stations'); $data['page_title'] = "ADIF Import / Export"; @@ -183,6 +186,7 @@ class adif extends CI_Controller { $this->load->view('interface_assets/footer'); } else { if ($this->stations->check_station_is_accessible($this->input->post('station_profile'))) { + $contest=$this->security->xss_clean($this->input->post('contest')) ?? ''; $stopnow=false; $fdata = array('upload_data' => $this->upload->data()); ini_set('memory_limit', '-1'); @@ -222,6 +226,9 @@ class adif extends CI_Controller { $alladif=[]; while($record = $this->adif_parser->get_record()) { + if ($contest != '') { + $record['contest_id']=$contest; + } if(count($record) == 0) { break; }; diff --git a/application/language/bulgarian/general_words_lang.php b/application/language/bulgarian/general_words_lang.php index 9fec4422a..62b12f654 100644 --- a/application/language/bulgarian/general_words_lang.php +++ b/application/language/bulgarian/general_words_lang.php @@ -232,4 +232,5 @@ $lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go сюда, чтобы создать его!'; $lang['hams_at_no_activations_found'] = 'не найдены предстоящие активации. Проверьте позже.'; +$lang['gen_add_to_contest'] = "Add QSOs to Contest"; $lang['datatables_language'] = "en-GB"; diff --git a/application/language/spanish/general_words_lang.php b/application/language/spanish/general_words_lang.php index 01cdace95..5ad1b2c85 100644 --- a/application/language/spanish/general_words_lang.php +++ b/application/language/spanish/general_words_lang.php @@ -232,5 +232,6 @@ $lang['dashboard_locations_warning'] = 'No tiene localizaciones de estaciones. $lang['dashboard_logbooks_warning'] = 'No tiene libro de guardias. ¡Haga clic aquí para crear uno!'; $lang['hams_at_no_activations_found'] = 'No hay activaciones próximas. Por favor vuelve a revisar más tarde.'; +$lang['gen_add_to_contest'] = "Add QSOs to Contest"; $lang['datatables_language'] = "es-ES"; diff --git a/application/language/swedish/general_words_lang.php b/application/language/swedish/general_words_lang.php index d81a7f7e5..dcdda322f 100644 --- a/application/language/swedish/general_words_lang.php +++ b/application/language/swedish/general_words_lang.php @@ -232,6 +232,7 @@ $lang['dashboard_country_files_warning'] = 'You need to update country files! Go $lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; $lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; +$lang['gen_add_to_contest'] = "Add QSOs to Contest"; $lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; $lang['datatables_language'] = "en-GB"; diff --git a/application/language/turkish/general_words_lang.php b/application/language/turkish/general_words_lang.php index 2e1314b92..bb41a07ad 100644 --- a/application/language/turkish/general_words_lang.php +++ b/application/language/turkish/general_words_lang.php @@ -232,4 +232,5 @@ $lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go +
- +
+ +
diff --git a/application/views/search/search_result_ajax.php b/application/views/search/search_result_ajax.php index 18cce9d8b..5c3636fae 100644 --- a/application/views/search/search_result_ajax.php +++ b/application/views/search/search_result_ajax.php @@ -209,7 +209,7 @@ $ci =& get_instance(); case 'SOTA': echo '' . ($row->COL_SOTA_REF); break; case 'WWFF': echo '' . ($row->COL_WWFF_REF); break; case 'POTA': echo '' . ($row->COL_POTA_REF); break; - case 'Grid': echo ''; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; + case 'Grid': echo ''; echo strlen($row->COL_GRIDSQUARE ?? '')==0?$row->COL_VUCC_GRIDS ?? '':$row->COL_GRIDSQUARE ?? ''; break; case 'Distance':echo '' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : ''); break; case 'Band': echo ''; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; case 'State': echo '' . ($row->COL_STATE); break;