diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index f69b1484..798bfd66 100755 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -152,6 +152,10 @@ class Logbook extends CI_Controller { if (strlen($gridsquare) < 4) return false; + $CI =& get_instance(); + $CI->load->model('Stations'); + $station_id = $CI->Stations->find_active(); + if($type == "SAT") { $this->db->where('COL_PROP_MODE', 'SAT'); @@ -162,11 +166,6 @@ class Logbook extends CI_Controller { } - - $CI =& get_instance(); - $CI->load->model('Stations'); - $station_id = $CI->Stations->find_active(); - $this->db->where('station_id', $station_id); $this->db->like('SUBSTRING(COL_GRIDSQUARE, 1, 4)', substr($gridsquare, 0, 4)); $query = $this->db->get($this->config->item('table_name'), 1, 0); @@ -189,6 +188,10 @@ class Logbook extends CI_Controller { "workedBefore" => false, ]; + $CI =& get_instance(); + $CI->load->model('Stations'); + $station_id = $CI->Stations->find_active(); + if($type == "SAT") { $this->db->where('COL_PROP_MODE', 'SAT'); } else { @@ -197,9 +200,6 @@ class Logbook extends CI_Controller { $this->db->where('COL_PROP_MODE !=','SAT'); } - $CI =& get_instance(); - $CI->load->model('Stations'); - $station_id = $CI->Stations->find_active(); $this->db->where('station_id', $station_id);