From 2ba3eb94be9e0fc49e8ac5eba7a236b6f8ba09e8 Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Wed, 29 Nov 2023 13:23:09 +0000
Subject: [PATCH 1/2] [Satellites] Adds HADES-D

---
 assets/json/satellite_data.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/assets/json/satellite_data.json b/assets/json/satellite_data.json
index 62eb42b1..9ccd5a91 100644
--- a/assets/json/satellite_data.json
+++ b/assets/json/satellite_data.json
@@ -559,6 +559,18 @@
          ]
       }
    },
+   "HADES-D":{
+      "Modes":{
+         "V/U":[
+            {
+               "Uplink_Mode":"FM",
+               "Uplink_Freq":"145875000",
+               "Downlink_Mode":"FM",
+               "Downlink_Freq":"436666000"
+            }
+         ]
+      }
+   },
    "INSPIRE-SAT 7":{
       "Modes":{
          "V/U":[

From e240631f4ae02c73ce106fc800dc6a2503c38814 Mon Sep 17 00:00:00 2001
From: phl0 <github@florian-wolters.de>
Date: Wed, 29 Nov 2023 14:56:11 +0100
Subject: [PATCH 2/2] Fix missing grid lookups to handle lookups which do not
 return a grid (i.e. callsign not existing on hamqth/qrz

---
 application/models/Logbook_model.php | 36 +++++++++++++++-------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index 200b28ce..5bb57c37 100755
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -4094,11 +4094,7 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray =
         // get all records with no COL_GRIDSQUARE
         $this->db->select("COL_PRIMARY_KEY, COL_CALL, COL_TIME_ON, COL_TIME_OFF");
 
-        // check which to update - records with no Gridsquare or all records
-        $this->db->where("COL_GRIDSQUARE is NULL or COL_GRIDSQUARE = ''");
-
-        $where = "(COL_GRIDSQUARE is NULL or COL_GRIDSQUARE = '') AND (COL_VUCC_GRIDS is NULL or COL_VUCC_GRIDS = '')";
-        $this->db->where($where);
+        $this->db->where("(COL_GRIDSQUARE is NULL or COL_GRIDSQUARE = '') AND (COL_VUCC_GRIDS is NULL or COL_VUCC_GRIDS = '')");
 
         $r = $this->db->get($this->config->item('table_name'));
 
@@ -4106,11 +4102,13 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray =
         $this->db->trans_start();
         if ($r->num_rows() > 0){
             foreach($r->result_array() as $row){
-		          $callsign = $row['COL_CALL'];
+              $callsign = $row['COL_CALL'];
               if ($this->config->item('callbook') == "qrz" && $this->config->item('qrz_username') != null && $this->config->item('qrz_password') != null)
               {
                   // Lookup using QRZ
-                  $this->load->library('qrz');
+                  if(!$this->load->is_loaded('qrz')) {
+                     $this->load->library('qrz');
+                  }
 
                   if(!$this->session->userdata('qrz_session_key')) {
                       $qrz_session_key = $this->qrz->session($this->config->item('qrz_username'), $this->config->item('qrz_password'));
@@ -4123,7 +4121,9 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray =
               if ($this->config->item('callbook') == "hamqth" && $this->config->item('hamqth_username') != null && $this->config->item('hamqth_password') != null)
               {
                   // Load the HamQTH library
-                  $this->load->library('hamqth');
+                  if(!$this->load->is_loaded('hamqth')) {
+                     $this->load->library('hamqth');
+                  }
 
                   if(!$this->session->userdata('hamqth_session_key')) {
                       $hamqth_session_key = $this->hamqth->session($this->config->item('hamqth_username'), $this->config->item('hamqth_password'));
@@ -4141,14 +4141,18 @@ function check_if_callsign_worked_in_logbook($callsign, $StationLocationsArray =
               }
               if (isset($callbook))
               {
-                  $return['callsign_qra'] = $callbook['gridsquare'];
-              }
-              if ($return['callsign_qra'] != ''){
-                  $sql = sprintf("update %s set COL_GRIDSQUARE = '%s' where COL_PRIMARY_KEY=%d",
-                                  $this->config->item('table_name'), $return['callsign_qra'], $row['COL_PRIMARY_KEY']);
-                  $this->db->query($sql);
-                  printf("Updating %s to %s\n<br/>", $row['COL_PRIMARY_KEY'], $return['callsign_qra']);
-                  $count++;
+                  if (isset($callbook['error'])) {
+                     printf("Error: ".$callbook['error']."<br />");
+                  } else {
+                     $return['callsign_qra'] = $callbook['gridsquare'];
+                     if ($return['callsign_qra'] != ''){
+                         $sql = sprintf("update %s set COL_GRIDSQUARE = '%s' where COL_PRIMARY_KEY=%d",
+                                         $this->config->item('table_name'), $return['callsign_qra'], $row['COL_PRIMARY_KEY']);
+                         $this->db->query($sql);
+                         printf("Updating %s to %s\n<br/>", $row['COL_PRIMARY_KEY'], $return['callsign_qra']);
+                         $count++;
+                     }
+                  }
               }
             }
         }