From 173dd35d42a8758cb4db15f1d86c3264492f6fa0 Mon Sep 17 00:00:00 2001
From: BJRambo <sosifam@070805.co.kr>
Date: Fri, 13 May 2016 21:58:47 +0900
Subject: [PATCH] Add to processing in accordance with the set value.

---
 modules/board/board.controller.php       | 23 ++++++++++++++++++-----
 modules/document/document.controller.php |  6 ++++++
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/modules/board/board.controller.php b/modules/board/board.controller.php
index dfe95b9ff..ae9176faf 100644
--- a/modules/board/board.controller.php
+++ b/modules/board/board.controller.php
@@ -292,13 +292,26 @@ class boardController extends board
 			}
 		}
 		// generate document module controller object
+		$oTrashModel = getModel('trash');
+		$config = $oTrashModel->getConfig();
 		$oDocumentController = getController('document');
-
-		// delete the document
-		$output = $oDocumentController->deleteDocument($document_srl, $this->grant->manager);
-		if(!$output->toBool())
+		if($config->trash_use == 'Y')
 		{
-			return $output;
+			// move the trash
+			$output = $oDocumentController->moveDocumentToTrash($oDocument);
+			if(!$output->toBool())
+			{
+				return $output;
+			}
+		}
+		else
+		{
+			// delete the document
+			$output = $oDocumentController->deleteDocument($document_srl, $this->grant->manager);
+			if(!$output->toBool())
+			{
+				return $output;
+			}
 		}
 
 		// alert an message
diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index 9d620f066..1dd4e2e3e 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -1062,6 +1062,12 @@ class documentController extends document
 				$oDB->rollback();
 				return $trigger_output;
 			}
+			$trigger_deletedocument = ModuleHandler::triggerCall('document.deleteDocument', 'after', $obj);
+			if(!$trigger_deletedocument)
+			{
+				$oDB->rollback();
+				return $trigger_deletedocument;
+			}
 		}
 
 		// commit