From 45161142ef66bd24eb72be9f1975e1814495ee50 Mon Sep 17 00:00:00 2001
From: int2001 <int2001@users.noreply.github.com>
Date: Fri, 21 Jul 2023 05:45:56 +0000
Subject: [PATCH] Implemented enrichment of spot

---
 application/controllers/Dxcluster.php         |  8 ++---
 application/models/Logbook_model.php          | 36 +++++++++++++++++++
 application/views/interface_assets/footer.php |  4 +--
 3 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/application/controllers/Dxcluster.php b/application/controllers/Dxcluster.php
index 703106f9..1bb0d3e3 100644
--- a/application/controllers/Dxcluster.php
+++ b/application/controllers/Dxcluster.php
@@ -12,12 +12,12 @@ class Dxcluster extends CI_Controller {
 
 
 	function qrg_lookup($qrg) {
-		$call_found=$this->logbook_model->qrg_lookup($qrg);
+		$call_found=$this->logbook_model->dxc_qrg_lookup($this->security->xss_clean($qrg));
+        	header('Content-Type: application/json');
 		if ($call_found) {
-        		header('Content-Type: application/json');
 			echo json_encode($call_found, JSON_PRETTY_PRINT);
 		} else {
-			echo '{ error: "not found" }';
+			echo '{ "error": "not found" }';
 		}
 	}
 
@@ -30,7 +30,7 @@ class Dxcluster extends CI_Controller {
         		header('Content-Type: application/json');
 			echo json_encode($dxcc, JSON_PRETTY_PRINT);
 		} else {
-			echo '{ error: "not found" }';
+			echo '{ "error": "not found" }';
 		}
 	}
 }
diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index cec2811f..2fd68597 100755
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -3993,6 +3993,42 @@ class Logbook_model extends CI_Model {
         return false;
     }
 
+    public function dxc_qrg_lookup($qrg, $maxage = 120) {
+	    if ( ($this->optionslib->get_option('dxcache_url') != '') && (is_numeric($qrg)) ) {
+		    $dxcache_url = $this->optionslib->get_option('dxcache_url').'/spot/'.$qrg;
+
+		    // CURL Functions
+		    $ch = curl_init();
+		    curl_setopt($ch, CURLOPT_URL, $dxcache_url);
+		    curl_setopt($ch, CURLOPT_USERAGENT, 'Cloudlog DXLookup');
+		    curl_setopt($ch, CURLOPT_HEADER, false);
+		    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+		    $jsonraw = curl_exec($ch);
+		    curl_close($ch);
+		    $json = json_decode($jsonraw);
+
+		    // Create JSON object
+		    if (strlen($jsonraw)>20) {
+			    $datetimecurrent = new DateTime("now", new DateTimeZone('UTC')); // Today's Date/Time
+			    $datetimespot = new DateTime($json->when, new DateTimeZone('UTC'));
+			    $spotage = $datetimecurrent->diff($datetimespot);
+			    $minutes = $spotage->days * 24 * 60;
+			    $minutes += $spotage->h * 60;
+			    $minutes += $spotage->i;
+			    $json->age=$minutes;
+			    if ($minutes<=$maxage) {
+				    $dxcc=$this->dxcc_lookup($json->spotted,date('Ymd', time()));
+				    $json->dxcc=$dxcc;
+				    return ($json);
+			    } else {
+				    return '';
+			    }
+		    } else {
+			    return '';
+		    }
+	    }
+    }
+	
 }
 
 function validateADIFDate($date, $format = 'Ymd')
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index db2d2fb2..b9acafc4 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -937,10 +937,10 @@ $(document).on('keypress',function(e) {
 
 	if ($this->optionslib->get_option('dxcache_url') != ''){ ?>
 	<script type="text/javascript">
-		var dxcluster_provider =' <?php echo $this->optionslib->get_option('dxcache_url'); ?>';
+		var dxcluster_provider ='/index.php/dxcluster';
 		$(document).ready(function() {
 			$("#check_cluster").on("click", function() {
-				$.ajax({ url: dxcluster_provider+"/spot/"+$("#frequency").val()/1000, cache: false, dataType: "json" }).done(
+				$.ajax({ url: dxcluster_provider+"/qrg_lookup/"+$("#frequency").val()/1000, cache: false, dataType: "json" }).done(
 					function(dxspot) {
 						$("#callsign").val(dxspot.spotted);
 						$("#callsign").trigger("blur");