diff --git a/client_document_add_from_template_modal.php b/client_document_add_from_template_modal.php index be3b78e1..26ca894c 100644 --- a/client_document_add_from_template_modal.php +++ b/client_document_add_from_template_modal.php @@ -45,6 +45,16 @@ + +
+
+
+ +
+ +
+
+
diff --git a/client_document_add_modal.php b/client_document_add_modal.php index af94381c..1b44d98c 100644 --- a/client_document_add_modal.php +++ b/client_document_add_modal.php @@ -41,6 +41,16 @@
+ + +
+
+
+ +
+ +
+
diff --git a/client_document_details.php b/client_document_details.php index eacc4c0d..93b428de 100644 --- a/client_document_details.php +++ b/client_document_details.php @@ -14,20 +14,26 @@ if (isset($_GET['document_id'])) { $folder_location = 0; -$sql_document = mysqli_query($mysqli, "SELECT * FROM documents LEFT JOIN folders ON document_folder_id = folder_id WHERE document_client_id = $client_id AND document_id = $document_id"); +$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" +); $row = mysqli_fetch_array($sql_document); $folder_name = nullable_htmlentities($row['folder_name']); $document_name = nullable_htmlentities($row['document_name']); +$document_description = nullable_htmlentities($row['document_description']); $document_content = $purifier->purify($row['document_content']); +$document_created_by_id = intval($row['document_created_by']); +$document_created_by_name = nullable_htmlentities($row['user_name']); $document_created_at = nullable_htmlentities($row['document_created_at']); $document_updated_at = nullable_htmlentities($row['document_updated_at']); $document_archived_at = nullable_htmlentities($row['document_archived_at']); $document_folder_id = intval($row['document_folder_id']); $document_parent = intval($row['document_parent']); - ?>
    @@ -48,6 +54,11 @@ $document_parent = intval($row['document_parent']);
    +

    + +
    Date:
    +
    Prepared By:
    +
    Revision:
    @@ -235,6 +246,7 @@ $document_parent = intval($row['document_parent']); diff --git a/client_document_edit_modal.php b/client_document_edit_modal.php index 4482f7b6..3ba73644 100644 --- a/client_document_edit_modal.php +++ b/client_document_edit_modal.php @@ -11,6 +11,7 @@ +
    @@ -42,6 +43,10 @@
    +
    + +
    +
    diff --git a/client_documents.php b/client_documents.php index 407b4ff3..2f9ffd14 100644 --- a/client_documents.php +++ b/client_documents.php @@ -35,6 +35,7 @@ $folder_location = 0; $sql = mysqli_query( $mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM documents + LEFT JOIN users ON document_created_by = user_id WHERE document_client_id = $client_id AND document_template = 0 AND document_folder_id = $folder @@ -189,7 +190,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); while ($row = mysqli_fetch_array($sql)) { $document_id = intval($row['document_id']); $document_name = nullable_htmlentities($row['document_name']); + $document_description = nullable_htmlentities($row['document_description']); $document_content = nullable_htmlentities($row['document_content']); + $document_created_by_name = nullable_htmlentities($row['user_name']); $document_created_at = date("m/d/Y",strtotime($row['document_created_at'])); $document_updated_at = date("m/d/Y",strtotime($row['document_updated_at'])); $document_folder_id = intval($row['document_folder_id']); @@ -200,7 +203,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()")); - +
    diff --git a/post/document.php b/post/document.php index f881b395..bd3d53ef 100644 --- a/post/document.php +++ b/post/document.php @@ -10,6 +10,7 @@ if (isset($_POST['add_document'])) { $client_id = intval($_POST['client_id']); $name = sanitizeInput($_POST['name']); + $description = sanitizeInput($_POST['description']); $content = mysqli_real_escape_string($mysqli,$_POST['content']); $content_raw = sanitizeInput($_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. @@ -17,7 +18,7 @@ if (isset($_POST['add_document'])) { $folder = intval($_POST['folder']); // Document add query - $add_document = 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"); + $add_document = mysqli_query($mysqli,"INSERT INTO documents SET document_name = '$name', document_description = '$description', document_content = '$content', document_content_raw = '$content_raw', document_template = 0, document_folder_id = $folder, document_created_by = $session_user_id, document_client_id = $client_id"); $document_id = mysqli_insert_id($mysqli); // Update field document_parent to be the same id as document ID as this is the only version of the document. @@ -38,12 +39,13 @@ if (isset($_POST['add_document_template'])) { $client_id = intval($_POST['client_id']); $name = sanitizeInput($_POST['name']); + $description = sanitizeInput($_POST['description']); $content = mysqli_real_escape_string($mysqli,$_POST['content']); $content_raw = sanitizeInput($_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. // Document add query - $add_document = mysqli_query($mysqli,"INSERT INTO documents SET document_name = '$name', document_content = '$content', document_content_raw = '$content_raw', document_template = 1, document_folder_id = 0, document_client_id = 0"); + $add_document = mysqli_query($mysqli,"INSERT INTO documents SET document_name = '$name', document_description = '$description', document_content = '$content', document_content_raw = '$content_raw', document_template = 1, document_folder_id = 0, document_created_by = $session_user_id, document_client_id = 0"); $document_id = mysqli_insert_id($mysqli); // Logging @@ -63,6 +65,7 @@ if (isset($_POST['add_document_from_template'])) { // GET POST Data $client_id = intval($_POST['client_id']); $document_name = sanitizeInput($_POST['name']); + $document_description = sanitizeInput($_POST['description']); $document_template_id = intval($_POST['document_template_id']); $folder = intval($_POST['folder']); @@ -76,7 +79,7 @@ if (isset($_POST['add_document_from_template'])) { $content_raw = sanitizeInput($_POST['name'] . " " . str_replace("<", " <", $row['document_content'])); // Document add query - mysqli_query($mysqli,"INSERT INTO documents SET document_name = '$document_name', document_content = '$content', document_content_raw = '$content_raw', document_template = 0, document_folder_id = $folder, document_client_id = $client_id"); + mysqli_query($mysqli,"INSERT INTO documents SET document_name = '$document_name', document_description = '$document_description', document_content = '$content', document_content_raw = '$content_raw', document_template = 0, document_folder_id = $folder, document_created_by = $session_user_id, document_client_id = $client_id"); $document_id = mysqli_insert_id($mysqli); @@ -94,16 +97,18 @@ if (isset($_POST['edit_document'])) { validateTechRole(); $document_id = intval($_POST['document_id']); + $document_created_by = intval($_POST['created_by']); $document_parent = intval($_POST['document_parent']); $client_id = intval($_POST['client_id']); $name = sanitizeInput($_POST['name']); + $description = sanitizeInput($_POST['description']); $content = mysqli_real_escape_string($mysqli,$_POST['content']); $content_raw = sanitizeInput($_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. $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"); + mysqli_query($mysqli,"INSERT INTO documents SET document_name = '$name', document_description = '$description', document_content = '$content', document_content_raw = '$content_raw', document_template = 0, document_folder_id = $folder, document_created_by = $document_created_by, document_updated_by = $session_user_id, document_client_id = $client_id"); $new_document_id = mysqli_insert_id($mysqli); @@ -371,12 +376,13 @@ if (isset($_POST['edit_document_template'])) { $document_id = intval($_POST['document_id']); $name = sanitizeInput($_POST['name']); + $description = sanitizeInput($_POST['description']); $content = mysqli_real_escape_string($mysqli,$_POST['content']); $content_raw = sanitizeInput($_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. // Document edit query - mysqli_query($mysqli,"UPDATE documents SET document_name = '$name', document_content = '$content', document_content_raw = '$content_raw' WHERE document_id = $document_id"); + mysqli_query($mysqli,"UPDATE documents SET document_name = '$name', document_description = '$description', document_content = '$content', document_content_raw = '$content_raw' WHERE document_id = $document_id"); //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Document Template', log_action = 'Modify', log_description = '$session_name modified document template $name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, log_entity_id = $document_id"); @@ -402,6 +408,22 @@ if (isset($_GET['archive_document'])) { mysqli_query($mysqli,"UPDATE documents SET document_archived_at = NOW() WHERE document_id = $document_id"); + // Remove Associations + // File Association + mysqli_query($mysqli,"DELETE FROM document_files WHERE document_id = $document_id"); + + // Contact Associations + mysqli_query($mysqli,"DELETE FROM contact_documents WHERE document_id = $document_id"); + + // Asset Associations + mysqli_query($mysqli,"DELETE FROM asset_documents WHERE document_id = $document_id"); + + // Software Associations + mysqli_query($mysqli,"DELETE FROM software_documents WHERE document_id = $document_id"); + + // Vendor Associations + mysqli_query($mysqli,"DELETE FROM vendor_documents WHERE document_id = $document_id"); + //logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Document', log_action = 'Archive', log_description = '$session_name archived document $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"); @@ -420,6 +442,22 @@ if (isset($_GET['delete_document'])) { mysqli_query($mysqli,"DELETE FROM documents WHERE document_id = $document_id"); + // Remove Associations + // File Association + mysqli_query($mysqli,"DELETE FROM document_files WHERE document_id = $document_id"); + + // Contact Associations + mysqli_query($mysqli,"DELETE FROM contact_documents WHERE document_id = $document_id"); + + // Asset Associations + mysqli_query($mysqli,"DELETE FROM asset_documents WHERE document_id = $document_id"); + + // Software Associations + mysqli_query($mysqli,"DELETE FROM software_documents WHERE document_id = $document_id"); + + // Vendor Associations + mysqli_query($mysqli,"DELETE FROM vendor_documents WHERE document_id = $document_id"); + //Logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Document', log_action = 'Delete', log_description = '$document_id', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id");