From c6cd1b0be7ffd028edcfde0dfc984948e4d71599 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Fri, 20 Jan 2023 14:56:27 -0500 Subject: [PATCH] Documents and Document Template Fixes, Fixed issue not displaying foldername in the breadcrumbs under document details. When Creating a document from template didnt redirect to the right place for editing. eliminated folder get var in document details as its unneeded --- client_document_add_modal.php | 21 +++------------------ client_document_details.php | 10 +++------- client_document_edit_modal.php | 22 ++++------------------ client_documents.php | 2 +- get_settings.php | 2 +- post.php | 5 ++--- 6 files changed, 14 insertions(+), 48 deletions(-) diff --git a/client_document_add_modal.php b/client_document_add_modal.php index bbb04e00..0211a42d 100644 --- a/client_document_add_modal.php +++ b/client_document_add_modal.php @@ -18,23 +18,8 @@
- -
- -
-
-
- -
- -
-
- -
+
@@ -56,10 +41,10 @@
- +
+
-
diff --git a/client_document_details.php b/client_document_details.php index e44765a6..4e084c59 100644 --- a/client_document_details.php +++ b/client_document_details.php @@ -2,10 +2,6 @@ Documents - 0){ ?> + 0){ ?>
  • - +
    • diff --git a/client_document_edit_modal.php b/client_document_edit_modal.php index a4a9763b..5db84ffb 100644 --- a/client_document_edit_modal.php +++ b/client_document_edit_modal.php @@ -18,24 +18,8 @@
    - -
    -
    -
    -
    -
    - -
    - -
    -
    - -
    +
    @@ -55,7 +39,9 @@
    - + +
    +
    diff --git a/client_documents.php b/client_documents.php index 83aa5048..70766140 100644 --- a/client_documents.php +++ b/client_documents.php @@ -180,7 +180,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); - + diff --git a/get_settings.php b/get_settings.php index 3a490139..0fb64176 100644 --- a/get_settings.php +++ b/get_settings.php @@ -83,7 +83,7 @@ $config_currency_format = "US_en"; // Theme $config_theme = $row['config_theme']; -$config_enable_dark_mode = "dark_mode"; +$config_theme_mode = "dark_mode"; $colors_array = array( 'blue', diff --git a/post.php b/post.php index 3f3187b8..2c90ff28 100644 --- a/post.php +++ b/post.php @@ -6860,7 +6860,7 @@ if(isset($_POST['add_document_from_template'])){ $_SESSION['alert_message'] = "Document created from template"; - header("Location: client_document_template_details.php?client_id=$client_id&document_id=$document_id"); + header("Location: client_document_details.php?client_id=$client_id&document_id=$document_id"); } @@ -6879,11 +6879,10 @@ if(isset($_POST['edit_document'])){ $content = trim(mysqli_real_escape_string($mysqli,$purifier->purify(html_entity_decode($_POST['content'])))); $content_raw = trim(mysqli_real_escape_string($mysqli, strip_tags($_POST['name'] . " " . str_replace("<", " <", $_POST['content'])))); // Content Raw is used for FULL INDEX searching. Adding a space before HTML tags to allow spaces between newlines, bulletpoints, etc. for searching. - $template = intval($_POST['template']); $folder = intval($_POST['folder']); // Document edit query - mysqli_query($mysqli,"UPDATE documents SET document_name = '$name', document_content = '$content', document_content_raw = '$content_raw', document_template = $template, document_folder_id = $folder WHERE document_id = $document_id AND company_id = $session_company_id"); + mysqli_query($mysqli,"UPDATE documents SET document_name = '$name', document_content = '$content', document_content_raw = '$content_raw', document_folder_id = $folder WHERE document_id = $document_id AND company_id = $session_company_id"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Document', log_action = 'Modify', log_description = '$name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, company_id = $session_company_id");