Refactor software version queries to use 'rowID' instead of 'id' for consistency across the application
This commit is contained in:
@@ -64,10 +64,10 @@ if (isset($criterias['available'])) {
|
|||||||
|
|
||||||
// Get all active versions
|
// Get all active versions
|
||||||
$stmt = $pdo->prepare("
|
$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
|
sv.name, sv.description, sv.file_size, sv.release_date
|
||||||
FROM software_versions sv
|
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
|
ORDER BY sv.major_version DESC, sv.minor_version DESC, sv.patch_version DESC
|
||||||
");
|
");
|
||||||
$stmt->execute();
|
$stmt->execute();
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ if (!$tokenData) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Get file details
|
// 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']]);
|
$stmt->execute([$tokenData['version_id']]);
|
||||||
$version = $stmt->fetch(PDO::FETCH_ASSOC);
|
$version = $stmt->fetch(PDO::FETCH_ASSOC);
|
||||||
|
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ switch ($action) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Get version details
|
// Get version details
|
||||||
$stmt = $pdo->prepare("SELECT * FROM software_versions WHERE id = ?");
|
$stmt = $pdo->prepare("SELECT * FROM software_versions WHERE rowID = ?");
|
||||||
$stmt->execute([$versionId]);
|
$stmt->execute([$versionId]);
|
||||||
$version = $stmt->fetch(PDO::FETCH_ASSOC);
|
$version = $stmt->fetch(PDO::FETCH_ASSOC);
|
||||||
|
|
||||||
@@ -176,7 +176,7 @@ switch ($action) {
|
|||||||
|
|
||||||
//QUERY AND VERIFY ALLOWED
|
//QUERY AND VERIFY ALLOWED
|
||||||
if ($command == 'update' && isAllowed('software',$profile,$permission,'U') === 1){
|
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;
|
$execute_input[] = $id;
|
||||||
$stmt = $pdo->prepare($sql);
|
$stmt = $pdo->prepare($sql);
|
||||||
$stmt->execute($execute_input);
|
$stmt->execute($execute_input);
|
||||||
@@ -187,7 +187,7 @@ switch ($action) {
|
|||||||
$stmt->execute($execute_input);
|
$stmt->execute($execute_input);
|
||||||
}
|
}
|
||||||
elseif ($command == 'delete' && isAllowed('software',$profile,$permission,'D') === 1){
|
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]);
|
$stmt->execute([$id]);
|
||||||
|
|
||||||
//Add deletion to changelog
|
//Add deletion to changelog
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ function getUserOwnedVersions($userId) {
|
|||||||
$stmt = $pdo->prepare("
|
$stmt = $pdo->prepare("
|
||||||
SELECT sv.*, ul.license_key, ul.purchased_at
|
SELECT sv.*, ul.license_key, ul.purchased_at
|
||||||
FROM user_licenses ul
|
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'
|
WHERE ul.user_id = ? AND ul.status = 'active'
|
||||||
ORDER BY sv.major_version DESC, sv.minor_version DESC
|
ORDER BY sv.major_version DESC, sv.minor_version DESC
|
||||||
");
|
");
|
||||||
@@ -27,8 +27,8 @@ function checkVersionAccess($userId, $versionId) {
|
|||||||
$stmt = $pdo->prepare("
|
$stmt = $pdo->prepare("
|
||||||
SELECT sv.*, var.access_type, var.requires_base_version, var.price
|
SELECT sv.*, var.access_type, var.requires_base_version, var.price
|
||||||
FROM software_versions sv
|
FROM software_versions sv
|
||||||
JOIN version_access_rules var ON sv.id = var.version_id
|
JOIN version_access_rules var ON sv.rowID = var.version_id
|
||||||
WHERE sv.id = ?
|
WHERE sv.rowID = ?
|
||||||
");
|
");
|
||||||
$stmt->execute([$versionId]);
|
$stmt->execute([$versionId]);
|
||||||
$version = $stmt->fetch(PDO::FETCH_ASSOC);
|
$version = $stmt->fetch(PDO::FETCH_ASSOC);
|
||||||
@@ -106,7 +106,7 @@ function userOwnsVersion($userId, $version) {
|
|||||||
$stmt = $pdo->prepare("
|
$stmt = $pdo->prepare("
|
||||||
SELECT COUNT(*)
|
SELECT COUNT(*)
|
||||||
FROM user_licenses ul
|
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'
|
WHERE ul.user_id = ? AND sv.version = ? AND ul.status = 'active'
|
||||||
");
|
");
|
||||||
$stmt->execute([$userId, $version]);
|
$stmt->execute([$userId, $version]);
|
||||||
|
|||||||
Reference in New Issue
Block a user