Replace the rest of the getFallBack Functions with simple ?: '-'

This commit is contained in:
johnnyq
2026-07-14 19:17:26 -04:00
parent bcb244c245
commit c3a438ee59
4 changed files with 5 additions and 5 deletions

View File

@@ -536,10 +536,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
$asset_serial_display = "-"; $asset_serial_display = "-";
} }
$asset_os = escapeHtml($row['asset_os']); $asset_os = escapeHtml($row['asset_os']);
$asset_ip = getFallBack(escapeHtml($row['interface_ip'])); $asset_ip = escapeHtml($row['interface_ip']) ?: '-';
$asset_ipv6 = escapeHtml($row['interface_ipv6']); $asset_ipv6 = escapeHtml($row['interface_ipv6']);
$asset_nat_ip = escapeHtml($row['interface_nat_ip']); $asset_nat_ip = escapeHtml($row['interface_nat_ip']);
$asset_mac = escapeHtml(getFallBack($row['interface_mac'])); $asset_mac = escapeHtml($row['interface_mac']) ?: '-';
$asset_uri = sanitize_url($row['asset_uri']); $asset_uri = sanitize_url($row['asset_uri']);
$asset_uri_2 = sanitize_url($row['asset_uri_2']); $asset_uri_2 = sanitize_url($row['asset_uri_2']);
$asset_uri_client = sanitize_url($row['asset_uri_client']); $asset_uri_client = sanitize_url($row['asset_uri_client']);

View File

@@ -338,7 +338,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
} else { } else {
$contact_title_display = "<small class='text-secondary'>$contact_title</small>"; $contact_title_display = "<small class='text-secondary'>$contact_title</small>";
} }
$contact_department = getFallBack(escapeHtml($row['contact_department'])); $contact_department = escapeHtml($row['contact_department']) ?: '-';
$contact_extension = escapeHtml($row['contact_extension']); $contact_extension = escapeHtml($row['contact_extension']);
if (empty($contact_extension)) { if (empty($contact_extension)) {
$contact_extension_display = ""; $contact_extension_display = "";

View File

@@ -76,7 +76,7 @@ $sql_vendor_expenses = mysqli_query($mysqli, "
<?php <?php
while ($row = mysqli_fetch_assoc($sql_vendor_expenses)) { while ($row = mysqli_fetch_assoc($sql_vendor_expenses)) {
$vendor_id = intval($row['vendor_id']); $vendor_id = intval($row['vendor_id']);
$vendor_name = nullable_htmlentities($row['vendor_name']); $vendor_name = escapeHtml($row['vendor_name']);
$amount_paid = floatval($row['amount_paid']); ?> $amount_paid = floatval($row['amount_paid']); ?>
<tr> <tr>

View File

@@ -201,7 +201,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
$software_description = escapeHtml($row['software_description']); $software_description = escapeHtml($row['software_description']);
$software_version = escapeHtml($row['software_version']); $software_version = escapeHtml($row['software_version']);
$software_type = escapeHtml($row['software_type']); $software_type = escapeHtml($row['software_type']);
$software_license_type = getFallBack(escapeHtml($row['software_license_type'])); $software_license_type = escapeHtml($row['software_license_type']) ?: '-';
$software_seats = escapeHtml($row['software_seats']); $software_seats = escapeHtml($row['software_seats']);
$software_expire = escapeHtml($row['software_expire']); $software_expire = escapeHtml($row['software_expire']);
$vendor_name = escapeHtml($row['vendor_name']); $vendor_name = escapeHtml($row['vendor_name']);