From 7a561a8c2e68fc9f8e55daa1387859787f6e521e Mon Sep 17 00:00:00 2001 From: wrongecho Date: Thu, 14 Nov 2024 11:51:39 +0000 Subject: [PATCH] Import CSV - Check file uploaded Check the file was uploaded when importing a CSV. Can probably convert this into a function at a later date. --- client_asset_import_modal.php | 2 +- client_contact_import_modal.php | 2 +- client_import_modal.php | 3 +-- client_location_import_modal.php | 2 +- client_login_import_modal.php | 2 +- post/user/asset.php | 10 ++++++++++ post/user/client.php | 13 ++++++++++--- post/user/contact.php | 10 +++++++++- post/user/credential.php | 10 +++++++++- post/user/location.php | 10 +++++++++- 10 files changed, 52 insertions(+), 12 deletions(-) diff --git a/client_asset_import_modal.php b/client_asset_import_modal.php index 583bf3464..cc10bd7b4 100644 --- a/client_asset_import_modal.php +++ b/client_asset_import_modal.php @@ -14,7 +14,7 @@

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

- +
Download sample csv template
diff --git a/client_contact_import_modal.php b/client_contact_import_modal.php index a7c02bfd6..bc567b601 100644 --- a/client_contact_import_modal.php +++ b/client_contact_import_modal.php @@ -13,7 +13,7 @@

Format csv file with headings & data:
Name, Title, Department, Email, Phone, Extension, Mobile, Location

- +
Download: sample csv template
diff --git a/client_import_modal.php b/client_import_modal.php index eb447ebed..e6d9eacd4 100644 --- a/client_import_modal.php +++ b/client_import_modal.php @@ -8,12 +8,11 @@
-

Format csv file with headings & data:
Client Name, Industry, Referral, Website, Location Name, Location Phone, Location Address, City, State, Postal Code, Country, Contact Name, Title, Contact Phone, Extension, Contact Mobile, Contact Email, Hourly Rate, Currency, Payment Terms, Tax ID, Abbreviation

- +
Download: sample csv template
diff --git a/client_location_import_modal.php b/client_location_import_modal.php index 42cf942e8..579d82b9f 100644 --- a/client_location_import_modal.php +++ b/client_location_import_modal.php @@ -13,7 +13,7 @@

Format csv file with headings & data:
Name, Description, Address, City, State, Postal Code, Phone, Hours

- +
Download: sample csv template
diff --git a/client_login_import_modal.php b/client_login_import_modal.php index edf7edc48..566ccdda0 100644 --- a/client_login_import_modal.php +++ b/client_login_import_modal.php @@ -13,7 +13,7 @@

Format csv file with headings & data:
Name, Description, Username, Password, URL

- +
Download sample csv template
diff --git a/post/user/asset.php b/post/user/asset.php index 9a1885bac..b9ee2c4b6 100644 --- a/post/user/asset.php +++ b/post/user/asset.php @@ -473,8 +473,18 @@ $client_id = intval($_POST['client_id']); $file_name = $_FILES["file"]["tmp_name"]; + $error = false; + if (!empty($_FILES["file"]["tmp_name"])) { + $file_name = $_FILES["file"]["tmp_name"]; + } else { + $_SESSION['alert_message'] = "Please select a file to upload."; + $_SESSION['alert_type'] = "error"; + header("Location: " . $_SERVER["HTTP_REFERER"]); + exit(); + } + //Check file is CSV $file_extension = strtolower(end(explode('.',$_FILES['file']['name']))); $allowed_file_extensions = array('csv'); diff --git a/post/user/client.php b/post/user/client.php index d497b25a8..60f839ac4 100644 --- a/post/user/client.php +++ b/post/user/client.php @@ -387,10 +387,17 @@ if (isset($_POST["import_clients_csv"])) { enforceUserPermission('module_client', 2); - - $file_name = $_FILES["file"]["tmp_name"]; $error = false; + if (!empty($_FILES["file"]["tmp_name"])) { + $file_name = $_FILES["file"]["tmp_name"]; + } else { + $_SESSION['alert_message'] = "Please select a file to upload."; + $_SESSION['alert_type'] = "error"; + header("Location: " . $_SERVER["HTTP_REFERER"]); + exit(); + } + //Check file is CSV $file_extension = strtolower(end(explode('.',$_FILES['file']['name']))); $allowed_file_extensions = array('csv'); @@ -589,7 +596,7 @@ if (isset($_GET['download_clients_csv_template'])) { $delimiter = ","; - $filename = strtoAZaz09($client_name) . "-Clients-Template.csv"; + $filename = "Clients-Template.csv"; //create a file pointer $f = fopen('php://memory', 'w'); diff --git a/post/user/contact.php b/post/user/contact.php index a537a842b..d5fbe7fcf 100644 --- a/post/user/contact.php +++ b/post/user/contact.php @@ -822,9 +822,17 @@ enforceUserPermission('module_client', 2); $client_id = intval($_POST['client_id']); - $file_name = $_FILES["file"]["tmp_name"]; $error = false; + if (!empty($_FILES["file"]["tmp_name"])) { + $file_name = $_FILES["file"]["tmp_name"]; + } else { + $_SESSION['alert_message'] = "Please select a file to upload."; + $_SESSION['alert_type'] = "error"; + header("Location: " . $_SERVER["HTTP_REFERER"]); + exit(); + } + //Check file is CSV $file_extension = strtolower(end(explode('.',$_FILES['file']['name']))); $allowed_file_extensions = array('csv'); diff --git a/post/user/credential.php b/post/user/credential.php index 491b3b1a0..cce38199c 100644 --- a/post/user/credential.php +++ b/post/user/credential.php @@ -377,9 +377,17 @@ enforceUserPermission('module_credential', 2); $client_id = intval($_POST['client_id']); - $file_name = $_FILES["file"]["tmp_name"]; $error = false; + if (!empty($_FILES["file"]["tmp_name"])) { + $file_name = $_FILES["file"]["tmp_name"]; + } else { + $_SESSION['alert_message'] = "Please select a file to upload."; + $_SESSION['alert_type'] = "error"; + header("Location: " . $_SERVER["HTTP_REFERER"]); + exit(); + } + //Check file is CSV $file_extension = strtolower(end(explode('.',$_FILES['file']['name']))); $allowed_file_extensions = array('csv'); diff --git a/post/user/location.php b/post/user/location.php index 6cedd3ede..6df8c008a 100644 --- a/post/user/location.php +++ b/post/user/location.php @@ -429,9 +429,17 @@ enforceUserPermission('module_client', 2); $client_id = intval($_POST['client_id']); - $file_name = $_FILES["file"]["tmp_name"]; $error = false; + if (!empty($_FILES["file"]["tmp_name"])) { + $file_name = $_FILES["file"]["tmp_name"]; + } else { + $_SESSION['alert_message'] = "Please select a file to upload."; + $_SESSION['alert_type'] = "error"; + header("Location: " . $_SERVER["HTTP_REFERER"]); + exit(); + } + //Check file is CSV $file_extension = strtolower(end(explode('.',$_FILES['file']['name']))); $allowed_file_extensions = array('csv');