diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php index b2b7742dd..294f8dcb4 100644 --- a/modules/document/document.controller.php +++ b/modules/document/document.controller.php @@ -433,6 +433,9 @@ class documentController extends document { return $trigger_output; } } + // declared document, log delete + $this->_deleteDeclaredDocuments($args); + // Remove the thumbnail file FileHandler::removeDir(sprintf('files/cache/thumbnails/%s',getNumberingPath($document_srl, 3))); @@ -442,6 +445,17 @@ class documentController extends document { return $output; } + /** + * @brief delete declared document, log + * @param $documentSrls : srls string (ex: 1, 2,56, 88) + * @return void + **/ + function _deleteDeclaredDocuments($documentSrls) + { + executeQuery('document.deleteDeclaredDocuments', $documentSrls); + executeQuery('document.deleteDocumentDeclaredLog', $documentSrls); + } + /** * @brief Move the doc into the trash **/ @@ -707,10 +721,10 @@ class documentController extends document { $oDocumentModel = &getModel('document'); $oDocument = $oDocumentModel->getDocument($document_srl, false, false); // Pass if the author's IP address is as same as visitor's. - if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR']) { + /*if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR']) { $_SESSION['declared_document'][$document_srl] = true; return new Object(-1, 'failed_declared'); - } + }*/ // Check if document's author is a member. if($oDocument->get('member_srl')) { // Create a member model object diff --git a/modules/document/queries/deleteDocumentDeclaredLog.xml b/modules/document/queries/deleteDocumentDeclaredLog.xml new file mode 100644 index 000000000..37d26457a --- /dev/null +++ b/modules/document/queries/deleteDocumentDeclaredLog.xml @@ -0,0 +1,8 @@ + + + + + + + +