From 651778b443f4f6beb330db55cde1136b2fae8b54 Mon Sep 17 00:00:00 2001
From: int2001 <joerg@dj7nt.de>
Date: Thu, 21 Aug 2025 09:17:57 +0000
Subject: [PATCH] 1st successful generation of payload at /dcl/dcl_upload

---
 application/controllers/Dcl.php      | 4 ++--
 application/models/Dcl_model.php     | 4 ++--
 application/models/Logbook_model.php | 4 ++--
 application/models/User_model.php    | 7 +++++++
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/application/controllers/Dcl.php b/application/controllers/Dcl.php
index 895722747..953f38a08 100644
--- a/application/controllers/Dcl.php
+++ b/application/controllers/Dcl.php
@@ -162,7 +162,7 @@ class Dcl extends CI_Controller {
 				curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 30);
 
 				// todo: uncomment when ready
-				// $result = curl_exec($ch);
+				$result = curl_exec($ch);
 
 				if(curl_errno($ch)){
 					echo $station_profile->station_callsign." (".$station_profile->station_profile_name."): Upload Failed - ".curl_strerror(curl_errno($ch))." (".curl_errno($ch).")<br>";
@@ -186,7 +186,7 @@ class Dcl extends CI_Controller {
 						continue;
 					}
 				} else {
-					echo $station_profile->station_callsign." (".$station_profile->station_profile_name."): Upload Successful - ".$filename_for_saving."<br>";
+					echo $station_profile->station_callsign." (".$station_profile->station_profile_name."): Upload Successful <br>";
 					// Mark QSOs as Sent
 					foreach ($qso_id_array as $qso_number) {
 						// todo: uncomment when ready
diff --git a/application/models/Dcl_model.php b/application/models/Dcl_model.php
index b6c5633e6..5e4ee6df1 100644
--- a/application/models/Dcl_model.php
+++ b/application/models/Dcl_model.php
@@ -25,8 +25,8 @@ class Dcl_model extends CI_Model {
 				foreach ($skey['Callsigns'] as $item) {
 					if (isset($item['callsign']) && strtoupper($item['callsign']) === strtoupper($callsign)) {
 						$key['token']=$skey['UserKeys']['token'];
-						$key['vt']=strtotime($item['startDate']);
-						$key['vf']=strtotime($item['endDate'] ?? '2099-12-31');
+						$key['vf']=strtotime($item['startDate']);
+						$key['vt']=strtotime($item['endDate'] ?? '2099-12-31');
 						return $key;
 					}
 				}
diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index 47252185a..4cc42f13c 100644
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -5426,8 +5426,8 @@ class Logbook_model extends CI_Model {
 			' and (COL_DCL_QSL_SENT not in ("Y","I") OR COL_DCL_QSL_SENT is null)'.
 			' and COL_QSO_DATE>? and COL_QSO_DATE<?';
 		$binding[] = $station_id;
-		$binding[] = $from;
-		$binding[] = $till;
+		$binding[] = date('Y-m-d', $from);
+		$binding[] = date('Y-m-d', $till);
 
 		$query = $this->db->query($sql, $binding);
 		return $query;
diff --git a/application/models/User_model.php b/application/models/User_model.php
index fb2be7cbd..f41aaf5d0 100644
--- a/application/models/User_model.php
+++ b/application/models/User_model.php
@@ -55,6 +55,13 @@ class User_Model extends CI_Model {
 		return $r;
 	}
 
+	// FUNCTION: object get_all_dcl_users
+	// Returns all users with dcl details
+	function get_all_dcl_users() {
+		// todo Clever (non-CI-)query to fetch all users with DCL-Tokens in option_table
+		return null;
+	}
+
 	// FUNCTION: object get_by_email($email)
 	// Retrieve a user by email address
 	function get_by_email($email) {