diff --git a/application/controllers/Adif.php b/application/controllers/Adif.php index 981f54680..5b72a561d 100644 --- a/application/controllers/Adif.php +++ b/application/controllers/Adif.php @@ -77,17 +77,23 @@ class adif extends CI_Controller { public function export_custom() { // Set memory limit to unlimited to allow heavy usage ini_set('memory_limit', '-1'); + $this->load->model('adif_data'); + $station_id = $this->security->xss_clean($this->input->post('station_profile')); + // Used for exporting QSOs not previously exported to LoTW if ($this->input->post('exportLotw') == 1) { $exportLotw = true; } else { $exportLotw = false; } + $data['qsos'] = $this->adif_data->export_custom($this->input->post('from'), $this->input->post('to'), $station_id, $exportLotw); + $this->load->view('adif/data/exportall', $data); + if ($this->input->post('markLotw') == 1) { foreach ($data['qsos']->result() as $qso) { diff --git a/application/models/Adif_data.php b/application/models/Adif_data.php index c45e2cac2..399f1ed24 100644 --- a/application/models/Adif_data.php +++ b/application/models/Adif_data.php @@ -118,7 +118,6 @@ class adif_data extends CI_Model { // be sure that station belongs to user $this->load->model('Stations'); if ($station_id == 0) { - log_message("Error","All"); return $this->export_all($api_key = null,$from, $to, $exportLotw); } else { if (!$this->Stations->check_station_is_accessible($station_id)) {