From af123d397836d58d7a8b2b375b25e079664421f3 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Mon, 28 Oct 2024 22:12:45 -0400 Subject: [PATCH] Fix Only show Document Folders, Removed Create Subfolder as this is now merged into Create Folder Dependign on what folder you are in --- client_document_add_modal.php | 2 +- client_document_bulk_move_modal.php | 2 +- client_document_details.php | 6 +++-- client_document_move_modal.php | 2 +- client_documents.php | 13 +++++------ folder_create_modal.php | 3 ++- folder_sub_create_modal.php | 34 ----------------------------- post/user/folder.php | 23 +------------------ 8 files changed, 16 insertions(+), 69 deletions(-) delete mode 100644 folder_sub_create_modal.php diff --git a/client_document_add_modal.php b/client_document_add_modal.php index 1b8683ef..0f43c3f8 100644 --- a/client_document_add_modal.php +++ b/client_document_add_modal.php @@ -43,7 +43,7 @@ function display_folder_options($parent_folder_id, $client_id, $indent = 0) { global $mysqli; - $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE parent_folder = $parent_folder_id AND folder_client_id = $client_id ORDER BY folder_name ASC"); + $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE parent_folder = $parent_folder_id AND folder_location = 0 AND folder_client_id = $client_id ORDER BY folder_name ASC"); while ($row = mysqli_fetch_array($sql_folders)) { $folder_id = intval($row['folder_id']); $folder_name = nullable_htmlentities($row['folder_name']); diff --git a/client_document_bulk_move_modal.php b/client_document_bulk_move_modal.php index 01d7311f..2fe8a524 100644 --- a/client_document_bulk_move_modal.php +++ b/client_document_bulk_move_modal.php @@ -19,7 +19,7 @@
  • - - + +
    • /
  • - - + +
    • "> Rename - - Create Sub-Folder - @@ -254,7 +254,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); // Include the rename and create subfolder modals require "folder_rename_modal.php"; - require "folder_sub_create_modal.php"; if ($subfolder_count > 0) { // Display subfolders diff --git a/folder_create_modal.php b/folder_create_modal.php index 8d924f23..1323d5e5 100644 --- a/folder_create_modal.php +++ b/folder_create_modal.php @@ -2,7 +2,7 @@
    -
    New Folder
    +
    Creating folder in 0) { echo $folder['folder_name']; } else { echo "/"; } ?>
    @@ -10,6 +10,7 @@
    +
    diff --git a/folder_sub_create_modal.php b/folder_sub_create_modal.php deleted file mode 100644 index b3b0a6d0..00000000 --- a/folder_sub_create_modal.php +++ /dev/null @@ -1,34 +0,0 @@ - diff --git a/post/user/folder.php b/post/user/folder.php index 2b81e48d..63e4a1b3 100644 --- a/post/user/folder.php +++ b/post/user/folder.php @@ -8,27 +8,6 @@ if (isset($_POST['create_folder'])) { validateTechRole(); - $client_id = intval($_POST['client_id']); - $folder_location = intval($_POST['folder_location']); - $folder_name = sanitizeInput($_POST['folder_name']); - - // Document folder add query - $add_folder = mysqli_query($mysqli,"INSERT INTO folders SET folder_name = '$folder_name', folder_location = $folder_location, folder_client_id = $client_id"); - $folder_id = mysqli_insert_id($mysqli); - - // Logging - mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Folder', log_action = 'Create', log_description = '$session_name created folder $folder_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $folder_id"); - - $_SESSION['alert_message'] = "Folder $folder_name created"; - - header("Location: " . $_SERVER["HTTP_REFERER"]); - -} - -if (isset($_POST['create_sub_folder'])) { - - validateTechRole(); - $client_id = intval($_POST['client_id']); $folder_location = intval($_POST['folder_location']); $folder_name = sanitizeInput($_POST['folder_name']); @@ -39,7 +18,7 @@ if (isset($_POST['create_sub_folder'])) { $folder_id = mysqli_insert_id($mysqli); // Logging - mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Folder', log_action = 'Create', log_description = '$session_name created sub folder $folder_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $folder_id"); + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Folder', log_action = 'Create', log_description = '$session_name created folder $folder_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $folder_id"); $_SESSION['alert_message'] = "Folder $folder_name created";