From c39a5ca648a18bf7e06e1bede4ad1cd81b4fe776 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CVeLiTi=E2=80=9D?= <“info@veliti.nl”>
Date: Thu, 11 Dec 2025 15:45:14 +0100
Subject: [PATCH] Refactor software version queries to use 'rowID' instead of
 'id' for consistency across the application

---
 api/v2/get/software.php          | 4 ++--
 api/v2/get/software_download.php | 2 +-
 api/v2/post/software.php         | 6 +++---
 includes/version_access.php      | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/api/v2/get/software.php b/api/v2/get/software.php
index af6d1ba..95a75c2 100644
--- a/api/v2/get/software.php
+++ b/api/v2/get/software.php
@@ -64,10 +64,10 @@ if (isset($criterias['available'])) {
 
     // Get all active versions
     $stmt = $pdo->prepare("
-        SELECT sv.id, sv.version, sv.major_version, sv.minor_version, sv.patch_version,
+        SELECT sv.rowID as id, sv.version, sv.major_version, sv.minor_version, sv.patch_version,
                sv.name, sv.description, sv.file_size, sv.release_date
         FROM software_versions sv
-        WHERE sv.is_active = TRUE
+        WHERE sv.status = 'published'
         ORDER BY sv.major_version DESC, sv.minor_version DESC, sv.patch_version DESC
     ");
     $stmt->execute();
diff --git a/api/v2/get/software_download.php b/api/v2/get/software_download.php
index 7a9229f..2dcb1ab 100644
--- a/api/v2/get/software_download.php
+++ b/api/v2/get/software_download.php
@@ -23,7 +23,7 @@ if (!$tokenData) {
 }
 
 // Get file details
-$stmt = $pdo->prepare("SELECT * FROM software_versions WHERE id = ?");
+$stmt = $pdo->prepare("SELECT * FROM software_versions WHERE rowID = ?");
 $stmt->execute([$tokenData['version_id']]);
 $version = $stmt->fetch(PDO::FETCH_ASSOC);
 
diff --git a/api/v2/post/software.php b/api/v2/post/software.php
index 9773300..c77d479 100644
--- a/api/v2/post/software.php
+++ b/api/v2/post/software.php
@@ -42,7 +42,7 @@ switch ($action) {
         }
 
         // Get version details
-        $stmt = $pdo->prepare("SELECT * FROM software_versions WHERE id = ?");
+        $stmt = $pdo->prepare("SELECT * FROM software_versions WHERE rowID = ?");
         $stmt->execute([$versionId]);
         $version = $stmt->fetch(PDO::FETCH_ASSOC);
 
@@ -176,7 +176,7 @@ switch ($action) {
 
         //QUERY AND VERIFY ALLOWED
         if ($command == 'update' && isAllowed('software',$profile,$permission,'U') === 1){
-            $sql = 'UPDATE software_versions SET '.$clause.' WHERE id = ?';
+            $sql = 'UPDATE software_versions SET '.$clause.' WHERE rowID = ?';
             $execute_input[] = $id;
             $stmt = $pdo->prepare($sql);
             $stmt->execute($execute_input);
@@ -187,7 +187,7 @@ switch ($action) {
             $stmt->execute($execute_input);
         }
         elseif ($command == 'delete' && isAllowed('software',$profile,$permission,'D') === 1){
-            $stmt = $pdo->prepare('DELETE FROM software_versions WHERE id = ?');
+            $stmt = $pdo->prepare('DELETE FROM software_versions WHERE rowID = ?');
             $stmt->execute([$id]);
 
             //Add deletion to changelog
diff --git a/includes/version_access.php b/includes/version_access.php
index 93992f9..4e3a936 100644
--- a/includes/version_access.php
+++ b/includes/version_access.php
@@ -6,7 +6,7 @@ function getUserOwnedVersions($userId) {
     $stmt = $pdo->prepare("
         SELECT sv.*, ul.license_key, ul.purchased_at
         FROM user_licenses ul
-        JOIN software_versions sv ON ul.version_id = sv.id
+        JOIN software_versions sv ON ul.version_id = sv.rowID
         WHERE ul.user_id = ? AND ul.status = 'active'
         ORDER BY sv.major_version DESC, sv.minor_version DESC
     ");
@@ -27,8 +27,8 @@ function checkVersionAccess($userId, $versionId) {
     $stmt = $pdo->prepare("
         SELECT sv.*, var.access_type, var.requires_base_version, var.price
         FROM software_versions sv
-        JOIN version_access_rules var ON sv.id = var.version_id
-        WHERE sv.id = ?
+        JOIN version_access_rules var ON sv.rowID = var.version_id
+        WHERE sv.rowID = ?
     ");
     $stmt->execute([$versionId]);
     $version = $stmt->fetch(PDO::FETCH_ASSOC);
@@ -106,7 +106,7 @@ function userOwnsVersion($userId, $version) {
     $stmt = $pdo->prepare("
         SELECT COUNT(*)
         FROM user_licenses ul
-        JOIN software_versions sv ON ul.version_id = sv.id
+        JOIN software_versions sv ON ul.version_id = sv.rowID
         WHERE ul.user_id = ? AND sv.version = ? AND ul.status = 'active'
     ");
     $stmt->execute([$userId, $version]);