From e7d0d00e89e49204a86dd34a0a7bf958724a6e03 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Tue, 17 Nov 2020 17:35:48 +0000 Subject: [PATCH] Fixed issue with ADIF export when exporting all the log --- application/controllers/Adif.php | 7 ++++--- application/views/adif/data/exportall.php | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/application/controllers/Adif.php b/application/controllers/Adif.php index 6b63d65e..600654fd 100644 --- a/application/controllers/Adif.php +++ b/application/controllers/Adif.php @@ -76,7 +76,6 @@ class adif extends CI_Controller { } public function export_custom() { - // Set memory limit to unlimited to allow heavy usage ini_set('memory_limit', '-1'); @@ -87,12 +86,14 @@ class adif extends CI_Controller { $exportLotw = true; } else { $exportLotw = false; - } - + } + $data['qsos'] = $this->adif_data->export_custom($this->input->post('from'), $this->input->post('to'), $exportLotw); + $this->load->view('adif/data/exportall', $data); + if ($this->input->post('markLotw') == 1) { foreach ($data['qsos']->result() as $qso) { diff --git a/application/views/adif/data/exportall.php b/application/views/adif/data/exportall.php index 64aaa173..dbe33c27 100644 --- a/application/views/adif/data/exportall.php +++ b/application/views/adif/data/exportall.php @@ -9,7 +9,7 @@ load->library('adifhelper'); +$CI->load->library('AdifHelper'); foreach ($qsos->result() as $qso) { echo $CI->adifhelper->getAdifLine($qso);