diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentBL.php index 75bef87..f734e41 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentBL.php +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentBL.php @@ -48,6 +48,7 @@ if (checkSession()) { if ($oDocument->delete()) { if (unlink($sDocumentPath)) { // successfully deleted the document from the file system + $default->log->info("deleteDocumentBL.php successfully deleted document " . $oDocument->getFileName() . " from folder " . Folder::getFolderPath($oDocument->getFolderID()) . " id=" . $oDocument->getFolderID()); // delete all collaboration roles for ($i=0; $irootUrl/control.php?action=browse&fFolderID=" . $oDocument->getFolderID()); } else { //could not delete the document from the file system + $default->log->error("deleteDocumentBL.php Filesystem error deleting document " . $oDocument->getFileName() . " from folder " . Folder::getFolderPath($oDocument->getFolderID()) . " id=" . $oDocument->getFolderID()); //reverse the document deletion $oDocument->create(); //get rid of the document transaction @@ -96,6 +98,8 @@ if (checkSession()) { } } else { //could not delete the document in the db + $default->log->error("deleteDocumentBL.php DB error deleting document " . $oDocument->getFileName() . " from folder " . Folder::getFolderPath($oDocument->getFolderID()) . " id=" . $oDocument->getFolderID()); + $oDocumentTransaction->delete(); require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); $oPatternCustom = & new PatternCustom(); diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderBL.php index d5202e1..674171b 100644 --- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderBL.php +++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderBL.php @@ -40,6 +40,7 @@ if (checkSession()) { if ($oFolder->delete()) { if (PhysicalFolderManagement::deleteFolder($sFolderPath)) { // successfully deleted the folder from the file system + $default->log->info("deleteFolderBL.php successfully deleted folder " . $oFolder->getName() . " from parent folder " . Folder::getFolderPath($oFolder->getParentID()) . " id=" . $oFolder->getParentID()); // delete folder collaboration entries $aFolderCollaboration = FolderCollaboration::getList("WHERE folder_id=$fFolderID"); @@ -77,7 +78,9 @@ if (checkSession()) { // redirect to the browse folder page with the parent folder id redirect("$default->rootUrl/control.php?action=browse&fFolderID=" . $oFolder->getParentID()); } else { - // could not delete the folder from the file system, so reverse the folder deletion + // could not delete the folder from the file system + $default->log->error("deleteFolderBL.php Filesystem error deleting folder " . $oFolder->getName() . " from parent folder " . Folder::getFolderPath($oFolder->getParentID()) . " id=" . $oFolder->getParentID()); + // so reverse the folder deletion $oFolder->create(); require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); $oPatternCustom->setHtml(""); @@ -87,6 +90,7 @@ if (checkSession()) { } } else { // could not delete the folder in the db + $default->log->error("deleteFolderBL.php DB error deleting folder " . $oFolder->getName() . " from parent folder " . Folder::getFolderPath($oFolder->getParentID()) . " id=" . $oFolder->getParentID()); require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); $oPatternCustom->setHtml(""); $main->setCentralPayload($oPatternCustom);