Merge pull request #1359 from Werzi2001/version_2_search_logbook

added logbook filter to simple and advanced search

application/controllers/Logbook.php

@@ -571,12 +571,13 @@ class Logbook extends CI_Controller {
 		//$this->db->select(''.$this->config->item('table_name').'.COL_CALL, '.$this->config->item('table_name').'.COL_BAND, '.$this->config->item('table_name').'.COL_TIME_ON, '.$this->config->item('table_name').'.COL_RST_RCVD, '.$this->config->item('table_name').'.COL_RST_SENT, '.$this->config->item('table_name').'.COL_MODE, '.$this->config->item('table_name').'.COL_SUBMODE, '.$this->config->item('table_name').'.COL_NAME, '.$this->config->item('table_name').'.COL_COUNTRY, '.$this->config->item('table_name').'.COL_PRIMARY_KEY, '.$this->config->item('table_name').'.COL_SAT_NAME, '.$this->config->item('table_name').'.COL_GRIDSQUARE, '.$this->config->item('table_name').'.COL_QSL_RCVD, '.$this->config->item('table_name').'.COL_EQSL_QSL_RCVD, '.$this->config->item('table_name').'.COL_EQSL_QSL_SENT, '.$this->config->item('table_name').'.COL_QSL_SENT, '.$this->config->item('table_name').'.COL_STX, '.$this->config->item('table_name').'.COL_STX_STRING, '.$this->config->item('table_name').'.COL_SRX, '.$this->config->item('table_name').'.COL_SRX_STRING, '.$this->config->item('table_name').'.COL_LOTW_QSL_SENT, '.$this->config->item('table_name').'.COL_LOTW_QSL_RCVD, '.$this->config->item('table_name').'.COL_VUCC_GRIDS, station_profile.*');
 
 		$this->db->from($this->config->item('table_name'));
-
 		$this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
-
+		$this->db->group_start();
 		$this->db->like(''.$this->config->item('table_name').'.COL_CALL', $id);
 		$this->db->or_like(''.$this->config->item('table_name').'.COL_GRIDSQUARE', $id);
 		$this->db->or_like(''.$this->config->item('table_name').'.COL_VUCC_GRIDS', $id);
+		$this->db->group_end();
+		$this->db->where('station_profile.user_id', $this->session->userdata('user_id'));
 		$this->db->order_by(''.$this->config->item('table_name').'.COL_TIME_ON', 'desc');
 		$query = $this->db->get();
 

application/controllers/Search.php

@@ -268,13 +268,15 @@ class Search extends CI_Controller {
 	}
 
 	function fetchQueryResult($json, $returnquery) {
-
 		$search_items = json_decode($json, true);
 
+		$this->db->group_start();
 		$this->buildWhere($search_items);
+		$this->db->group_end();
 
 		$this->db->order_by('COL_TIME_ON', 'DESC');
 		$this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
+		$this->db->where('station_profile.user_id', $this->session->userdata('user_id'));
 
 		if ($returnquery) {
 			$query = $this->db->get_compiled_select($this->config->item('table_name'));

application/models/Logbook_model.php

@@ -935,15 +935,11 @@ class Logbook_model extends CI_Model {
   }
 
   function get_qso($id) {
-    $CI =& get_instance();
-    $CI->load->model('logbooks_model');
-    $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
-
     $this->db->select(''.$this->config->item('table_name').'.*, station_profile.*');
     $this->db->from($this->config->item('table_name'));
 
     $this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
-    $this->db->where_in($this->config->item('table_name').'.station_id', $logbooks_locations_array);
+    $this->db->where('station_profile.user_id', $this->session->userdata('user_id'));
     $this->db->where('COL_PRIMARY_KEY', $id);
 
     return $this->db->get();

application/models/Search.php

@@ -4,6 +4,8 @@ class Search extends CI_Model {
 
 	function callsign_iota($reference) {
 		$this->db->where('COL_IOTA', $reference);
+		$this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
+		$this->db->where('station_profile.user_id', $this->session->userdata('user_id'));
 		$query = $this->db->get($this->config->item('table_name')); 
 		
 		return $query;