From d5f94819d0c0cfe36083923bf86b938757c44961 Mon Sep 17 00:00:00 2001 From: wrongecho Date: Wed, 18 Jun 2025 14:11:18 +0100 Subject: [PATCH 1/3] Fix 'Passing null to parameter' debug message --- functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions.php b/functions.php index 7c74dea4..7bbdbff6 100644 --- a/functions.php +++ b/functions.php @@ -199,7 +199,7 @@ function truncate($text, $chars) { function formatPhoneNumber($phoneNumber, $country_code = '', $show_country_code = false) { // Remove all non-digit characters - $digits = preg_replace('/\D/', '', $phoneNumber); + $digits = preg_replace('/\D/', '', $phoneNumber ?? ''); $formatted = ''; // If no digits at all, fallback early From 43ec144bf0b97b0c35e1a62449283e7fa472d70b Mon Sep 17 00:00:00 2001 From: wrongecho Date: Wed, 18 Jun 2025 14:47:21 +0100 Subject: [PATCH 2/3] Fix more debug errors --- functions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/functions.php b/functions.php index 7bbdbff6..b8cd56b4 100644 --- a/functions.php +++ b/functions.php @@ -1659,7 +1659,7 @@ function display_folder_options($parent_folder_id, $client_id, $folder_location function sanitize_url($url) { $allowed = ['http', 'https', 'file', 'ftp', 'ftps', 'sftp', 'dav', 'webdav', 'caldav', 'carddav', 'ssh', 'telnet', 'smb', 'rdp', 'vnc', 'rustdesk', 'anydesk', 'connectwise', 'splashtop', 'sip', 'sips', 'ldap', 'ldaps']; - $parts = parse_url($url); + $parts = parse_url($url ?? ''); if (isset($parts['scheme']) && !in_array(strtolower($parts['scheme']), $allowed)) { // Remove the scheme and colon $pos = strpos($url, ':'); @@ -1673,5 +1673,5 @@ function sanitize_url($url) { } // Safe schemes: return escaped original URL - return htmlspecialchars($url, ENT_QUOTES, 'UTF-8'); + return htmlspecialchars($url ?? '', ENT_QUOTES, 'UTF-8'); } \ No newline at end of file From 3b3e323ce5f144e3321b6881bf49f443e8cec957 Mon Sep 17 00:00:00 2001 From: wrongecho Date: Wed, 18 Jun 2025 14:48:13 +0100 Subject: [PATCH 3/3] Assets - Import CSV now takes purchase date too (MUST be in format YYYY-MM-DD, Excel is annoying and will silently reformat this at random) --- modals/asset_import_modal.php | 3 ++- post/user/asset.php | 49 ++++++++++++++++++++++++++++------- 2 files changed, 42 insertions(+), 10 deletions(-) diff --git a/modals/asset_import_modal.php b/modals/asset_import_modal.php index 25dc0deb..d5aa4f51 100644 --- a/modals/asset_import_modal.php +++ b/modals/asset_import_modal.php @@ -14,13 +14,14 @@
-

Format csv file with headings & data:
Name, Description, Type, Make, Model, Serial, OS, Assigned To, Location, Physical Location

+

Format csv file with headings & data:
Name, Description, Type, Make, Model, Serial, OS, Purchase Date, Assigned To, Location, Physical Location

Download sample csv template
+ Note: Purchase date must be in the format YYYY-MM-DD. Spreadsheet tools may automatically reformat dates.
diff --git a/post/user/asset.php b/post/user/asset.php index 560de0c1..57e7bb3e 100644 --- a/post/user/asset.php +++ b/post/user/asset.php @@ -802,10 +802,10 @@ if (isset($_POST["import_assets_csv"])) { $_SESSION['alert_message'] = "Bad file size (empty?)"; } - //(Else)Check column count (name, desc, type, make, model, serial, os, assigned to, location) + //(Else)Check column count (name, desc, type, make, model, serial, os, purchase date, assigned to, location) $f = fopen($file_name, "r"); $f_columns = fgetcsv($f, 1000, ","); - if (!$error & count($f_columns) != 10) { + if (!$error & count($f_columns) != 11) { $error = true; $_SESSION['alert_message'] = "Invalid column count."; } @@ -823,54 +823,85 @@ if (isset($_POST["import_assets_csv"])) { $contact_id = $location_id = 0; $duplicate_detect = 0; + + // Name if (isset($column[0])) { $name = sanitizeInput($column[0]); if (mysqli_num_rows(mysqli_query($mysqli,"SELECT * FROM assets WHERE asset_name = '$name' AND asset_client_id = $client_id")) > 0) { $duplicate_detect = 1; } } + + // Desc if (!empty($column[1])) { $description = sanitizeInput($column[1]); } + + // Type if (!empty($column[2])) { $type = sanitizeInput($column[2]); } + + // Make if (!empty($column[3])) { $make = sanitizeInput($column[3]); } + + // Model if (!empty($column[4])) { $model = sanitizeInput($column[4]); } + + // Serial if (!empty($column[5])) { $serial = sanitizeInput($column[5]); } + + // OS if (!empty($column[6])) { $os = sanitizeInput($column[6]); } + + // Purchase date if (!empty($column[7])) { - $contact = sanitizeInput($column[7]); + $purchase_date = sanitizeInput($column[7]); + + if (!preg_match('/^\d{4}-\d{2}-\d{2}$/', $purchase_date) || empty($purchase_date)) { + $purchase_date = "NULL"; + } else { + $purchase_date = "'" . $purchase_date . "'"; + } + } + + // Assigned to (contact) + if (!empty($column[8])) { + $contact = sanitizeInput($column[8]); if ($contact) { $sql_contact = mysqli_query($mysqli,"SELECT * FROM contacts WHERE contact_name = '$contact' AND contact_client_id = $client_id"); $row = mysqli_fetch_assoc($sql_contact); $contact_id = intval($row['contact_id']); } } - if (!empty($column[8])) { - $location = sanitizeInput($column[8]); + + // Location (lookup) + if (!empty($column[9])) { + $location = sanitizeInput($column[9]); if ($location) { $sql_location = mysqli_query($mysqli,"SELECT * FROM locations WHERE location_name = '$location' AND location_client_id = $client_id"); $row = mysqli_fetch_assoc($sql_location); $location_id = intval($row['location_id']); } } - if (!empty($column[9])) { - $physical_location = sanitizeInput($column[9]); + + // Physical location (varchar) + if (!empty($column[10])) { + $physical_location = sanitizeInput($column[10]); } // Check if duplicate was detected if ($duplicate_detect == 0) { //Add - mysqli_query($mysqli,"INSERT INTO assets SET asset_name = '$name', asset_description = '$description', asset_type = '$type', asset_make = '$make', asset_model = '$model', asset_serial = '$serial', asset_os = '$os', asset_physical_location = '$physical_location', asset_contact_id = $contact_id, asset_location_id = $location_id, asset_client_id = $client_id"); + mysqli_query($mysqli,"INSERT INTO assets SET asset_name = '$name', asset_description = '$description', asset_type = '$type', asset_make = '$make', asset_model = '$model', asset_serial = '$serial', asset_os = '$os', asset_purchase_date = $purchase_date, asset_physical_location = '$physical_location', asset_contact_id = $contact_id, asset_location_id = $location_id, asset_client_id = $client_id"); $asset_id = mysqli_insert_id($mysqli); @@ -913,7 +944,7 @@ if (isset($_GET['download_assets_csv_template'])) { $f = fopen('php://memory', 'w'); //set column headers - $fields = array('Name', 'Description', 'Type', 'Make', 'Model', 'Serial', 'OS', 'Assigned To', 'Location', 'Physical Location'); + $fields = array('Name', 'Description', 'Type', 'Make', 'Model', 'Serial', 'OS', 'Purchase Date', 'Assigned To', 'Location', 'Physical Location'); fputcsv($f, $fields, $delimiter); //move back to beginning of file