From 540512a1569bb66fb972851b287615d990324217 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 28 Nov 2025 15:26:26 -0500 Subject: [PATCH] remove folder location vars as no longer needed as files and documents have been merged --- agent/document_details.php | 28 ++++++++++++------------- agent/modals/document/document_edit.php | 4 ++-- agent/modals/folder/folder_add.php | 2 -- functions.php | 12 ++++------- 4 files changed, 20 insertions(+), 26 deletions(-) diff --git a/agent/document_details.php b/agent/document_details.php index d6b8d347..45dd35b4 100644 --- a/agent/document_details.php +++ b/agent/document_details.php @@ -17,7 +17,7 @@ if (isset($_GET['document_id'])) { $folder_location = 0; -$sql_document = mysqli_query($mysqli, "SELECT * FROM documents +$sql_document = mysqli_query($mysqli, "SELECT * FROM documents LEFT JOIN folders ON document_folder_id = folder_id LEFT JOIN users ON document_created_by = user_id WHERE document_client_id = $client_id AND document_id = $document_id @@ -51,10 +51,10 @@ $page_title = $row['document_name'];
  1. - +
  2. - Documents + Files
  3. - +
    4. @@ -92,9 +92,9 @@ $page_title = $row['document_name']; } ?>
  4. - - (ARCHIVED on $document_archived_at)"; + + (ARCHIVED on $document_archived_at)"; } ?>
@@ -170,9 +170,9 @@ $page_title = $row['document_name']; - @@ -208,7 +208,7 @@ $page_title = $row['document_name'];
- + diff --git a/agent/modals/document/document_edit.php b/agent/modals/document/document_edit.php index 59805148..14112bf9 100644 --- a/agent/modals/document/document_edit.php +++ b/agent/modals/document/document_edit.php @@ -5,7 +5,7 @@ require_once '../../../includes/modal_header.php'; $document_id = intval($_GET['id']); $sql = mysqli_query($mysqli, "SELECT * FROM documents WHERE document_id = $document_id LIMIT 1"); - + $row = mysqli_fetch_array($sql); $document_name = nullable_htmlentities($row['document_name']); $document_description = nullable_htmlentities($row['document_description']); @@ -45,7 +45,7 @@ ob_start(); -
diff --git a/functions.php b/functions.php index dd8b91c4..8bc6ffdb 100644 --- a/functions.php +++ b/functions.php @@ -1429,7 +1429,7 @@ function appNotify($type, $details, $action = null, $client_id = 0, $entity_id = $details = substr($details, 0, 1000); $action = substr($action, 0, 250); - $sql = mysqli_query($mysqli, "SELECT user_id FROM users + $sql = mysqli_query($mysqli, "SELECT user_id FROM users WHERE user_type = 1 AND user_status = 1 AND user_archived_at IS NULL "); @@ -1568,14 +1568,10 @@ function getFieldById($table, $id, $field, $escape_method = 'sql') { } // Recursive function to display folder options - Used in folders files and documents -function display_folder_options($parent_folder_id, $client_id, $folder_location = 0, $indent = 0) { +function display_folder_options($parent_folder_id, $client_id, $indent = 0) { global $mysqli; - $folder_location = intval($folder_location); - // 0 = Document Folders - // 1 = File Folders - - $sql_folders = mysqli_query($mysqli, "SELECT * FROM folders WHERE parent_folder = $parent_folder_id AND folder_location = $folder_location 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_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']); @@ -1593,7 +1589,7 @@ function display_folder_options($parent_folder_id, $client_id, $folder_location echo ""; // Recursively display subfolders - display_folder_options($folder_id, $client_id, $folder_location, $indent + 1); + display_folder_options($folder_id, $client_id, $indent + 1); } }