From 197eceeb790de7d3efb75a48d613f2eddc150728 Mon Sep 17 00:00:00 2001
From: Andreas <6977712+AndreasK79@users.noreply.github.com>
Date: Thu, 25 Nov 2021 20:18:44 +0100
Subject: [PATCH] [QRZ Logbook] V2 fix for user_id

---
 application/controllers/Qrz.php      | 2 +-
 application/models/Logbook_model.php | 9 +++++++--
 application/models/Stations.php      | 3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/application/controllers/Qrz.php b/application/controllers/Qrz.php
index c663d6ff..2c036967 100644
--- a/application/controllers/Qrz.php
+++ b/application/controllers/Qrz.php
@@ -108,7 +108,7 @@ class Qrz extends CI_Controller {
 
         $data['page_title'] = "QRZ Logbook";
 
-		$data['station_profiles'] = $this->stations->all();
+		$data['station_profiles'] = $this->stations->all_of_user();
         $data['station_profile'] = $this->stations->stations_with_qrz_api_key();
 
         $this->load->view('interface_assets/header', $data);
diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index 3879173e..46e53642 100755
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -383,7 +383,7 @@ class Logbook_model extends CI_Model {
   */
   function exists_qrz_api_key($station_id) {
       $sql = 'select qrzapikey, qrzrealtime from station_profile
-            where station_id = ' . $station_id;
+            where station_id = ' . $station_id . ' and station_profile.user_id = ' . $this->session->userdata('user_id');
 
       $query = $this->db->query($sql);
 
@@ -444,6 +444,10 @@ class Logbook_model extends CI_Model {
    * $primarykey is the unique id for that QSO in the logbook
    */
     function mark_qrz_qsos_sent($primarykey) {
+      if (!$this->check_qso_is_accessible($primarykey)) {
+        return;
+      }
+
         $data = array(
          'COL_QRZCOM_QSO_UPLOAD_DATE' => date("Y-m-d H:i:s", strtotime("now")),
          'COL_QRZCOM_QSO_UPLOAD_STATUS' => 'Y',
@@ -913,7 +917,8 @@ class Logbook_model extends CI_Model {
             ' and (COL_QRZCOM_QSO_UPLOAD_STATUS is NULL
             or COL_QRZCOM_QSO_UPLOAD_STATUS = ""
             or COL_QRZCOM_QSO_UPLOAD_STATUS = "M"
-            or COL_QRZCOM_QSO_UPLOAD_STATUS = "N")';
+            or COL_QRZCOM_QSO_UPLOAD_STATUS = "N")
+            and station_profile.user_id = ' . $this->session->userdata('user_id');
 
         $query = $this->db->query($sql);
         return $query;
diff --git a/application/models/Stations.php b/application/models/Stations.php
index c4db7311..e6ba15af 100644
--- a/application/models/Stations.php
+++ b/application/models/Stations.php
@@ -269,7 +269,8 @@ class Stations extends CI_Model {
                     " where COL_QRZCOM_QSO_UPLOAD_STATUS = 'Y'
                     group by station_id
                 ) as totc on station_profile.station_id = totc.station_id
-                where coalesce(station_profile.qrzapikey, '') <> ''";
+                where coalesce(station_profile.qrzapikey, '') <> ''
+				 and station_profile.user_id = " . $this->session->userdata('user_id');
         $query = $this->db->query($sql);
 
         return $query;