diff --git a/application/controllers/Adif.php b/application/controllers/Adif.php index 64750fc58..c8a397cae 100644 --- a/application/controllers/Adif.php +++ b/application/controllers/Adif.php @@ -158,7 +158,6 @@ class adif extends CI_Controller { public function import() { $this->load->model('stations'); $data['station_profile'] = $this->stations->all_of_user(); - log_message("debug","Started ADIF Import"); $active_station_id = $this->stations->find_active(); $station_profile = $this->stations->profile($active_station_id); @@ -175,7 +174,6 @@ class adif extends CI_Controller { if ( ! $this->upload->do_upload()) { $data['error'] = $this->upload->display_errors(); - $data['max_upload'] = ini_get('upload_max_filesize'); $this->load->view('interface_assets/header', $data); @@ -214,7 +212,6 @@ class adif extends CI_Controller { $data['adif_errors'] = $custom_errors; $data['skip_dupes'] = $this->input->post('skipDuplicate'); - log_message("debug","Finished ADIF Import"); $data['page_title'] = "ADIF Imported"; $this->load->view('interface_assets/header', $data); $this->load->view('adif/import_success'); diff --git a/application/views/adif/import.php b/application/views/adif/import.php index 2de271658..8c1a3c397 100644 --- a/application/views/adif/import.php +++ b/application/views/adif/import.php @@ -55,7 +55,7 @@
B.
- @@ -265,4 +265,4 @@ - \ No newline at end of file + diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 0d6930f07..c1eaf4b24 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -139,6 +139,7 @@ if($this->session->userdata('user_id') != null) { uri->segment(1) == "adif" ) { ?> + uri->segment(1) == "notes" && ($this->uri->segment(2) == "add" || $this->uri->segment(2) == "edit") ) { ?>