From 8d9f031cab276245464be96707514014483b8fff Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sat, 23 Sep 2023 15:54:31 -0400 Subject: [PATCH] Feature: Document Versioning is here! --- client_document_details.php | 36 ++++++++++++++++++++++++++++++++-- client_document_edit_modal.php | 2 +- database_updates.php | 12 ++++++++++-- database_version.php | 2 +- db.sql | 17 +++++++++++++++- post/document.php | 22 ++++++++++++++++----- 6 files changed, 79 insertions(+), 12 deletions(-) diff --git a/client_document_details.php b/client_document_details.php index fd148250..1fa57a30 100644 --- a/client_document_details.php +++ b/client_document_details.php @@ -24,6 +24,8 @@ $document_content = $purifier->purify($row['document_content']); $document_created_at = nullable_htmlentities($row['document_created_at']); $document_updated_at = nullable_htmlentities($row['document_updated_at']); $document_folder_id = intval($row['document_folder_id']); +$document_parent = intval($row['document_parent']); + ?> @@ -59,8 +61,7 @@ $document_folder_id = intval($row['document_folder_id']);
-
Related
-
+
Related
Files
- +
diff --git a/database_updates.php b/database_updates.php index 08b358b5..fd14e04e 100644 --- a/database_updates.php +++ b/database_updates.php @@ -1331,11 +1331,19 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.8.2'"); } - //if (CURRENT_DATABASE_VERSION == '0.8.2') { + if (CURRENT_DATABASE_VERSION == '0.8.2') { //Insert queries here required to update to DB version 0.8.3 + mysqli_query($mysqli, "ALTER TABLE `documents` ADD `document_parent` INT(11) NOT NULL DEFAULT 0 AFTER `document_content_raw`"); // Then, update the database to the next sequential version - //mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.8.3'"); + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.8.3'"); + } + + //if (CURRENT_DATABASE_VERSION == '0.8.3') { + //Insert queries here required to update to DB version 0.8.4 + + // Then, update the database to the next sequential version + //mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '0.8.4'"); //} } else { diff --git a/database_version.php b/database_version.php index c84f0ad7..f60a8cd1 100644 --- a/database_version.php +++ b/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "0.8.2"); +DEFINE("LATEST_DATABASE_VERSION", "0.8.3"); diff --git a/db.sql b/db.sql index 5d28e81f..54d323d9 100644 --- a/db.sql +++ b/db.sql @@ -426,6 +426,20 @@ CREATE TABLE `custom_values` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `document_files` +-- + +DROP TABLE IF EXISTS `document_files`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `document_files` ( + `document_id` int(11) NOT NULL, + `file_id` int(11) NOT NULL, + PRIMARY KEY (`document_id`,`file_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `documents` -- @@ -438,6 +452,7 @@ CREATE TABLE `documents` ( `document_name` varchar(200) NOT NULL, `document_content` longtext NOT NULL, `document_content_raw` longtext NOT NULL, + `document_parent` int(11) NOT NULL DEFAULT 0, `document_created_at` datetime NOT NULL DEFAULT current_timestamp(), `document_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), `document_archived_at` datetime DEFAULT NULL, @@ -1700,4 +1715,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2023-09-17 17:15:39 +-- Dump completed on 2023-09-23 15:54:04 diff --git a/post/document.php b/post/document.php index 5f6525ec..6d84de74 100644 --- a/post/document.php +++ b/post/document.php @@ -98,17 +98,29 @@ if (isset($_POST['edit_document'])) { // Content Raw is used for FULL INDEX searching. Adding a space before HTML tags to allow spaces between newlines, bulletpoints, etc. for searching. $folder = intval($_POST['folder']); + // Document add query + mysqli_query($mysqli,"INSERT INTO documents SET document_name = '$name', document_content = '$content', document_content_raw = '$content_raw', document_template = 0, document_folder_id = $folder, document_client_id = $client_id"); + + $new_document_id = mysqli_insert_id($mysqli); + // Document edit query - 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"); + mysqli_query($mysqli,"UPDATE documents SET document_parent = $new_document_id, document_archived_at = NOW() WHERE document_id = $document_id"); + + // Update all Previous versions with the new parent document ID + $sql_documents = mysqli_query($mysqli, "SELECT * FROM documents WHERE document_parent = $document_id"); + + while ($row = mysqli_fetch_array($sql_documents)) { + $old_document_id = intval($row['document_id']); + mysqli_query($mysqli,"UPDATE documents SET document_parent = $new_document_id WHERE document_id = $old_document_id"); + } //Logging - mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Document', log_action = 'Modify', log_description = '$session_name updated document $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 = $document_id"); + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Document', log_action = 'Edit', log_description = '$session_name Edited document $name previous version was kept', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $new_document_id"); - $_SESSION['alert_message'] = "Document $name updated"; - - header("Location: " . $_SERVER["HTTP_REFERER"]); + $_SESSION['alert_message'] = "Document $name updated, previous version kept"; + header("Location: client_document_details.php?client_id=$client_id&document_id=$new_document_id"); } if (isset($_POST['move_document'])) {