Merge pull request #2050 from dg0tm/eQSL

Eqsl upload fix

application/models/Logbook_model.php

@@ -2544,6 +2544,10 @@ class Logbook_model extends CI_Model {
 
     // Show all QSOs we need to send to eQSL
     function eqsl_not_yet_sent() {
+      $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('station_profile.*, '.$this->config->item('table_name').'.COL_PRIMARY_KEY, '.$this->config->item('table_name').'.COL_TIME_ON, '.$this->config->item('table_name').'.COL_CALL, '.$this->config->item('table_name').'.COL_MODE, '.$this->config->item('table_name').'.COL_SUBMODE, '.$this->config->item('table_name').'.COL_BAND, '.$this->config->item('table_name').'.COL_COMMENT, '.$this->config->item('table_name').'.COL_RST_SENT, '.$this->config->item('table_name').'.COL_PROP_MODE, '.$this->config->item('table_name').'.COL_SAT_NAME, '.$this->config->item('table_name').'.COL_SAT_MODE, '.$this->config->item('table_name').'.COL_QSLMSG');
       $this->db->from('station_profile');
       $this->db->join($this->config->item('table_name'),'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
@@ -2556,6 +2560,7 @@ class Logbook_model extends CI_Model {
       $this->db->or_where($this->config->item('table_name').'.COL_EQSL_QSL_SENT', 'Q');
       $this->db->or_where($this->config->item('table_name').'.COL_EQSL_QSL_SENT', 'N');
       $this->db->group_end();
+      $this->db->where_in('station_profile.station_id', $logbooks_locations_array);
 
       return $this->db->get();
     }