diff --git a/api/v1/software/read.php b/api/v1/software/read.php index e738d22ee..00cb9cee1 100644 --- a/api/v1/software/read.php +++ b/api/v1/software/read.php @@ -8,26 +8,26 @@ require_once '../require_get_method.php'; // Specific software via ID (single) if (isset($_GET['software_id'])) { $id = intval($_GET['software_id']); - $sql = mysqli_query($mysqli, "SELECT * FROM software WHERE software_id = '$id' AND 1=1 " . apiClientScopeSql('software_client_id') . ""); + $sql = mysqli_query($mysqli, "SELECT * FROM software WHERE software_id = '$id' AND software_archived_at IS NULL AND 1=1 " . apiClientScopeSql('software_client_id') . ""); } elseif (isset($_GET['software_key'])) { // Specific software via key $key = mysqli_real_escape_string($mysqli, $_GET['software_license']); - $sql = mysqli_query($mysqli, "SELECT * FROM software WHERE software_key = '$key' AND 1=1 " . apiClientScopeSql('software_client_id') . " ORDER BY software_id LIMIT $limit OFFSET $offset"); + $sql = mysqli_query($mysqli, "SELECT * FROM software WHERE software_key = '$key' AND software_archived_at IS NULL AND 1=1 " . apiClientScopeSql('software_client_id') . " ORDER BY software_id LIMIT $limit OFFSET $offset"); } elseif (isset($_GET['software_name'])) { // Software by name $name = mysqli_real_escape_string($mysqli, $_GET['software_name']); - $sql = mysqli_query($mysqli, "SELECT * FROM software WHERE software_name = '$name' AND 1=1 " . apiClientScopeSql('software_client_id') . " ORDER BY asset_id LIMIT $limit OFFSET $offset"); + $sql = mysqli_query($mysqli, "SELECT * FROM software WHERE software_name = '$name' AND software_archived_at IS NULL AND 1=1 " . apiClientScopeSql('software_client_id') . " ORDER BY asset_id LIMIT $limit OFFSET $offset"); } elseif (isset($_GET['software_type'])) { // Software via type $type = intval($_GET['software_type']); - $sql = mysqli_query($mysqli, "SELECT * FROM software WHERE software_type = '$type' AND 1=1 " . apiClientScopeSql('software_client_id') . " ORDER BY software_id LIMIT $limit OFFSET $offset"); + $sql = mysqli_query($mysqli, "SELECT * FROM software WHERE software_type = '$type' AND software_archived_at IS NULL AND 1=1 " . apiClientScopeSql('software_client_id') . " ORDER BY software_id LIMIT $limit OFFSET $offset"); } else { // All software(s) (by client ID if given, or all in general if key permits) - $sql = mysqli_query($mysqli, "SELECT * FROM software WHERE 1=1 " . apiClientScopeSql('software_client_id') . " ORDER BY software_id LIMIT $limit OFFSET $offset"); + $sql = mysqli_query($mysqli, "SELECT * FROM software WHERE software_archived_at IS NULL AND 1=1 " . apiClientScopeSql('software_client_id') . " ORDER BY software_id LIMIT $limit OFFSET $offset"); } // Output